From da093d37b0cae21536e48a99619c40ed331257f9 Mon Sep 17 00:00:00 2001 From: Richard Zhao Date: Wed, 9 May 2012 11:21:11 +0800 Subject: [PATCH] --- yaml --- r: 308350 b: refs/heads/master c: 5ca65c18830f997ba3df0e8e913c72492b40d6ba h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/boot/dts/imx6q-sabrelite.dts | 2 ++ trunk/arch/arm/boot/dts/imx6q.dtsi | 9 +++++++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index ae34e6774275..7cc14ae9a76c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d99a79fcf4cbbc4dc6dc1e21e6860b97357269ea +refs/heads/master: 5ca65c18830f997ba3df0e8e913c72492b40d6ba diff --git a/trunk/arch/arm/boot/dts/imx6q-sabrelite.dts b/trunk/arch/arm/boot/dts/imx6q-sabrelite.dts index 85b7c6c1ecf2..5b51deb80881 100644 --- a/trunk/arch/arm/boot/dts/imx6q-sabrelite.dts +++ b/trunk/arch/arm/boot/dts/imx6q-sabrelite.dts @@ -67,6 +67,8 @@ audmux@021d8000 { status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_audmux_1>; }; uart2: serial@021e8000 { diff --git a/trunk/arch/arm/boot/dts/imx6q.dtsi b/trunk/arch/arm/boot/dts/imx6q.dtsi index 32ea8998c72e..3f560250fd3d 100644 --- a/trunk/arch/arm/boot/dts/imx6q.dtsi +++ b/trunk/arch/arm/boot/dts/imx6q.dtsi @@ -486,6 +486,15 @@ reg = <0x020e0000 0x4000>; /* shared pinctrl settings */ + audmux { + pinctrl_audmux_1: audmux-1 { + fsl,pins = <18 0x80000000 /* MX6Q_PAD_SD2_DAT0__AUDMUX_AUD4_RXD */ + 1586 0x80000000 /* MX6Q_PAD_SD2_DAT3__AUDMUX_AUD4_TXC */ + 11 0x80000000 /* MX6Q_PAD_SD2_DAT2__AUDMUX_AUD4_TXD */ + 3 0x80000000>; /* MX6Q_PAD_SD2_DAT1__AUDMUX_AUD4_TXFS */ + }; + }; + i2c1 { pinctrl_i2c1_1: i2c1grp-1 { fsl,pins = <137 0x4001b8b1 /* MX6Q_PAD_EIM_D21__I2C1_SCL */