2022-04-12 10:15:09

by Aidan MacDonald

Subject: [PATCH] mips: dts: ingenic: x1000: Add PWM device tree node

Copied from the jz4740 devicetree and trimmed to 5 timers, which
is what the hardware supports.

Signed-off-by: Aidan MacDonald <[email protected]>
---
arch/mips/boot/dts/ingenic/x1000.dtsi | 13 +++++++++++++
1 file changed, 13 insertions(+)

diff --git a/arch/mips/boot/dts/ingenic/x1000.dtsi b/arch/mips/boot/dts/ingenic/x1000.dtsi
index 8bd27edef216..0dcf37527c8e 100644
--- a/arch/mips/boot/dts/ingenic/x1000.dtsi
+++ b/arch/mips/boot/dts/ingenic/x1000.dtsi
@@ -127,6 +127,19 @@ wdt: watchdog@0 {
clocks = <&tcu TCU_CLK_WDT>;
clock-names = "wdt";
};
+
+ pwm: pwm@40 {
+ compatible = "ingenic,x1000-pwm";
+ reg = <0x40 0x80>;
+
+ #pwm-cells = <3>;
+
+ clocks = <&tcu TCU_CLK_TIMER0>, <&tcu TCU_CLK_TIMER1>,
+ <&tcu TCU_CLK_TIMER2>, <&tcu TCU_CLK_TIMER3>,
+ <&tcu TCU_CLK_TIMER4>;
+ clock-names = "timer0", "timer1", "timer2",
+ "timer3", "timer4";
+ };
};

