From patchwork Fri Jul 6 05:36:30 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 169321 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 A119A2C0201 for ; Fri, 6 Jul 2012 15:43:07 +1000 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Sn1EI-0008Ry-SP; Fri, 06 Jul 2012 05:37:23 +0000 Received: from co1ehsobe006.messaging.microsoft.com ([216.32.180.189] helo=co1outboundpool.messaging.microsoft.com) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Sn1DY-0008R8-Ki for linux-arm-kernel@lists.infradead.org; Fri, 06 Jul 2012 05:36:37 +0000 Received: from mail87-co1-R.bigfish.com (10.243.78.243) by CO1EHSOBE008.bigfish.com (10.243.66.71) with Microsoft SMTP Server id 14.1.225.23; Fri, 6 Jul 2012 05:34:22 +0000 Received: from mail87-co1 (localhost [127.0.0.1]) by mail87-co1-R.bigfish.com (Postfix) with ESMTP id CCCA0400295; Fri, 6 Jul 2012 05:34:21 +0000 (UTC) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-SpamScore: -1 X-BigFish: VS-1(zz936eIzz1202hzz8275dhz2dh87h2a8h668h839h944hd25he96hf0ah107ah) X-FB-DOMAIN-IP-MATCH: fail Received: from mail87-co1 (localhost.localdomain [127.0.0.1]) by mail87-co1 (MessageSwitch) id 134155286079896_14296; Fri, 6 Jul 2012 05:34:20 +0000 (UTC) Received: from CO1EHSMHS003.bigfish.com (unknown [10.243.78.239]) by mail87-co1.bigfish.com (Postfix) with ESMTP id 07E7B440049; Fri, 6 Jul 2012 05:34:20 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by CO1EHSMHS003.bigfish.com (10.243.66.13) with Microsoft SMTP Server (TLS) id 14.1.225.23; Fri, 6 Jul 2012 05:34:20 +0000 Received: from az84smr01.freescale.net (10.64.34.197) by 039-SN1MMR1-002.039d.mgd.msft.net (10.84.1.15) with Microsoft SMTP Server (TLS) id 14.2.298.5; Fri, 6 Jul 2012 00:36:25 -0500 Received: from S2101-09.ap.freescale.net ([10.192.185.229]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id q665aMD3009674; Thu, 5 Jul 2012 22:36:23 -0700 Date: Fri, 6 Jul 2012 13:36:30 +0800 From: Shawn Guo To: Arnd Bergmann , Olof Johansson Subject: [GIT PULL] mxs device tree changes for 3.6 Message-ID: <20120706053628.GC20503@S2101-09.ap.freescale.net> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-OriginatorOrg: sigmatel.com 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 [216.32.180.189 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 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 Arnd, Olof, Please pull the following mxs device tree related changes for 3.6. Regards, Shawn The following changes since commit 6887a4131da3adaab011613776d865f4bcfb5678: Linux 3.5-rc5 (2012-06-30 16:08:57 -0700) are available in the git repository at: git://git.linaro.org/people/shawnguo/linux-2.6.git mxs/dt-for-3.6 Fabio Estevam (3): serial: mxs-auart: Allow device tree probing ARM: dts: mx28evk: Add auart0 and auart3 support ARM: mx23: Add initial support for olinuxino board Huang Shijie (2): ARM: mx28: add gpmi-nand support ARM: dts: mx23: add gpmi nand support Marc Kleine-Budde (1): ARM: mxs: enable flexcan on imx28 Marek Vasut (2): ARM: dts: imx23: Fix the gpmi/gpmi-nand DT name rtc: stmp3xxx: Add simple binding for the stmp3xxx-rtc Maxime Ripard (3): ARM: dts: imx28: Add additionnal muxing options to iMX28 DTSI ARM: mxs: Add Crystalfontz CFA-10036 DTS ARM: dts: cfa10036: Add Power LED to the CFA-10036 board Shawn Guo (15): ARM: mxs: store mac address read from OTP in device tree video: mxsfb: move mxsfb.h into include/linux video: mxsfb: add simple device tree probe ARM: mxs: use auxdata to attach mxsfb_platform_data ARM: dts: mxs: add comments for pinmux-ids ARM: dts: mxs: add hog-gpios for imx23-evk and imx28-evk ARM: dts: imx23-evk: updates for mmc device ARM: dts: imx23-evk: add auart device ARM: dts: imx28-evk: add vmmc-supply for mmc device ARM: dts: imx28-evk: add missing properties for fec ARM: dts: imx28-evk: add heartbeat gpio-leds ARM: dts: mxs: enable rtc for imx23 and imx28 ARM: dts: mxs: add pwm-backlight for imx23-evk and imx28-evk ARM: dts: mxs: add lcd support for imx23-evk and imx28-evk ARM: dts: imx28-evk: add flexan devices Documentation/devicetree/bindings/arm/olimex.txt | 6 + Documentation/devicetree/bindings/fb/mxsfb.txt | 19 ++ .../devicetree/bindings/rtc/stmp3xxx-rtc.txt | 16 ++ .../bindings/tty/serial/fsl-mxs-auart.txt | 27 ++ arch/arm/boot/dts/cfa10036.dts | 52 ++++ arch/arm/boot/dts/imx23-evk.dts | 66 +++++- arch/arm/boot/dts/imx23-olinuxino.dts | 44 ++++ arch/arm/boot/dts/imx23.dtsi | 169 ++++++++++++- arch/arm/boot/dts/imx28-evk.dts | 100 ++++++++ arch/arm/boot/dts/imx28.dtsi | 267 ++++++++++++++++++-- arch/arm/mach-mxs/Kconfig | 1 + arch/arm/mach-mxs/devices-mx23.h | 2 +- arch/arm/mach-mxs/devices-mx28.h | 2 +- arch/arm/mach-mxs/devices/platform-mxsfb.c | 2 +- arch/arm/mach-mxs/mach-mxs.c | 128 ++++++++++- drivers/rtc/rtc-stmp3xxx.c | 8 + drivers/tty/serial/mxs-auart.c | 42 +++- drivers/video/mxsfb.c | 62 ++++- .../include/mach => include/linux}/mxsfb.h | 6 +- 19 files changed, 953 insertions(+), 66 deletions(-) create mode 100644 Documentation/devicetree/bindings/arm/olimex.txt create mode 100644 Documentation/devicetree/bindings/fb/mxsfb.txt create mode 100644 Documentation/devicetree/bindings/rtc/stmp3xxx-rtc.txt create mode 100644 Documentation/devicetree/bindings/tty/serial/fsl-mxs-auart.txt create mode 100644 arch/arm/boot/dts/cfa10036.dts create mode 100644 arch/arm/boot/dts/imx23-olinuxino.dts rename {arch/arm/mach-mxs/include/mach => include/linux}/mxsfb.h (95%)