From patchwork Fri Jul 12 05:18:06 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 2826802 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 0ADBB9F7D6 for ; Fri, 12 Jul 2013 05:18:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D171C20160 for ; Fri, 12 Jul 2013 05:18:46 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4CA112015E for ; Fri, 12 Jul 2013 05:18:45 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UxVkf-0000zp-CX; Fri, 12 Jul 2013 05:18:41 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UxVkc-0000HO-Rh; Fri, 12 Jul 2013 05:18:38 +0000 Received: from co1ehsobe004.messaging.microsoft.com ([216.32.180.187] helo=co1outboundpool.messaging.microsoft.com) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UxVkZ-0000GZ-0Q for linux-arm-kernel@lists.infradead.org; Fri, 12 Jul 2013 05:18:36 +0000 Received: from mail157-co1-R.bigfish.com (10.243.78.248) by CO1EHSOBE031.bigfish.com (10.243.66.96) with Microsoft SMTP Server id 14.1.225.22; Fri, 12 Jul 2013 05:18:12 +0000 Received: from mail157-co1 (localhost [127.0.0.1]) by mail157-co1-R.bigfish.com (Postfix) with ESMTP id F31FD360343; Fri, 12 Jul 2013 05:18:11 +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: 3 X-BigFish: VS3(zcb8kzzz1f42h1ee6h1de0h1fdah2073h1202h1e76h1d1ah1d2ah1fc6hzz8275dhz2dh87h2a8h668h839hd24he5bhf0ah1288h12a5h12a9h12bdh12e5h137ah139eh13b6h1441h1504h1537h162dh1631h1758h1898h18e1h1946h19b5h1ad9h1b0ah1d0ch1d2eh1d3fh1dc1h1dfeh1dffh1e23h1151h1155h) X-FB-DOMAIN-IP-MATCH: fail Received: from mail157-co1 (localhost.localdomain [127.0.0.1]) by mail157-co1 (MessageSwitch) id 137360629024006_22445; Fri, 12 Jul 2013 05:18:10 +0000 (UTC) Received: from CO1EHSMHS011.bigfish.com (unknown [10.243.78.234]) by mail157-co1.bigfish.com (Postfix) with ESMTP id 0391854004E; Fri, 12 Jul 2013 05:18:10 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by CO1EHSMHS011.bigfish.com (10.243.66.21) with Microsoft SMTP Server (TLS) id 14.1.225.23; Fri, 12 Jul 2013 05:18:08 +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.3.136.1; Fri, 12 Jul 2013 05:17:13 +0000 Received: from S2101-09.ap.freescale.net ([10.192.185.60]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id r6C5I4mW002060; Thu, 11 Jul 2013 22:18:05 -0700 From: Shawn Guo To: Subject: [PATCH] ARM: dts: add more imx6q/dl pin groups Date: Fri, 12 Jul 2013 13:18:06 +0800 Message-ID: <1373606286-31245-1-git-send-email-shawn.guo@linaro.org> X-Mailer: git-send-email 1.7.9.5 MIME-Version: 1.0 X-OriginatorOrg: sigmatel.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130712_011835_279157_6411401A X-CRM114-Status: UNSURE ( 8.41 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.6 (--) Cc: Shawn Guo X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add more imx6q/dl pin groups for those supported boards, e.g. sabresd, sabreauto, arm2. IPU2 pin groups are added into imx6q.dtsi, since the block is only available on imx6q. Signed-off-by: Shawn Guo --- arch/arm/boot/dts/imx6q.dtsi | 36 +++++ arch/arm/boot/dts/imx6qdl.dtsi | 285 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 321 insertions(+) diff --git a/arch/arm/boot/dts/imx6q.dtsi b/arch/arm/boot/dts/imx6q.dtsi index 5e6c7f3..f104223 100644 --- a/arch/arm/boot/dts/imx6q.dtsi +++ b/arch/arm/boot/dts/imx6q.dtsi @@ -73,6 +73,42 @@ iomuxc: iomuxc@020e0000 { compatible = "fsl,imx6q-iomuxc"; + + ipu2 { + pinctrl_ipu2_1: ipu2grp-1 { + fsl,pins = < + PAD_DI0_DISP_CLK__IPU2_DI0_DISP_CLK 0x10 + PAD_DI0_PIN15__IPU2_DI0_PIN15 0x10 + PAD_DI0_PIN2__IPU2_DI0_PIN02 0x10 + PAD_DI0_PIN3__IPU2_DI0_PIN03 0x10 + PAD_DI0_PIN4__IPU2_DI0_PIN04 0x80000000 + PAD_DISP0_DAT0__IPU2_DISP0_DATA00 0x10 + PAD_DISP0_DAT1__IPU2_DISP0_DATA01 0x10 + PAD_DISP0_DAT2__IPU2_DISP0_DATA02 0x10 + PAD_DISP0_DAT3__IPU2_DISP0_DATA03 0x10 + PAD_DISP0_DAT4__IPU2_DISP0_DATA04 0x10 + PAD_DISP0_DAT5__IPU2_DISP0_DATA05 0x10 + PAD_DISP0_DAT6__IPU2_DISP0_DATA06 0x10 + PAD_DISP0_DAT7__IPU2_DISP0_DATA07 0x10 + PAD_DISP0_DAT8__IPU2_DISP0_DATA08 0x10 + PAD_DISP0_DAT9__IPU2_DISP0_DATA09 0x10 + PAD_DISP0_DAT10__IPU2_DISP0_DATA10 0x10 + PAD_DISP0_DAT11__IPU2_DISP0_DATA11 0x10 + PAD_DISP0_DAT12__IPU2_DISP0_DATA12 0x10 + PAD_DISP0_DAT13__IPU2_DISP0_DATA13 0x10 + PAD_DISP0_DAT14__IPU2_DISP0_DATA14 0x10 + PAD_DISP0_DAT15__IPU2_DISP0_DATA15 0x10 + PAD_DISP0_DAT16__IPU2_DISP0_DATA16 0x10 + PAD_DISP0_DAT17__IPU2_DISP0_DATA17 0x10 + PAD_DISP0_DAT18__IPU2_DISP0_DATA18 0x10 + PAD_DISP0_DAT19__IPU2_DISP0_DATA19 0x10 + PAD_DISP0_DAT20__IPU2_DISP0_DATA20 0x10 + PAD_DISP0_DAT21__IPU2_DISP0_DATA21 0x10 + PAD_DISP0_DAT22__IPU2_DISP0_DATA22 0x10 + PAD_DISP0_DAT23__IPU2_DISP0_DATA23 0x10 + >; + }; + }; }; }; diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi index 1f1c493..5ca82bf 100644 --- a/arch/arm/boot/dts/imx6qdl.dtsi +++ b/arch/arm/boot/dts/imx6qdl.dtsi @@ -587,6 +587,14 @@ PAD_CSI0_DAT6__AUD3_TXFS 0x80000000 >; }; + + pinctrl_audmux_3: audmux-3 { + fsl,pins = < + PAD_DISP0_DAT16__AUD5_TXC 0x80000000 + PAD_DISP0_DAT18__AUD5_TXFS 0x80000000 + PAD_DISP0_DAT19__AUD5_RXD 0x80000000 + >; + }; }; ecspi1 { @@ -681,6 +689,62 @@ }; }; + esai { + pinctrl_esai_1: esaigrp-1 { + fsl,pins = < + PAD_ENET_RXD0__ESAI_TX_HF_CLK 0x1b030 + PAD_ENET_CRS_DV__ESAI_TX_CLK 0x1b030 + PAD_ENET_RXD1__ESAI_TX_FS 0x1b030 + PAD_ENET_TX_EN__ESAI_TX3_RX2 0x1b030 + PAD_ENET_TXD1__ESAI_TX2_RX3 0x1b030 + PAD_ENET_TXD0__ESAI_TX4_RX1 0x1b030 + PAD_ENET_MDC__ESAI_TX5_RX0 0x1b030 + PAD_NANDF_CS2__ESAI_TX0 0x1b030 + PAD_NANDF_CS3__ESAI_TX1 0x1b030 + >; + }; + + pinctrl_esai_2: esaigrp-2 { + fsl,pins = < + PAD_ENET_CRS_DV__ESAI_TX_CLK 0x1b030 + PAD_ENET_RXD1__ESAI_TX_FS 0x1b030 + PAD_ENET_TX_EN__ESAI_TX3_RX2 0x1b030 + PAD_GPIO_5__ESAI_TX2_RX3 0x1b030 + PAD_ENET_TXD0__ESAI_TX4_RX1 0x1b030 + PAD_ENET_MDC__ESAI_TX5_RX0 0x1b030 + PAD_GPIO_17__ESAI_TX0 0x1b030 + PAD_NANDF_CS3__ESAI_TX1 0x1b030 + PAD_ENET_MDIO__ESAI_RX_CLK 0x1b030 + PAD_GPIO_9__ESAI_RX_FS 0x1b030 + >; + }; + }; + + flexcan1 { + pinctrl_flexcan1_1: flexcan1grp-1 { + fsl,pins = < + PAD_KEY_ROW2__FLEXCAN1_RX 0x80000000 + PAD_KEY_COL2__FLEXCAN1_TX 0x80000000 + >; + }; + + pinctrl_flexcan1_2: flexcan1grp-2 { + fsl,pins = < + PAD_GPIO_7__FLEXCAN1_TX 0x80000000 + PAD_KEY_ROW2__FLEXCAN1_RX 0x80000000 + >; + }; + }; + + flexcan2 { + pinctrl_flexcan2_1: flexcan2grp-1 { + fsl,pins = < + PAD_KEY_COL4__FLEXCAN2_TX 0x80000000 + PAD_KEY_ROW4__FLEXCAN2_RX 0x80000000 + >; + }; + }; + gpmi-nand { pinctrl_gpmi_nand_1: gpmi-nand-1 { fsl,pins = < @@ -705,6 +769,43 @@ }; }; + hdmi_hdcp { + pinctrl_hdmi_hdcp_1: hdmihdcpgrp-1 { + fsl,pins = < + PAD_KEY_COL3__HDMI_TX_DDC_SCL 0x4001b8b1 + PAD_KEY_ROW3__HDMI_TX_DDC_SDA 0x4001b8b1 + >; + }; + + pinctrl_hdmi_hdcp_2: hdmihdcpgrp-2 { + fsl,pins = < + PAD_EIM_EB2__HDMI_TX_DDC_SCL 0x4001b8b1 + PAD_EIM_D16__HDMI_TX_DDC_SDA 0x4001b8b1 + >; + }; + + pinctrl_hdmi_hdcp_3: hdmihdcpgrp-3 { + fsl,pins = < + PAD_EIM_EB2__HDMI_TX_DDC_SCL 0x4001b8b1 + PAD_KEY_ROW3__HDMI_TX_DDC_SDA 0x4001b8b1 + >; + }; + }; + + hdmi_cec { + pinctrl_hdmi_cec_1: hdmicecgrp-1 { + fsl,pins = < + PAD_EIM_A25__HDMI_TX_CEC_LINE 0x1f8b0 + >; + }; + + pinctrl_hdmi_cec_2: hdmicecgrp-2 { + fsl,pins = < + PAD_KEY_ROW2__HDMI_TX_CEC_LINE 0x1f8b0 + >; + }; + }; + i2c1 { pinctrl_i2c1_1: i2c1grp-1 { fsl,pins = < @@ -735,6 +836,13 @@ PAD_KEY_ROW3__I2C2_SDA 0x4001b8b1 >; }; + + pinctrl_i2c2_3: i2c2grp-3 { + fsl,pins = < + PAD_EIM_EB2__I2C2_SCL 0x4001b8b1 + PAD_KEY_ROW3__I2C2_SDA 0x4001b8b1 + >; + }; }; i2c3 { @@ -744,6 +852,153 @@ PAD_EIM_D18__I2C3_SDA 0x4001b8b1 >; }; + + pinctrl_i2c3_2: i2c3grp-2 { + fsl,pins = < + PAD_GPIO_3__I2C3_SCL 0x4001b8b1 + PAD_GPIO_6__I2C3_SDA 0x4001b8b1 + >; + }; + + pinctrl_i2c3_3: i2c3grp-3 { + fsl,pins = < + PAD_GPIO_5__I2C3_SCL 0x4001b8b1 + PAD_GPIO_16__I2C3_SDA 0x4001b8b1 + >; + }; + + pinctrl_i2c3_4: i2c3grp-4 { + fsl,pins = < + PAD_GPIO_3__I2C3_SCL 0x4001b8b1 + PAD_EIM_D18__I2C3_SDA 0x4001b8b1 + >; + }; + }; + + ipu1 { + pinctrl_ipu1_1: ipu1grp-1 { + fsl,pins = < + PAD_DI0_DISP_CLK__IPU1_DI0_DISP_CLK 0x10 + PAD_DI0_PIN15__IPU1_DI0_PIN15 0x10 + PAD_DI0_PIN2__IPU1_DI0_PIN02 0x10 + PAD_DI0_PIN3__IPU1_DI0_PIN03 0x10 + PAD_DI0_PIN4__IPU1_DI0_PIN04 0x80000000 + PAD_DISP0_DAT0__IPU1_DISP0_DATA00 0x10 + PAD_DISP0_DAT1__IPU1_DISP0_DATA01 0x10 + PAD_DISP0_DAT2__IPU1_DISP0_DATA02 0x10 + PAD_DISP0_DAT3__IPU1_DISP0_DATA03 0x10 + PAD_DISP0_DAT4__IPU1_DISP0_DATA04 0x10 + PAD_DISP0_DAT5__IPU1_DISP0_DATA05 0x10 + PAD_DISP0_DAT6__IPU1_DISP0_DATA06 0x10 + PAD_DISP0_DAT7__IPU1_DISP0_DATA07 0x10 + PAD_DISP0_DAT8__IPU1_DISP0_DATA08 0x10 + PAD_DISP0_DAT9__IPU1_DISP0_DATA09 0x10 + PAD_DISP0_DAT10__IPU1_DISP0_DATA10 0x10 + PAD_DISP0_DAT11__IPU1_DISP0_DATA11 0x10 + PAD_DISP0_DAT12__IPU1_DISP0_DATA12 0x10 + PAD_DISP0_DAT13__IPU1_DISP0_DATA13 0x10 + PAD_DISP0_DAT14__IPU1_DISP0_DATA14 0x10 + PAD_DISP0_DAT15__IPU1_DISP0_DATA15 0x10 + PAD_DISP0_DAT16__IPU1_DISP0_DATA16 0x10 + PAD_DISP0_DAT17__IPU1_DISP0_DATA17 0x10 + PAD_DISP0_DAT18__IPU1_DISP0_DATA18 0x10 + PAD_DISP0_DAT19__IPU1_DISP0_DATA19 0x10 + PAD_DISP0_DAT20__IPU1_DISP0_DATA20 0x10 + PAD_DISP0_DAT21__IPU1_DISP0_DATA21 0x10 + PAD_DISP0_DAT22__IPU1_DISP0_DATA22 0x10 + PAD_DISP0_DAT23__IPU1_DISP0_DATA23 0x10 + >; + }; + + pinctrl_ipu1_2: ipu1grp-2 { /* parallel camera */ + fsl,pins = < + PAD_CSI0_DAT12__IPU1_CSI0_DATA12 0x80000000 + PAD_CSI0_DAT13__IPU1_CSI0_DATA13 0x80000000 + PAD_CSI0_DAT14__IPU1_CSI0_DATA14 0x80000000 + PAD_CSI0_DAT15__IPU1_CSI0_DATA15 0x80000000 + PAD_CSI0_DAT16__IPU1_CSI0_DATA16 0x80000000 + PAD_CSI0_DAT17__IPU1_CSI0_DATA17 0x80000000 + PAD_CSI0_DAT18__IPU1_CSI0_DATA18 0x80000000 + PAD_CSI0_DAT19__IPU1_CSI0_DATA19 0x80000000 + PAD_CSI0_DATA_EN__IPU1_CSI0_DATA_EN 0x80000000 + PAD_CSI0_PIXCLK__IPU1_CSI0_PIXCLK 0x80000000 + PAD_CSI0_MCLK__IPU1_CSI0_HSYNC 0x80000000 + PAD_CSI0_VSYNC__IPU1_CSI0_VSYNC 0x80000000 + >; + }; + + pinctrl_ipu1_3: ipu1grp-3 { /* parallel port 16-bit */ + fsl,pins = < + PAD_CSI0_DAT4__IPU1_CSI0_DATA04 0x80000000 + PAD_CSI0_DAT5__IPU1_CSI0_DATA05 0x80000000 + PAD_CSI0_DAT6__IPU1_CSI0_DATA06 0x80000000 + PAD_CSI0_DAT7__IPU1_CSI0_DATA07 0x80000000 + PAD_CSI0_DAT8__IPU1_CSI0_DATA08 0x80000000 + PAD_CSI0_DAT9__IPU1_CSI0_DATA09 0x80000000 + PAD_CSI0_DAT10__IPU1_CSI0_DATA10 0x80000000 + PAD_CSI0_DAT11__IPU1_CSI0_DATA11 0x80000000 + PAD_CSI0_DAT12__IPU1_CSI0_DATA12 0x80000000 + PAD_CSI0_DAT13__IPU1_CSI0_DATA13 0x80000000 + PAD_CSI0_DAT14__IPU1_CSI0_DATA14 0x80000000 + PAD_CSI0_DAT15__IPU1_CSI0_DATA15 0x80000000 + PAD_CSI0_DAT16__IPU1_CSI0_DATA16 0x80000000 + PAD_CSI0_DAT17__IPU1_CSI0_DATA17 0x80000000 + PAD_CSI0_DAT18__IPU1_CSI0_DATA18 0x80000000 + PAD_CSI0_DAT19__IPU1_CSI0_DATA19 0x80000000 + PAD_CSI0_PIXCLK__IPU1_CSI0_PIXCLK 0x80000000 + PAD_CSI0_MCLK__IPU1_CSI0_HSYNC 0x80000000 + PAD_CSI0_VSYNC__IPU1_CSI0_VSYNC 0x80000000 + >; + }; + }; + + mlb { + pinctrl_mlb_1: mlbgrp-1 { + fsl,pins = < + PAD_GPIO_3__MLB_CLK 0x71 + PAD_GPIO_6__MLB_SIG 0x71 + PAD_GPIO_2__MLB_DATA 0x71 + >; + }; + + pinctrl_mlb_2: mlbgrp-2 { + fsl,pins = < + PAD_ENET_TXD1__MLB_CLK 0x71 + PAD_GPIO_6__MLB_SIG 0x71 + PAD_GPIO_2__MLB_DATA 0x71 + >; + }; + }; + + pwm0 { + pinctrl_pwm0_1: pwm0grp-1 { + fsl,pins = < + PAD_SD1_DAT3__PWM1_OUT 0x1b0b1 + >; + }; + }; + + pwm3 { + pinctrl_pwm3_1: pwm3grp-1 { + fsl,pins = < + PAD_SD4_DAT1__PWM3_OUT 0x1b0b1 + >; + }; + }; + + spdif { + pinctrl_spdif_1: spdifgrp-1 { + fsl,pins = < + PAD_KEY_COL3__SPDIF_IN 0x1b0b0 + >; + }; + + pinctrl_spdif_2: spdifgrp-2 { + fsl,pins = < + PAD_GPIO_16__SPDIF_IN 0x1b0b0 + PAD_GPIO_17__SPDIF_OUT 0x1b0b0 + >; + }; }; uart1 { @@ -796,6 +1051,36 @@ }; }; + usbh2 { + pinctrl_usbh2_1: usbh2grp-1 { + fsl,pins = < + PAD_RGMII_TXC__USB_H2_DATA 0x40013030 + PAD_RGMII_TX_CTL__USB_H2_STROBE 0x40013030 + >; + }; + + pinctrl_usbh2_2: usbh2grp-2 { + fsl,pins = < + PAD_RGMII_TX_CTL__USB_H2_STROBE 0x40017030 + >; + }; + }; + + usbh3 { + pinctrl_usbh3_1: usbh3grp-1 { + fsl,pins = < + PAD_RGMII_RX_CTL__USB_H3_DATA 0x40013030 + PAD_RGMII_RXC__USB_H3_STROBE 0x40013030 + >; + }; + + pinctrl_usbh3_2: usbh3grp-2 { + fsl,pins = < + PAD_RGMII_RXC__USB_H3_STROBE 0x40017030 + >; + }; + }; + usdhc2 { pinctrl_usdhc2_1: usdhc2grp-1 { fsl,pins = <