rtc: rtc@10003000 {
--
2.35.1

2022-04-12 20:50:26

by Aidan MacDonald

Subject: Re: [PATCH] mips: dts: ingenic: x1000: Add PWM device tree node

On Mon, Apr 11, 2022 at 08:41:26PM +0800, Zhou Yanjie wrote:
> Hi Aidan,
>
> On 2022/4/11 下午6:01, Aidan MacDonald wrote:
> > Copied from the jz4740 devicetree and trimmed to 5 timers, which
> > is what the hardware supports.
> >
> > Signed-off-by: Aidan MacDonald <[email protected]>
> > ---
> > arch/mips/boot/dts/ingenic/x1000.dtsi | 13 +++++++++++++
> > 1 file changed, 13 insertions(+)
> >
> > diff --git a/arch/mips/boot/dts/ingenic/x1000.dtsi b/arch/mips/boot/dts/ingenic/x1000.dtsi
> > index 8bd27edef216..0dcf37527c8e 100644
> > --- a/arch/mips/boot/dts/ingenic/x1000.dtsi
> > +++ b/arch/mips/boot/dts/ingenic/x1000.dtsi
> > @@ -127,6 +127,19 @@ wdt: watchdog@0 {
> > clocks = <&tcu TCU_CLK_WDT>;
> > clock-names = "wdt";
> > };
> > +
> > + pwm: pwm@40 {
> > + compatible = "ingenic,x1000-pwm";
> > + reg = <0x40 0x80>;
>
>
> It seems more reasonable to use "reg = <0x40 0x80>" since the
> X1000 has only 5 PWM channels.

I think you mean "reg = <0x40 0x60>" but I'll do that, thanks!

> > +
> > + #pwm-cells = <3>;
> > +
> > + clocks = <&tcu TCU_CLK_TIMER0>, <&tcu TCU_CLK_TIMER1>,
> > + <&tcu TCU_CLK_TIMER2>, <&tcu TCU_CLK_TIMER3>,
> > + <&tcu TCU_CLK_TIMER4>;
> > + clock-names = "timer0", "timer1", "timer2",
> > + "timer3", "timer4";
>
>
> One line is now allowed to hold at most 100 characters,
> so it is possible to use only one line like:
>
>         clock-names = "timer0", "timer1", "timer2", "timer3", "timer4";
>
> to reduce the number of lines in the dtsi file.

Sounds good to me.

>
>
> Thanks and best regards!
>
>
> > + };
> > };
> >
> > rtc: rtc@10003000 {

Regards,
Aidan

2022-04-12 21:15:01

by Zhou Yanjie

Subject: Re: [PATCH] mips: dts: ingenic: x1000: Add PWM device tree node

Hi Aidan,

On 2022/4/11 下午11:47, Aidan MacDonald wrote:
> On Mon, Apr 11, 2022 at 08:41:26PM +0800, Zhou Yanjie wrote:
>> Hi Aidan,
>>
>> On 2022/4/11 下午6:01, Aidan MacDonald wrote:
>>> Copied from the jz4740 devicetree and trimmed to 5 timers, which
>>> is what the hardware supports.
>>>
>>> Signed-off-by: Aidan MacDonald <[email protected]>
>>> ---
>>> arch/mips/boot/dts/ingenic/x1000.dtsi | 13 +++++++++++++
>>> 1 file changed, 13 insertions(+)
>>>
>>> diff --git a/arch/mips/boot/dts/ingenic/x1000.dtsi b/arch/mips/boot/dts/ingenic/x1000.dtsi
>>> index 8bd27edef216..0dcf37527c8e 100644
>>> --- a/arch/mips/boot/dts/ingenic/x1000.dtsi
>>> +++ b/arch/mips/boot/dts/ingenic/x1000.dtsi
>>> @@ -127,6 +127,19 @@ wdt: watchdog@0 {
>>> clocks = <&tcu TCU_CLK_WDT>;
>>> clock-names = "wdt";
>>> };
>>> +
>>> + pwm: pwm@40 {
>>> + compatible = "ingenic,x1000-pwm";
>>> + reg = <0x40 0x80>;
>>
>> It seems more reasonable to use "reg = <0x40 0x80>" since the
>> X1000 has only 5 PWM channels.
> I think you mean "reg = <0x40 0x60>" but I'll do that, thanks!


Ah, yes, what a what a stupid mistake... :(


>
>>> +
>>> + #pwm-cells = <3>;
>>> +
>>> + clocks = <&tcu TCU_CLK_TIMER0>, <&tcu TCU_CLK_TIMER1>,
>>> + <&tcu TCU_CLK_TIMER2>, <&tcu TCU_CLK_TIMER3>,
>>> + <&tcu TCU_CLK_TIMER4>;
>>> + clock-names = "timer0", "timer1", "timer2",
>>> + "timer3", "timer4";
>>
>> One line is now allowed to hold at most 100 characters,
>> so it is possible to use only one line like:
>>
>>         clock-names = "timer0", "timer1", "timer2", "timer3", "timer4";
>>
>> to reduce the number of lines in the dtsi file.
> Sounds good to me.
>
>>
>> Thanks and best regards!
>>
>>
>>> + };
>>> };
>>>
>>> rtc: rtc@10003000 {
> Regards,
> Aidan

2022-04-12 23:55:49

by Zhou Yanjie

Subject: Re: [PATCH] mips: dts: ingenic: x1000: Add PWM device tree node

Hi Aidan,

On 2022/4/11 下午6:01, Aidan MacDonald wrote:
> Copied from the jz4740 devicetree and trimmed to 5 timers, which
> is what the hardware supports.
>
> Signed-off-by: Aidan MacDonald <[email protected]>
> ---
> arch/mips/boot/dts/ingenic/x1000.dtsi | 13 +++++++++++++
> 1 file changed, 13 insertions(+)
>
> diff --git a/arch/mips/boot/dts/ingenic/x1000.dtsi b/arch/mips/boot/dts/ingenic/x1000.dtsi
> index 8bd27edef216..0dcf37527c8e 100644
> --- a/arch/mips/boot/dts/ingenic/x1000.dtsi
> +++ b/arch/mips/boot/dts/ingenic/x1000.dtsi
> @@ -127,6 +127,19 @@ wdt: watchdog@0 {
> clocks = <&tcu TCU_CLK_WDT>;
> clock-names = "wdt";
> };
> +
> + pwm: pwm@40 {
> + compatible = "ingenic,x1000-pwm";
> + reg = <0x40 0x80>;


It seems more reasonable to use "reg = <0x40 0x80>" since the
X1000 has only 5 PWM channels.


> +
> + #pwm-cells = <3>;
> +
> + clocks = <&tcu TCU_CLK_TIMER0>, <&tcu TCU_CLK_TIMER1>,
> + <&tcu TCU_CLK_TIMER2>, <&tcu TCU_CLK_TIMER3>,
> + <&tcu TCU_CLK_TIMER4>;
> + clock-names = "timer0", "timer1", "timer2",
> + "timer3", "timer4";


One line is now allowed to hold at most 100 characters,
so it is possible to use only one line like:

        clock-names = "timer0", "timer1", "timer2", "timer3", "timer4";

to reduce the number of lines in the dtsi file.


Thanks and best regards!


> + };
> };
>
> rtc: rtc@10003000 {