| Message ID | 20200622083432.1491715-1-lee.jones@linaro.org (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 206c01d1ec14b5e238132ce7c8891ba02c3328c8 |
| Headers | show |
| Series | [1/1] ARM: dts: ux500: Supply nodes for the other 2 AB8500 PWM devices | expand |
On Mon, Jun 22, 2020 at 10:34 AM Lee Jones <lee.jones@linaro.org> wrote: > As per 'struct mfd_cell ab8500_devs[]' there are not 1, but 3 PWM > devices on the AB8500. Until now, each of them have referenced > the same Device Tree node. This change ensures each device has > their own. > > Due to recent `dtc` checks [0], nodes cannot share the same node > name, so we are forced to rename the affected nodes by appending > their associated numeric 'bank ID'. > > [0] ste-ab8500.dtsi:210.16-214.7: ERROR (duplicate_node_names): > /soc/prcmu@80157000/ab8500/ab8500-pwm: Duplicate node name > > Signed-off-by: Lee Jones <lee.jones@linaro.org> Patch applied! Yours, Linus Walleij
On Tue, Jul 7, 2020 at 2:11 PM Linus Walleij <linus.walleij@linaro.org> wrote: > On Mon, Jun 22, 2020 at 10:34 AM Lee Jones <lee.jones@linaro.org> wrote: > > > As per 'struct mfd_cell ab8500_devs[]' there are not 1, but 3 PWM > > devices on the AB8500. Until now, each of them have referenced > > the same Device Tree node. This change ensures each device has > > their own. > > > > Due to recent `dtc` checks [0], nodes cannot share the same node > > name, so we are forced to rename the affected nodes by appending > > their associated numeric 'bank ID'. > > > > [0] ste-ab8500.dtsi:210.16-214.7: ERROR (duplicate_node_names): > > /soc/prcmu@80157000/ab8500/ab8500-pwm: Duplicate node name > > > > Signed-off-by: Lee Jones <lee.jones@linaro.org> > > Patch applied! BTW shouldn't we also patch ste-ab8505.dts? Yours, Linus Walleij
diff --git a/arch/arm/boot/dts/ste-ab8500.dtsi b/arch/arm/boot/dts/ste-ab8500.dtsi index 3cd6ee6d50e0e..aab5719cc1a93 100644 --- a/arch/arm/boot/dts/ste-ab8500.dtsi +++ b/arch/arm/boot/dts/ste-ab8500.dtsi @@ -201,7 +201,19 @@ ab8500-sysctrl { compatible = "stericsson,ab8500-sysctrl"; }; - ab8500-pwm { + ab8500-pwm-1 { + compatible = "stericsson,ab8500-pwm"; + clocks = <&ab8500_clock AB8500_SYSCLK_INT>; + clock-names = "intclk"; + }; + + ab8500-pwm-2 { + compatible = "stericsson,ab8500-pwm"; + clocks = <&ab8500_clock AB8500_SYSCLK_INT>; + clock-names = "intclk"; + }; + + ab8500-pwm-3 { compatible = "stericsson,ab8500-pwm"; clocks = <&ab8500_clock AB8500_SYSCLK_INT>; clock-names = "intclk";
As per 'struct mfd_cell ab8500_devs[]' there are not 1, but 3 PWM devices on the AB8500. Until now, each of them have referenced the same Device Tree node. This change ensures each device has their own. Due to recent `dtc` checks [0], nodes cannot share the same node name, so we are forced to rename the affected nodes by appending their associated numeric 'bank ID'. [0] ste-ab8500.dtsi:210.16-214.7: ERROR (duplicate_node_names): /soc/prcmu@80157000/ab8500/ab8500-pwm: Duplicate node name Signed-off-by: Lee Jones <lee.jones@linaro.org> --- arch/arm/boot/dts/ste-ab8500.dtsi | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)