diff mbox

[v6,2/4] ARM: dts: mvebu: Add PWM properties to .dtsi files

Message ID 20170414154056.32055-3-ralph.sennhauser@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Ralph Sennhauser April 14, 2017, 3:40 p.m. UTC 
From: Andrew Lunn <andrew@lunn.ch>

Add properties to the GPIO nodes to allow them to be also used as PWM
lines.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
URL: https://patchwork.ozlabs.org/patch/427294/
[Ralph Sennhauser: Add new compatible string marvell,armada-370-xp-gpio]
Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>
Tested-by: Andrew Lunn <andrew@lunn.ch>
---
 arch/arm/boot/dts/armada-370.dtsi        | 19 ++++++++++++++-----
 arch/arm/boot/dts/armada-xp-mv78230.dtsi | 16 ++++++++++++----
 arch/arm/boot/dts/armada-xp-mv78260.dtsi | 19 ++++++++++++++-----
 arch/arm/boot/dts/armada-xp-mv78460.dtsi | 19 ++++++++++++++-----
 4 files changed, 54 insertions(+), 19 deletions(-)

Comments

Linus Walleij April 24, 2017, 9:19 a.m. UTC | #1 
On Fri, Apr 14, 2017 at 5:40 PM, Ralph Sennhauser
<ralph.sennhauser@gmail.com> wrote:

> From: Andrew Lunn <andrew@lunn.ch>
>
> Add properties to the GPIO nodes to allow them to be also used as PWM
> lines.
>
> Signed-off-by: Andrew Lunn <andrew@lunn.ch>
> URL: https://patchwork.ozlabs.org/patch/427294/
> [Ralph Sennhauser: Add new compatible string marvell,armada-370-xp-gpio]
> Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>
> Tested-by: Andrew Lunn <andrew@lunn.ch>

Acked-by: Linus Walleij <linus.walleij@linaro.org>

Please funnel this through ARM SoC.

Yours,
Linus Walleij
Ralph Sennhauser May 5, 2017, 7:41 a.m. UTC | #2 
On Mon, 24 Apr 2017 11:19:32 +0200
Linus Walleij <linus.walleij@linaro.org> wrote:

> On Fri, Apr 14, 2017 at 5:40 PM, Ralph Sennhauser
> <ralph.sennhauser@gmail.com> wrote:
> 
> > From: Andrew Lunn <andrew@lunn.ch>
> >
> > Add properties to the GPIO nodes to allow them to be also used as
> > PWM lines.
> >
> > Signed-off-by: Andrew Lunn <andrew@lunn.ch>
> > URL: https://patchwork.ozlabs.org/patch/427294/
> > [Ralph Sennhauser: Add new compatible string
> > marvell,armada-370-xp-gpio] Signed-off-by: Ralph Sennhauser
> > <ralph.sennhauser@gmail.com> Tested-by: Andrew Lunn
> > <andrew@lunn.ch>  
> 
> Acked-by: Linus Walleij <linus.walleij@linaro.org>
> 
> Please funnel this through ARM SoC.

Hi Gregory,

A reminder on the off chance you have missed this and it's not to late
already, Linus Walleij took the driver and submitted it for inclusion in
4.12 [1]. So for completeness it be nice to have the dts(i) and
defconfig changes in as well.

Thanks
Ralph

[1] https://lkml.org/lkml/2017/5/4/82

> 
> Yours,
> Linus Walleij
Gregory CLEMENT May 5, 2017, 8:09 a.m. UTC | #3 
Hi Ralph,
 
 On ven., mai 05 2017, Ralph Sennhauser <ralph.sennhauser@gmail.com> wrote:

