From 5e8616026e40e72d5164c22875bd50bb3037fb4f Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 23 Aug 2012 10:42:30 +0200 Subject: [PATCH] --- yaml --- r: 326737 b: refs/heads/master c: 2f44211f938397be1a9a06945e8c6e07a7232333 h: refs/heads/master i: 326735: 3db0b458d1a1cf3f230b7ed3050b60084bf991a0 v: v3 --- [refs] | 2 +- trunk/arch/arm/boot/dts/imx28.dtsi | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 37f4fbb2bea7..6c607875a19e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5c697ea2eec2bf4146e57f964e1163333659cbf8 +refs/heads/master: 2f44211f938397be1a9a06945e8c6e07a7232333 diff --git a/trunk/arch/arm/boot/dts/imx28.dtsi b/trunk/arch/arm/boot/dts/imx28.dtsi index fac0f69a16ec..ece801c727f9 100644 --- a/trunk/arch/arm/boot/dts/imx28.dtsi +++ b/trunk/arch/arm/boot/dts/imx28.dtsi @@ -464,6 +464,16 @@ fsl,pull-up = <0>; }; + pwm4_pins_a: pwm4@0 { + reg = <0>; + fsl,pinmux-ids = < + 0x31d0 /* MX28_PAD_PWM4__PWM_4 */ + >; + fsl,drive-strength = <0>; + fsl,voltage = <1>; + fsl,pull-up = <0>; + }; + lcdif_24bit_pins_a: lcdif-24bit@0 { reg = <0>; fsl,pinmux-ids = <