From patchwork Fri Nov 16 15:50:00 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sascha Hauer X-Patchwork-Id: 199670 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 45AD42C0093 for ; Sat, 17 Nov 2012 02:52: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 1TZOBF-0005gU-2Q; Fri, 16 Nov 2012 15:50:09 +0000 Received: from metis.ext.pengutronix.de ([2001:6f8:1178:4:290:27ff:fe1d:cc33]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TZOBA-0005f8-4i for linux-arm-kernel@lists.infradead.org; Fri, 16 Nov 2012 15:50:05 +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 1TZOB7-00043U-9i; Fri, 16 Nov 2012 16:50:01 +0100 Received: from sha by dude.hi.pengutronix.de with local (Exim 4.80) (envelope-from ) id 1TZOB6-0007NC-RY; Fri, 16 Nov 2012 16:50:00 +0100 Date: Fri, 16 Nov 2012 16:50:00 +0100 From: Sascha Hauer To: Arnd Bergmann Subject: [GIT PULL] i.MX SoC updates Message-ID: <20121116155000.GX10369@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: 16:47:48 up 146 days, 6:59, 74 users, load average: 11.46, 12.94, 14.79 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-20121116_105004_592889_AB7BC19F X-CRM114-Status: GOOD ( 14.81 ) 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 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: Olof Johansson , Shawn Guo , linux-arm-kernel@lists.infradead.org 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 Please pull the following i.MX SoC updates for next merge window. Sascha The following changes since commit 89a4150331bc07014256714678ce8e9b238fc145: Merge remote-tracking branch 'arm-soc/imx/multiplatform' into x (2012-11-16 16:21:27 +0100) are available in the git repository at: git://git.pengutronix.de/git/imx/linux-2.6.git tags/imx-soc for you to fetch changes up to d6aef84a48fa54ac606ae719fcd125199939f43d: ARM i.MX51 babbage: Add display support (2012-11-16 16:34:18 +0100) ---------------------------------------------------------------- ARM i.MX SoC updates based on imx-multiplatform branch. ---------------------------------------------------------------- Fabio Estevam (3): ARM: dts: imx27-3ds: Remove local watchdog inclusion ARM: clk-imx27: Add missing clock for mx2-camera mx2_camera: Fix regression caused by clock conversion Gaëtan Carlier (1): ARM : i.MX27 : split code for allocation of ressources of camera and eMMA Roland Stigge (2): ARM: mach-imx: Support for DryIce RTC in i.MX53 watchdog: Support imx watchdog on SOC_IMX53 Sascha Hauer (7): ARM i.MX27: Fix low reference clock path ARM i.MX51: setup MIPI during startup ARM i.MX5: switch IPU clk support to devicetree bindings ARM i.MX53: Add IPU support ARM i.MX51: Add IPU support ARM i.MX6: Add IPU support ARM i.MX51 babbage: Add display support Steffen Trumtrar (1): ARM i.MX6: fix ldb_di_sel mux arch/arm/boot/dts/imx27-3ds.dts | 4 -- arch/arm/boot/dts/imx51-babbage.dts | 16 ++++++ arch/arm/boot/dts/imx51.dtsi | 67 +++++++++++++++++++++++ arch/arm/boot/dts/imx53.dtsi | 7 +++ arch/arm/boot/dts/imx6q.dtsi | 18 ++++++ arch/arm/mach-imx/Kconfig | 2 + arch/arm/mach-imx/clk-imx27.c | 18 +++++- arch/arm/mach-imx/clk-imx51-imx53.c | 20 ++++--- arch/arm/mach-imx/clk-imx6q.c | 2 +- arch/arm/mach-imx/devices-imx27.h | 4 +- arch/arm/mach-imx/devices/Kconfig | 3 + arch/arm/mach-imx/devices/Makefile | 1 + arch/arm/mach-imx/devices/devices-common.h | 9 ++- arch/arm/mach-imx/devices/platform-mx2-camera.c | 17 ------ arch/arm/mach-imx/mm-imx5.c | 20 +++++++ arch/arm/plat-mxc/devices/platform-mx2-emma.c | 40 ++++++++++++++ drivers/media/platform/soc_camera/mx2_camera.c | 39 +++++++++---- 17 files changed, 242 insertions(+), 45 deletions(-) create mode 100644 arch/arm/plat-mxc/devices/platform-mx2-emma.c