> On Mon, 24 Apr 2017 11:19:32 +0200
> Linus Walleij <linus.walleij@linaro.org> wrote:
>
>> On Fri, Apr 14, 2017 at 5:40 PM, Ralph Sennhauser
>> <ralph.sennhauser@gmail.com> wrote:
>> 
>> > From: Andrew Lunn <andrew@lunn.ch>
>> >
>> > Add properties to the GPIO nodes to allow them to be also used as
>> > PWM lines.
>> >
>> > Signed-off-by: Andrew Lunn <andrew@lunn.ch>
>> > URL: https://patchwork.ozlabs.org/patch/427294/
>> > [Ralph Sennhauser: Add new compatible string
>> > marvell,armada-370-xp-gpio] Signed-off-by: Ralph Sennhauser
>> > <ralph.sennhauser@gmail.com> Tested-by: Andrew Lunn
>> > <andrew@lunn.ch>  
>> 
>> Acked-by: Linus Walleij <linus.walleij@linaro.org>
>> 
>> Please funnel this through ARM SoC.
>
> Hi Gregory,
>
> A reminder on the off chance you have missed this and it's not to late
> already, Linus Walleij took the driver and submitted it for inclusion in
> 4.12 [1]. So for completeness it be nice to have the dts(i) and
> defconfig changes in as well.

Unfortunately it was too late to applied and to push it to arm-soc when
the gpio part was applied.

So I will apply when 4.12-rc1 will be released and it will be
included in the 4.13 release.

Gregory
>
> Thanks
> Ralph
>
> [1] https://lkml.org/lkml/2017/5/4/82
>
>> 
>> Yours,
>> Linus Walleij
>
Ralph Sennhauser May 5, 2017, 8:15 a.m. UTC | #4 
On Fri, 05 May 2017 10:09:09 +0200
Gregory CLEMENT <gregory.clement@free-electrons.com> wrote:

> Hi Ralph,
>  
>  On ven., mai 05 2017, Ralph Sennhauser <ralph.sennhauser@gmail.com>
> wrote:
> 
> > On Mon, 24 Apr 2017 11:19:32 +0200
> > Linus Walleij <linus.walleij@linaro.org> wrote:
> >  
> >> On Fri, Apr 14, 2017 at 5:40 PM, Ralph Sennhauser
> >> <ralph.sennhauser@gmail.com> wrote:
> >>   
> >> > From: Andrew Lunn <andrew@lunn.ch>
> >> >
> >> > Add properties to the GPIO nodes to allow them to be also used as
> >> > PWM lines.
> >> >
> >> > Signed-off-by: Andrew Lunn <andrew@lunn.ch>
> >> > URL: https://patchwork.ozlabs.org/patch/427294/
> >> > [Ralph Sennhauser: Add new compatible string
> >> > marvell,armada-370-xp-gpio] Signed-off-by: Ralph Sennhauser
> >> > <ralph.sennhauser@gmail.com> Tested-by: Andrew Lunn
> >> > <andrew@lunn.ch>    
> >> 
> >> Acked-by: Linus Walleij <linus.walleij@linaro.org>
> >> 
> >> Please funnel this through ARM SoC.  
> >
> > Hi Gregory,
> >
> > A reminder on the off chance you have missed this and it's not to
> > late already, Linus Walleij took the driver and submitted it for
> > inclusion in 4.12 [1]. So for completeness it be nice to have the
> > dts(i) and defconfig changes in as well.  
> 
> Unfortunately it was too late to applied and to push it to arm-soc
> when the gpio part was applied.
> 
> So I will apply when 4.12-rc1 will be released and it will be
> included in the 4.13 release.

Such is life, thanks for the heads up.

Ralph

> 
> Gregory
> >
> > Thanks
> > Ralph
> >
> > [1] https://lkml.org/lkml/2017/5/4/82
> >  
> >> 
> >> Yours,
> >> Linus Walleij  
> >  
>
Gregory CLEMENT May 23, 2017, 1:53 p.m. UTC | #5 
Hi,
 
 On lun., avril 24 2017, Linus Walleij <linus.walleij@linaro.org> wrote:

> On Fri, Apr 14, 2017 at 5:40 PM, Ralph Sennhauser
> <ralph.sennhauser@gmail.com> wrote:
>
>> From: Andrew Lunn <andrew@lunn.ch>
>>
>> Add properties to the GPIO nodes to allow them to be also used as PWM
>> lines.
>>
>> Signed-off-by: Andrew Lunn <andrew@lunn.ch>
>> URL: https://patchwork.ozlabs.org/patch/427294/
>> [Ralph Sennhauser: Add new compatible string marvell,armada-370-xp-gpio]
>> Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>
>> Tested-by: Andrew Lunn <andrew@lunn.ch>
>
> Acked-by: Linus Walleij <linus.walleij@linaro.org>
>
> Please funnel this through ARM SoC.


