From patchwork Fri Feb 17 08:24:26 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sascha Hauer X-Patchwork-Id: 141752 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from merlin.infradead.org (unknown [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 776ADB6F9B for ; Fri, 17 Feb 2012 19:28:24 +1100 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1RyJ7w-0006Tt-CP; Fri, 17 Feb 2012 08:25:12 +0000 Received: from bombadil.infradead.org ([2001:4830:2446:ff00:4687:fcff:fea6:5117]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1RyJ7s-0006To-HV for linux-arm-kernel@merlin.infradead.org; Fri, 17 Feb 2012 08:25:08 +0000 Received: from metis.ext.pengutronix.de ([2001:6f8:1178:4:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1RyJ7k-0005Xq-3l for linux-arm-kernel@lists.infradead.org; Fri, 17 Feb 2012 08:25:06 +0000 Received: from dude.hi.pengutronix.de ([2001:6f8:1178:2:21e:67ff:fe11:9c5c]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1RyJ7J-00087r-T9; Fri, 17 Feb 2012 09:24:33 +0100 Received: from sha by dude.hi.pengutronix.de with local (Exim 4.77) (envelope-from ) id 1RyJ7C-0004Wb-Mj; Fri, 17 Feb 2012 09:24:26 +0100 Date: Fri, 17 Feb 2012 09:24:26 +0100 From: Sascha Hauer To: Olof Johansson Subject: [GIT PULL] i.MX assorted Message-ID: <20120217082426.GO3852@pengutronix.de> MIME-Version: 1.0 Content-Disposition: inline X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-IRC: #ptxdist @freenode X-Accept-Language: de,en X-Accept-Content-Type: text/plain X-Uptime: 09:23:04 up 96 days, 16:10, 14 users, load average: 0.05, 0.05, 0.62 User-Agent: Mutt/1.5.21 (2010-09-15) X-SA-Exim-Connect-IP: 2001:6f8:1178:2:21e:67ff:fe11:9c5c X-SA-Exim-Mail-From: sha@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-arm-kernel@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20120217_032500_713033_6B9E9943 X-CRM114-Status: GOOD ( 16.95 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on bombadil.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: shawn.guo@linaro.org, Fabio Estevam , linux-arm-kernel@lists.infradead.org, Arnd Bergmann 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 Olof, Please pull the following assorted updates for i.MX. Sascha The following changes since commit d65b4e98d7ea3038b767b70fe8be959b2913f16d: Linux 3.3-rc3 (2012-02-08 19:21:53 -0800) are available in the git repository at: git://git.pengutronix.de/git/imx/linux-2.6.git features/assorted for you to fetch changes up to bc17b36704e051ec67eeaa6e10d7e20ce32c76cf: ARM: imx_v4_v5_defconfig: Fix the selection of 32 bit flash support for iMX21ADS board (2012-02-17 09:20:31 +0100) ---------------------------------------------------------------- Fabio Estevam (7): ARM: mach-pcm038: Fix field name of regulator_consumer_supply struct ARM: imx_v6_v7_defconfig: Add support for framebuffer and camera on mx31 ARM: mx27_3ds: Add camera support ARM: imx_v4_v5_defconfig: Update defconfig ARM: plat-mxc: audmux-v1: Remove unneeded ifdef's ARM: mx3: Let mx31 and mx35 share the same CCM header file ARM: imx_v4_v5_defconfig: Fix the selection of 32 bit flash support for iMX21ADS board arch/arm/configs/imx_v4_v5_defconfig | 17 ++ arch/arm/configs/imx_v6_v7_defconfig | 32 ++++ arch/arm/mach-imx/Kconfig | 1 + arch/arm/mach-imx/clock-imx31.c | 2 +- arch/arm/mach-imx/clock-imx35.c | 166 +++++++++----------- .../mach-imx/{crmregs-imx31.h => crmregs-imx3.h} | 15 ++- arch/arm/mach-imx/mach-armadillo5x0.c | 2 +- arch/arm/mach-imx/mach-mx27_3ds.c | 108 +++++++++++++ arch/arm/mach-imx/mach-pcm038.c | 2 +- arch/arm/plat-mxc/audmux-v1.c | 5 +- 10 files changed, 251 insertions(+), 99 deletions(-) rename arch/arm/mach-imx/{crmregs-imx31.h => crmregs-imx3.h} (94%)