On Thu, Dec 09, 2021 at 10:13:56PM +0300, Dmitry Osipenko wrote: > 09.12.2021 20:33, Thierry Reding пишет: > > From: Thierry Reding <treding@xxxxxxxxxx> > > > > 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@xxxxxxxxxx> > > --- > > arch/arm/boot/dts/tegra20-colibri-eval-v3.dts | 4 ++-- > > arch/arm/boot/dts/tegra20-colibri-iris.dts | 4 ++-- > > 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 @@ mmccd { > > 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 @@ mmccd { > > 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 80e439003a6d..2350fda3be6a 100644 > > --- a/arch/arm/boot/dts/tegra20-colibri.dtsi > > +++ b/arch/arm/boot/dts/tegra20-colibri.dtsi > > @@ -113,7 +113,7 @@ bl-on { > > }; > > > > /* 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 @@ cif { > > }; > > > > /* Colibri PWM<C>, PWM<D> */ > > - pwm-c-d { > > + sdb_sdd { > > nvidia,pins = "sdb", "sdd"; > > nvidia,function = "pwm"; > > nvidia,tristate = <TEGRA_PIN_ENABLE>; > > > > Should be a bit nicer to add the 'pin-' prefix, like I suggested to > David [1] sometime ago. We don't use the pin- prefix anywhere else, so it would just look out of place. We've used this kind of notation where the node name is composed of the concatenation of the pins defined within elsewhere, so I prefer that. Thierry
Attachment:
signature.asc
Description: PGP signature