From 8f937ed325cc2bd243c554d55ee8f2813ff43149 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 31 Aug 2012 16:00:40 +0200 Subject: [PATCH] --- yaml --- r: 326743 b: refs/heads/master c: de7e934f2bd27e2636946600e4335c929fae3c87 h: refs/heads/master i: 326741: 5d01f4758957b1c719aa0e84fa2e3324c9f94d60 326739: 94c3b1eedda0a733b5d5aa93ce32b5bd74b70d2f 326735: 3db0b458d1a1cf3f230b7ed3050b60084bf991a0 v: v3 --- [refs] | 2 +- trunk/arch/arm/boot/dts/imx28.dtsi | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index aacbbe880ee2..dec62287d53a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8495a24386d3b1f0cfd17fd42e4c3ad80d88edbb +refs/heads/master: de7e934f2bd27e2636946600e4335c929fae3c87 diff --git a/trunk/arch/arm/boot/dts/imx28.dtsi b/trunk/arch/arm/boot/dts/imx28.dtsi index 5f9dbea7e6a5..a9bda8e2ecca 100644 --- a/trunk/arch/arm/boot/dts/imx28.dtsi +++ b/trunk/arch/arm/boot/dts/imx28.dtsi @@ -421,6 +421,17 @@ fsl,pull-up = <1>; }; + i2c1_pins_a: i2c1@0 { + reg = <0>; + fsl,pinmux-ids = < + 0x3101 /* MX28_PAD_PWM0__I2C1_SCL */ + 0x3111 /* MX28_PAD_PWM1__I2C1_SDA */ + >; + fsl,drive-strength = <1>; + fsl,voltage = <1>; + fsl,pull-up = <1>; + }; + saif0_pins_a: saif0@0 { reg = <0>; fsl,pinmux-ids = <