Applied on mvebu/dt

Thanks,

Gregory

>
> Yours,
> Linus Walleij
diff mbox

Patch

diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi
index cc011c8..5e815cc 100644
--- a/arch/arm/boot/dts/armada-370.dtsi
+++ b/arch/arm/boot/dts/armada-370.dtsi
@@ -137,29 +137,38 @@ 
 			};
 
 			gpio0: gpio@18100 {
-				compatible = "marvell,orion-gpio";
-				reg = <0x18100 0x40>;
+				compatible = "marvell,armada-370-xp-gpio",
+					     "marvell,orion-gpio";
+				reg = <0x18100 0x40>, <0x181c0 0x08>;
+				reg-names = "gpio", "pwm";
 				ngpios = <32>;
 				gpio-controller;
 				#gpio-cells = <2>;
+				#pwm-cells = <2>;
 				interrupt-controller;
 				#interrupt-cells = <2>;
 				interrupts = <82>, <83>, <84>, <85>;
+				clocks = <&coreclk 0>;
 			};
 
 			gpio1: gpio@18140 {
-				compatible = "marvell,orion-gpio";
-				reg = <0x18140 0x40>;
+				compatible = "marvell,armada-370-xp-gpio",
+					     "marvell,orion-gpio";
+				reg = <0x18140 0x40>, <0x181c8 0x08>;
+				reg-names = "gpio", "pwm";
 				ngpios = <32>;
 				gpio-controller;
 				#gpio-cells = <2>;
+				#pwm-cells = <2>;
 				interrupt-controller;
 				#interrupt-cells = <2>;
 				interrupts = <87>, <88>, <89>, <90>;
+				clocks = <&coreclk 0>;
 			};
 
 			gpio2: gpio@18180 {
-				compatible = "marvell,orion-gpio";
+				compatible = "marvell,armada-370-xp-gpio",
+					     "marvell,orion-gpio";
 				reg = <0x18180 0x40>;
 				ngpios = <2>;
 				gpio-controller;
diff --git a/arch/arm/boot/dts/armada-xp-mv78230.dtsi b/arch/arm/boot/dts/armada-xp-mv78230.dtsi
index 07c5090..f77168c9 100644
--- a/arch/arm/boot/dts/armada-xp-mv78230.dtsi
+++ b/arch/arm/boot/dts/armada-xp-mv78230.dtsi
@@ -202,25 +202,33 @@ 
 
 		internal-regs {
 			gpio0: gpio@18100 {
-				compatible = "marvell,orion-gpio";
-				reg = <0x18100 0x40>;
+				compatible = "marvell,armada-370-xp-gpio",
+					     "marvell,orion-gpio";
+				reg = <0x18100 0x40>, <0x181c0 0x08>;
+				reg-names = "gpio", "pwm";
 				ngpios = <32>;
 				gpio-controller;
 				#gpio-cells = <2>;
+				#pwm-cells = <2>;
 				interrupt-controller;
 				#interrupt-cells = <2>;
 				interrupts = <82>, <83>, <84>, <85>;
+				clocks = <&coreclk 0>;
 			};
 
 			gpio1: gpio@18140 {
-				compatible = "marvell,orion-gpio";
-				reg = <0x18140 0x40>;
+				compatible = "marvell,armada-370-xp-gpio",
+					     "marvell,orion-gpio";
+				reg = <0x18140 0x40>, <0x181c8 0x08>;
+				reg-names = "gpio", "pwm";
 				ngpios = <17>;
 				gpio-controller;
 				#gpio-cells = <2>;
+				#pwm-cells = <2>;
 				interrupt-controller;
 				#interrupt-cells = <2>;
 				interrupts = <87>, <88>, <89>;
+				clocks = <&coreclk 0>;
 			};
 		};
 	};
