From 43be108319d159af2f384e93c20a79b0d7e246bc Mon Sep 17 00:00:00 2001 From: Andrew Chew Date: Tue, 12 Mar 2013 16:40:51 -0700 Subject: [PATCH] --- yaml --- r: 373986 b: refs/heads/master c: b69cd984efba767788d18206a84ce37b7584fea8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/boot/dts/tegra20-medcom-wide.dts | 4 ++++ trunk/arch/arm/boot/dts/tegra20.dtsi | 1 + trunk/arch/arm/boot/dts/tegra30.dtsi | 1 + 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 9ca902937650..d494f9c5ab91 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8d3207ca248d4877936878171f68be2485f3f71e +refs/heads/master: b69cd984efba767788d18206a84ce37b7584fea8 diff --git a/trunk/arch/arm/boot/dts/tegra20-medcom-wide.dts b/trunk/arch/arm/boot/dts/tegra20-medcom-wide.dts index a2d6d6541f83..52993a1d181f 100644 --- a/trunk/arch/arm/boot/dts/tegra20-medcom-wide.dts +++ b/trunk/arch/arm/boot/dts/tegra20-medcom-wide.dts @@ -6,6 +6,10 @@ model = "Avionic Design Medcom-Wide board"; compatible = "ad,medcom-wide", "ad,tamonten", "nvidia,tegra20"; + pwm { + status = "okay"; + }; + i2c@7000c000 { wm8903: wm8903@1a { compatible = "wlf,wm8903"; diff --git a/trunk/arch/arm/boot/dts/tegra20.dtsi b/trunk/arch/arm/boot/dts/tegra20.dtsi index c9121337ed2c..1911432987ef 100644 --- a/trunk/arch/arm/boot/dts/tegra20.dtsi +++ b/trunk/arch/arm/boot/dts/tegra20.dtsi @@ -299,6 +299,7 @@ reg = <0x7000a000 0x100>; #pwm-cells = <2>; clocks = <&tegra_car 17>; + status = "disabled"; }; rtc { diff --git a/trunk/arch/arm/boot/dts/tegra30.dtsi b/trunk/arch/arm/boot/dts/tegra30.dtsi index 9d7869f7151f..836e6c91cdb0 100644 --- a/trunk/arch/arm/boot/dts/tegra30.dtsi +++ b/trunk/arch/arm/boot/dts/tegra30.dtsi @@ -286,6 +286,7 @@ reg = <0x7000a000 0x100>; #pwm-cells = <2>; clocks = <&tegra_car 17>; + status = "disabled"; }; rtc {