diff options
| author | Andrew Chew <achew@nvidia.com> | 2013-03-12 16:40:51 -0700 |
|---|---|---|
| committer | Stephen Warren <swarren@nvidia.com> | 2013-04-04 17:17:40 -0600 |
| commit | b69cd984efba767788d18206a84ce37b7584fea8 (patch) | |
| tree | 5766a05f40227836276ab00b790f67ad0652177f | |
| parent | 8d3207ca248d4877936878171f68be2485f3f71e (diff) | |
| download | talos-op-linux-b69cd984efba767788d18206a84ce37b7584fea8.tar.gz talos-op-linux-b69cd984efba767788d18206a84ce37b7584fea8.zip | |
ARM: tegra: fix the status of PWM DT nodes
We should be defining the PWM nodes with status as "disabled" in the
chip-specific dtsi file, since we don't know whether specific boards
will use the PWM or not. This patch fixes the PWM node status for
Tegra20 and Tegra30.
Also fixed the one user of PWM, which is the Tegra20 medcom-wide board,
so that PWM is set to "okay" in the board-specific dts file.
Signed-off-by: Andrew Chew <achew@nvidia.com>
[swarren: in medcom-wide: fixed node sort order, removed duplicate pwm:
label, fixed syntax error]
Signed-off-by: Stephen Warren <swarren@nvidia.com>
| -rw-r--r-- | arch/arm/boot/dts/tegra20-medcom-wide.dts | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/tegra20.dtsi | 1 | ||||
| -rw-r--r-- | arch/arm/boot/dts/tegra30.dtsi | 1 |
3 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/tegra20-medcom-wide.dts b/arch/arm/boot/dts/tegra20-medcom-wide.dts index a2d6d6541f83..52993a1d181f 100644 --- a/arch/arm/boot/dts/tegra20-medcom-wide.dts +++ b/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/arch/arm/boot/dts/tegra20.dtsi b/arch/arm/boot/dts/tegra20.dtsi index c9121337ed2c..1911432987ef 100644 --- a/arch/arm/boot/dts/tegra20.dtsi +++ b/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/arch/arm/boot/dts/tegra30.dtsi b/arch/arm/boot/dts/tegra30.dtsi index 9d7869f7151f..836e6c91cdb0 100644 --- a/arch/arm/boot/dts/tegra30.dtsi +++ b/arch/arm/boot/dts/tegra30.dtsi @@ -286,6 +286,7 @@ reg = <0x7000a000 0x100>; #pwm-cells = <2>; clocks = <&tegra_car 17>; + status = "disabled"; }; rtc { |
