ARM: tegra: Avoid pwm- prefix in pinmux nodes

The "pwm-" prefix currently matches the DT schema for PWM controllers
and throws an error in that case. This is something that should be fixed
in the PWM DT schema, but in this case we can also preempt any such
conflict by naming the nodes after the pins like we do for many others
of these nodes.

Signed-off-by: Thierry Reding <treding@nvidia.com>

diff --git a/arch/arm/boot/dts/tegra20-colibri-eval-v3.dts b/arch/arm/boot/dts/tegra20-colibri-eval-v3.dts
index a05fb38..d2a3bf9 100644 (file)
--- a/arch/arm/boot/dts/tegra20-colibri-eval-v3.dts
+++ b/arch/arm/boot/dts/tegra20-colibri-eval-v3.dts
@@ -70,11 +70,11 @@
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                        };
 
-                       pwm-a-b {
+                       sdc {
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                        };
 
-                       pwm-c-d {
+                       sdb_sdd {
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                        };
 

diff --git a/arch/arm/boot/dts/tegra20-colibri-iris.dts b/arch/arm/boot/dts/tegra20-colibri-iris.dts
index 425494b..00ecbbd 100644 (file)
--- a/arch/arm/boot/dts/tegra20-colibri-iris.dts
+++ b/arch/arm/boot/dts/tegra20-colibri-iris.dts
@@ -70,11 +70,11 @@
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                        };
 
-                       pwm-a-b {
+                       sdc {
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                        };
 
-                       pwm-c-d {
+                       sdb_sdd {
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                        };
 

diff --git a/arch/arm/boot/dts/tegra20-colibri.dtsi b/arch/arm/boot/dts/tegra20-colibri.dtsi
index e36b258..28e2209 100644 (file)
--- a/arch/arm/boot/dts/tegra20-colibri.dtsi
+++ b/arch/arm/boot/dts/tegra20-colibri.dtsi
@@ -113,7 +113,7 @@
                        };
 
                        /* Colibri Backlight PWM<A>, PWM<B> */
-                       pwm-a-b {
+                       sdc {
                                nvidia,pins = "sdc";
                                nvidia,function = "pwm";
                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
@@ -242,7 +242,7 @@
                        };
 
                        /* Colibri PWM<C>, PWM<D> */
-                       pwm-c-d {
+                       sdb_sdd {
                                nvidia,pins = "sdb", "sdd";
                                nvidia,function = "pwm";
                                nvidia,tristate = <TEGRA_PIN_ENABLE>;