From patchwork Fri Jan 27 08:04:14 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olof Johansson X-Patchwork-Id: 138193 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 42BBC1007D2 for ; Fri, 27 Jan 2012 19:07:26 +1100 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1RqgnJ-0007ef-Pz; Fri, 27 Jan 2012 08:04:25 +0000 Received: from mail-pw0-f49.google.com ([209.85.160.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1RqgnF-0007eR-KR for linux-arm-kernel@lists.infradead.org; Fri, 27 Jan 2012 08:04:22 +0000 Received: by pbdx9 with SMTP id x9so1763843pbd.36 for ; Fri, 27 Jan 2012 00:04:19 -0800 (PST) Received: by 10.68.212.161 with SMTP id nl1mr12592106pbc.38.1327651457308; Fri, 27 Jan 2012 00:04:17 -0800 (PST) Received: from localhost (173-13-129-225-sfba.hfc.comcastbusiness.net. [173.13.129.225]) by mx.google.com with ESMTPS id r9sm12742060pbi.6.2012.01.27.00.04.15 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 27 Jan 2012 00:04:16 -0800 (PST) Date: Fri, 27 Jan 2012 00:04:14 -0800 From: Olof Johansson To: torvalds@linux-foundation.org Subject: [GIT PULL] arm-soc fixes for 3.3-rc Message-ID: <20120127080414.GA13212@quad.lixom.net> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.160.49 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: linux-arm-kernel@lists.infradead.org, arm@kernel.org, linux-kernel@vger.kernel.org, arnd@arndb.de X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org Hi Linus, The following changes since commit dcd6c92267155e70a94b3927bce681ce74b80d1f: Linux 3.3-rc1 (2012-01-19 15:04:48 -0800) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git fixes-for-linus for you to fetch changes up to 5e9638643132795e6168bb483e883b6a9678e7b5: Merge branch 'imx-fixes' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes (2012-01-26 23:15:11 -0800) ---------------------------------------------------------------- arm-soc fixes for 3.3-rc: AT91 needed reset fixes which resulted in some minor code refactoring, it also adds a feature-removal for one of their platforms for 3.4. The USB patches have been acked by Greg K-H. i.MX and ux500 both have some minor fixes, nothing controversial. ---------------------------------------------------------------- Fabio Estevam (1): ARM: imx: iomux-v1.h: Fix build error due to __init annotation Jean-Christophe PLAGNIOL-VILLARD (7): USB: at91: fix clk_get error handling ARM/USB: at91/ohci-at91: rename vbus_pin_inverted to vbus_pin_active_low ARM: at91: fix cap9 ddrsdr register ARM: at91: merge at91cap9_ddrsdr.h in at91sam9_ddrsdr.h ARM: at91: introduce AT91_SAM9_ALT_RESET to select the at91sam9 alternative reset ARM: at91: make rstc soc independent ARM: at91: Fix at91sam9g45 and at91cap9 reset Julia Lawall (1): arch/arm/mach-imx/mach-mx53_ard.c: add missing iounmap Nicolas Ferre (2): ARM: at91: fix at91rm9200 soc subtype handling ARM: at91: removal of CAP9 SoC family Olof Johansson (4): Merge branch 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixes Merge branch 'imx6/fixes' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes Merge branch 'fixes-for-arm-soc' of git://git.kernel.org/.../linusw/linux-stericsson into fixes Merge branch 'imx-fixes' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes Philippe Langlais (2): mach-ux500: musb: now musb is always in OTG mode mach-ux500: no MMC_CAP_SD_HIGHSPEED on Snowball Shawn Guo (1): ARM: imx6: add missing twd_clk for imx6q clock Srinidhi KASAGAR (1): mach-ux500: enable ARM errata 764369 srinidhi kasagar (1): mach-ux500: do not override outer.inv_all Documentation/feature-removal-schedule.txt | 14 +++ arch/arm/mach-at91/Kconfig | 14 +++ arch/arm/mach-at91/Makefile | 14 ++- arch/arm/mach-at91/at91cap9.c | 9 +-- arch/arm/mach-at91/at91sam9260.c | 1 + arch/arm/mach-at91/at91sam9261.c | 1 + arch/arm/mach-at91/at91sam9263.c | 1 + arch/arm/mach-at91/at91sam9_alt_reset.S | 7 +- arch/arm/mach-at91/at91sam9g45.c | 7 +- arch/arm/mach-at91/at91sam9g45_reset.S | 40 ++++++++ arch/arm/mach-at91/at91sam9rl.c | 1 + arch/arm/mach-at91/generic.h | 2 + arch/arm/mach-at91/include/mach/at91_rstc.h | 18 +++- arch/arm/mach-at91/include/mach/at91cap9.h | 2 +- arch/arm/mach-at91/include/mach/at91cap9_ddrsdr.h | 108 --------------------- arch/arm/mach-at91/include/mach/at91sam9260.h | 2 +- arch/arm/mach-at91/include/mach/at91sam9261.h | 2 +- arch/arm/mach-at91/include/mach/at91sam9263.h | 2 +- arch/arm/mach-at91/include/mach/at91sam9_ddrsdr.h | 30 ++++-- arch/arm/mach-at91/include/mach/at91sam9g45.h | 2 +- arch/arm/mach-at91/include/mach/at91sam9rl.h | 2 +- arch/arm/mach-at91/include/mach/board.h | 2 +- arch/arm/mach-at91/pm.c | 9 +-- arch/arm/mach-at91/pm.h | 8 +- arch/arm/mach-at91/pm_slowclock.S | 5 +- arch/arm/mach-at91/setup.c | 16 +++- arch/arm/mach-imx/clock-imx6q.c | 11 ++ arch/arm/mach-mx5/board-mx53_ard.c | 4 +- arch/arm/mach-ux500/Kconfig | 1 + arch/arm/mach-ux500/board-mop500-sdi.c | 2 + arch/arm/mach-ux500/cache-l2x0.c | 48 ++-------- arch/arm/mach-ux500/usb.c | 6 - arch/arm/plat-mxc/include/mach/iomux-v1.h | 2 +- drivers/usb/host/ohci-at91.c | 24 ++++- 34 files changed, 199 insertions(+), 218 deletions(-) create mode 100644 arch/arm/mach-at91/at91sam9g45_reset.S delete mode 100644 arch/arm/mach-at91/include/mach/at91cap9_ddrsdr.h