From 2c80af552d6d7a8a6ac1893b58d4e503f959a537 Mon Sep 17 00:00:00 2001 From: Richard Zhao Date: Wed, 9 May 2012 10:47:20 +0800 Subject: [PATCH] --- yaml --- r: 308349 b: refs/heads/master c: d99a79fcf4cbbc4dc6dc1e21e6860b97357269ea h: refs/heads/master i: 308347: 648fd110a65a44e5e5f051b384da38d9f933a887 v: v3 --- [refs] | 2 +- trunk/arch/arm/boot/dts/imx6q-sabrelite.dts | 2 ++ trunk/arch/arm/boot/dts/imx6q.dtsi | 7 +++++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index ac843291c196..ae34e6774275 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f965cd55e29ee582dd58531c7afd5fc061e0b7e4 +refs/heads/master: d99a79fcf4cbbc4dc6dc1e21e6860b97357269ea diff --git a/trunk/arch/arm/boot/dts/imx6q-sabrelite.dts b/trunk/arch/arm/boot/dts/imx6q-sabrelite.dts index 2f631f25fffe..85b7c6c1ecf2 100644 --- a/trunk/arch/arm/boot/dts/imx6q-sabrelite.dts +++ b/trunk/arch/arm/boot/dts/imx6q-sabrelite.dts @@ -76,6 +76,8 @@ i2c@021a0000 { /* I2C1 */ status = "okay"; clock-frequency = <100000>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c1_1>; codec: sgtl5000@0a { compatible = "fsl,sgtl5000"; diff --git a/trunk/arch/arm/boot/dts/imx6q.dtsi b/trunk/arch/arm/boot/dts/imx6q.dtsi index b5a15c4c2fdc..32ea8998c72e 100644 --- a/trunk/arch/arm/boot/dts/imx6q.dtsi +++ b/trunk/arch/arm/boot/dts/imx6q.dtsi @@ -486,6 +486,13 @@ reg = <0x020e0000 0x4000>; /* shared pinctrl settings */ + i2c1 { + pinctrl_i2c1_1: i2c1grp-1 { + fsl,pins = <137 0x4001b8b1 /* MX6Q_PAD_EIM_D21__I2C1_SCL */ + 196 0x4001b8b1>; /* MX6Q_PAD_EIM_D28__I2C1_SDA */ + }; + }; + usdhc3 { pinctrl_usdhc3_1: usdhc3grp-1 { fsl,pins = <1273 0x17059 /* MX6Q_PAD_SD3_CMD__USDHC3_CMD */