From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dong Aisheng Subject: [RFC PATCH v3 4/5] ARM: imx6q: using pinmux subsystem Date: Wed, 21 Dec 2011 01:40:39 +0800 Message-ID: <1324402840-32451-5-git-send-email-b29396@freescale.com> References: <1324402840-32451-1-git-send-email-b29396@freescale.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1324402840-32451-1-git-send-email-b29396-KZfg59tc24xl57MIdRCFDg@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: devicetree-discuss-bounces+gldd-devicetree-discuss=m.gmane.org-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org Sender: devicetree-discuss-bounces+gldd-devicetree-discuss=m.gmane.org-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org To: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: linus.walleij-0IS4wlFg1OjSUeElwK9/Pw@public.gmane.org, s.hauer-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org, rob.herring-bsGFqQB8/DxBDgjK7y7TUQ@public.gmane.org, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, kernel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org, cjb-2X9k7bc8m7Mdnm+yROfE0A@public.gmane.org, devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org List-Id: devicetree@vger.kernel.org From: Dong Aisheng Signed-off-by: Dong Aisheng Cc: Linus Walleij Cc: Sascha Hauer Cc: Shawn Guo Cc: Grant Likely Cc: Rob Herring --- ChangeLog v2->v3: - Add phandle for pinmux mappings - follow DT convention to use dash '-' for property name ChangeLog v1->v2: - Add basic binding for pinmux pins --- arch/arm/boot/dts/imx6q-sabreauto.dts | 32 ++++++++++++++++++++++++++++++++ arch/arm/boot/dts/imx6q.dtsi | 1 + arch/arm/mach-imx/Kconfig | 1 + 3 files changed, 34 insertions(+), 0 deletions(-) diff --git a/arch/arm/boot/dts/imx6q-sabreauto.dts b/arch/arm/boot/dts/imx6q-sabreauto.dts index 072974e..c3e9070 100644 --- a/arch/arm/boot/dts/imx6q-sabreauto.dts +++ b/arch/arm/boot/dts/imx6q-sabreauto.dts @@ -25,7 +25,39 @@ reg = <0x10000000 0x80000000>; }; + pinmux: imx6q-sabreauto-map { + map-sd4 { + map-name = "usdhc4"; + ctrl-dev-name = "20e0000.iomuxc"; + function = "sd4"; + dev-name = "219c000.usdhc"; + }; + }; + soc { + aips-bus@02000000 { /* AIPS1 */ + iomuxc@020e0000 { + fsl,pinmux-map = <&pinmux>; + pinmux-uart4 { + func-name = "uart4"; + grp-name = "uart4grp"; + grp-pins = <107 108>; + num-pins = <2>; + grp-mux = <4 4>; + num-mux = <2>; + }; + + pinmux-sd4 { + func-name = "sd4"; + grp-name = "sd4grp"; + grp-pins = <170 171 180 181 182 183 184 185 186 187>; + num-pins = <10>; + grp-mux = <0 0 1 1 1 1 1 1 1 1>; + num-mux = <10>; + }; + }; + }; + aips-bus@02100000 { /* AIPS2 */ enet@02188000 { phy-mode = "rgmii"; diff --git a/arch/arm/boot/dts/imx6q.dtsi b/arch/arm/boot/dts/imx6q.dtsi index 7dda599..42499bb 100644 --- a/arch/arm/boot/dts/imx6q.dtsi +++ b/arch/arm/boot/dts/imx6q.dtsi @@ -386,6 +386,7 @@ }; iomuxc@020e0000 { + compatible = "fsl,imx6q-iomuxc"; reg = <0x020e0000 0x4000>; }; diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 5f7f9c2..d6a88fe 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -615,6 +615,7 @@ config SOC_IMX6Q select HAVE_IMX_GPC select HAVE_IMX_MMDC select HAVE_IMX_SRC + select PINCTRL select USE_OF help -- 1.7.0.4