aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/boot
diff options
context:
space:
mode:
authorRichard Zhao <richard.zhao@freescale.com>2012-05-08 23:21:11 -0400
committerShawn Guo <shawn.guo@linaro.org>2012-05-11 03:18:03 -0400
commit5ca65c18830f997ba3df0e8e913c72492b40d6ba (patch)
treedf2e3917343781e963ccb5b8b9558067166829c3 /arch/arm/boot
parentd99a79fcf4cbbc4dc6dc1e21e6860b97357269ea (diff)
ARM: dts: imx6q-sabrelite: add audmux pinctrl support
Signed-off-by: Richard Zhao <richard.zhao@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Diffstat (limited to 'arch/arm/boot')
-rw-r--r--arch/arm/boot/dts/imx6q-sabrelite.dts2
-rw-r--r--arch/arm/boot/dts/imx6q.dtsi9
2 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx6q-sabrelite.dts b/arch/arm/boot/dts/imx6q-sabrelite.dts
index 85b7c6c1ecf2..5b51deb80881 100644
--- a/arch/arm/boot/dts/imx6q-sabrelite.dts
+++ b/arch/arm/boot/dts/imx6q-sabrelite.dts
@@ -67,6 +67,8 @@
67 67
68 audmux@021d8000 { 68 audmux@021d8000 {
69 status = "okay"; 69 status = "okay";
70 pinctrl-names = "default";
71 pinctrl-0 = <&pinctrl_audmux_1>;
70 }; 72 };
71 73
72 uart2: serial@021e8000 { 74 uart2: serial@021e8000 {
diff --git a/arch/arm/boot/dts/imx6q.dtsi b/arch/arm/boot/dts/imx6q.dtsi
index 32ea8998c72e..3f560250fd3d 100644
--- a/arch/arm/boot/dts/imx6q.dtsi
+++ b/arch/arm/boot/dts/imx6q.dtsi
@@ -486,6 +486,15 @@
486 reg = <0x020e0000 0x4000>; 486 reg = <0x020e0000 0x4000>;
487 487
488 /* shared pinctrl settings */ 488 /* shared pinctrl settings */
489 audmux {
490 pinctrl_audmux_1: audmux-1 {
491 fsl,pins = <18 0x80000000 /* MX6Q_PAD_SD2_DAT0__AUDMUX_AUD4_RXD */
492 1586 0x80000000 /* MX6Q_PAD_SD2_DAT3__AUDMUX_AUD4_TXC */
493 11 0x80000000 /* MX6Q_PAD_SD2_DAT2__AUDMUX_AUD4_TXD */
494 3 0x80000000>; /* MX6Q_PAD_SD2_DAT1__AUDMUX_AUD4_TXFS */
495 };
496 };
497
489 i2c1 { 498 i2c1 {
490 pinctrl_i2c1_1: i2c1grp-1 { 499 pinctrl_i2c1_1: i2c1grp-1 {
491 fsl,pins = <137 0x4001b8b1 /* MX6Q_PAD_EIM_D21__I2C1_SCL */ 500 fsl,pins = <137 0x4001b8b1 /* MX6Q_PAD_EIM_D21__I2C1_SCL */