diff options
| author | Thierry Reding <treding@nvidia.com> | 2021-12-07 11:27:46 +0100 |
|---|---|---|
| committer | Thierry Reding <treding@nvidia.com> | 2021-12-14 16:07:42 +0100 |
| commit | 959fddf537c8d3f305df135881976318d7e13b93 (patch) | |
| tree | f5c258d5ca1c9f861bec4509294927387826cf76 /arch/arm/boot/dts | |
| parent | ARM: tegra: Sort Tegra124 XUSB clocks correctly (diff) | |
| download | linux-959fddf537c8d3f305df135881976318d7e13b93.tar.xz linux-959fddf537c8d3f305df135881976318d7e13b93.zip | |
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>
Diffstat (limited to 'arch/arm/boot/dts')
| -rw-r--r-- | arch/arm/boot/dts/tegra20-colibri-eval-v3.dts | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/tegra20-colibri-iris.dts | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/tegra20-colibri.dtsi | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/boot/dts/tegra20-colibri-eval-v3.dts b/arch/arm/boot/dts/tegra20-colibri-eval-v3.dts index a05fb3853da8..d2a3bf9d28bd 100644 --- 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 425494b9ed54..00ecbbd5e9e1 100644 --- 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 e36b258c82df..28e22097578d 100644 --- 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>; |