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 a05fb3853da8ea10bfabdaa98c5c3f34a121740f..d2a3bf9d28bd7d46b380a121be18e64e06c8078c 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 425494b9ed541508911c1566ee7efd61c63e0254..00ecbbd5e9e16f7ad24e874afec6f98178807c86 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 e36b258c82df307d445879795b644001ab881b83..28e22097578d60d4df4f60f50f4f186a07c44518 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>;