diff --git a/arch/arm/boot/dts/armada-xp-mv78260.dtsi b/arch/arm/boot/dts/armada-xp-mv78260.dtsi
index 64e936a..0ecfaf4 100644
--- a/arch/arm/boot/dts/armada-xp-mv78260.dtsi
+++ b/arch/arm/boot/dts/armada-xp-mv78260.dtsi
@@ -285,29 +285,38 @@ 
 
 		internal-regs {
 			gpio0: gpio@18100 {
-				compatible = "marvell,orion-gpio";
-				reg = <0x18100 0x40>;
+				compatible = "marvell,armada-370-xp-gpio",
+					     "marvell,orion-gpio";
+				reg = <0x18100 0x40>, <0x181c0 0x08>;
+				reg-names = "gpio", "pwm";
 				ngpios = <32>;
 				gpio-controller;
 				#gpio-cells = <2>;
+				#pwm-cells = <2>;
 				interrupt-controller;
 				#interrupt-cells = <2>;
 				interrupts = <82>, <83>, <84>, <85>;
+				clocks = <&coreclk 0>;
 			};
 
 			gpio1: gpio@18140 {
-				compatible = "marvell,orion-gpio";
-				reg = <0x18140 0x40>;
+				compatible = "marvell,armada-370-xp-gpio",
+					     "marvell,orion-gpio";
+				reg = <0x18140 0x40>, <0x181c8 0x08>;
+				reg-names = "gpio", "pwm";
 				ngpios = <32>;
 				gpio-controller;
 				#gpio-cells = <2>;
+				#pwm-cells = <2>;
 				interrupt-controller;
 				#interrupt-cells = <2>;
 				interrupts = <87>, <88>, <89>, <90>;
+				clocks = <&coreclk 0>;
 			};
 
 			gpio2: gpio@18180 {
-				compatible = "marvell,orion-gpio";
+				compatible = "marvell,armada-370-xp-gpio",
+					     "marvell,orion-gpio";
 				reg = <0x18180 0x40>;
 				ngpios = <3>;
 				gpio-controller;
diff --git a/arch/arm/boot/dts/armada-xp-mv78460.dtsi b/arch/arm/boot/dts/armada-xp-mv78460.dtsi
index d1383dd..670ece4c 100644
--- a/arch/arm/boot/dts/armada-xp-mv78460.dtsi
+++ b/arch/arm/boot/dts/armada-xp-mv78460.dtsi
@@ -323,29 +323,38 @@ 
 
 		internal-regs {
 			gpio0: gpio@18100 {
-				compatible = "marvell,orion-gpio";
-				reg = <0x18100 0x40>;
+				compatible = "marvell,armada-370-xp-gpio",
+					     "marvell,orion-gpio";
+				reg = <0x18100 0x40>, <0x181c0 0x08>;
+				reg-names = "gpio", "pwm";
 				ngpios = <32>;
 				gpio-controller;
 				#gpio-cells = <2>;
+				#pwm-cells = <2>;
 				interrupt-controller;
 				#interrupt-cells = <2>;
 				interrupts = <82>, <83>, <84>, <85>;
+				clocks = <&coreclk 0>;
 			};
 
 			gpio1: gpio@18140 {
-				compatible = "marvell,orion-gpio";
-				reg = <0x18140 0x40>;
+				compatible = "marvell,armada-370-xp-gpio",
+					     "marvell,orion-gpio";
+				reg = <0x18140 0x40>, <0x181c8 0x08>;
+				reg-names = "gpio", "pwm";
 				ngpios = <32>;
 				gpio-controller;
 				#gpio-cells = <2>;
+				#pwm-cells = <2>;
 				interrupt-controller;
 				#interrupt-cells = <2>;
 				interrupts = <87>, <88>, <89>, <90>;
+				clocks = <&coreclk 0>;
 			};
 
 			gpio2: gpio@18180 {
-				compatible = "marvell,orion-gpio";
+				compatible = "marvell,armada-370-xp-gpio",
+					     "marvell,orion-gpio";
 				reg = <0x18180 0x40>;
 				ngpios = <3>;
 				gpio-controller;