[RFC PATCH v3 4/5] ARM: imx6q: using pinmux subsystem
From: Dong Aisheng <hidden>
Date: 2011-12-20 17:30:00
Also in:
linux-devicetree, lkml
Subsystem:
arm port, the rest · Maintainers:
Russell King, Linus Torvalds
From: Dong Aisheng <redacted> Signed-off-by: Dong Aisheng <redacted> Cc: Linus Walleij <redacted> Cc: Sascha Hauer <s.hauer@pengutronix.de> Cc: Shawn Guo <redacted> Cc: Grant Likely <redacted> Cc: Rob Herring <redacted> --- 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 at 02000000 { /* AIPS1 */ + iomuxc at 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 at 02100000 { /* AIPS2 */ enet at 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 at 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