[v2,2/4] mvebu: xp: Add pwm properties to .dtsi files

Message ID 20170318154305.28348-3-ralph.sennhauser@gmail.com
State New
Headers show

Commit Message

Ralph Sennhauser March 18, 2017, 3:43 p.m.
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/
Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>
---
 arch/arm/boot/dts/armada-370.dtsi        | 10 ++++++++--
 arch/arm/boot/dts/armada-xp-mv78230.dtsi | 10 ++++++++--
 arch/arm/boot/dts/armada-xp-mv78260.dtsi |  8 ++++++--
 arch/arm/boot/dts/armada-xp-mv78460.dtsi | 10 ++++++++--
 4 files changed, 30 insertions(+), 8 deletions(-)

Comments

Gregory CLEMENT March 23, 2017, 4:40 p.m. | #1
Hi Ralph,
 
 On sam., mars 18 2017, Ralph Sennhauser <ralph.sennhauser@gmail.com> wrote:

It seems that I don't receive the 1st patch of the series.

Also could you refresh my mind to expose why these patchse were not
apply the first time and why we should apply them now?

Thanks,

Gregory


> 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/
> Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>
> ---
>  arch/arm/boot/dts/armada-370.dtsi        | 10 ++++++++--
>  arch/arm/boot/dts/armada-xp-mv78230.dtsi | 10 ++++++++--
>  arch/arm/boot/dts/armada-xp-mv78260.dtsi |  8 ++++++--
>  arch/arm/boot/dts/armada-xp-mv78460.dtsi | 10 ++++++++--
>  4 files changed, 30 insertions(+), 8 deletions(-)
>
> diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi
> index cc011c8..aa9fe72 100644
> --- a/arch/arm/boot/dts/armada-370.dtsi
> +++ b/arch/arm/boot/dts/armada-370.dtsi
> @@ -138,24 +138,30 @@
>  
>  			gpio0: gpio@18100 {
>  				compatible = "marvell,orion-gpio";
> -				reg = <0x18100 0x40>;
> +				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>;
> +				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 {
> diff --git a/arch/arm/boot/dts/armada-xp-mv78230.dtsi b/arch/arm/boot/dts/armada-xp-mv78230.dtsi
> index 07c5090..fc3934f 100644
> --- a/arch/arm/boot/dts/armada-xp-mv78230.dtsi
> +++ b/arch/arm/boot/dts/armada-xp-mv78230.dtsi
> @@ -203,24 +203,30 @@
>  		internal-regs {
>  			gpio0: gpio@18100 {
>  				compatible = "marvell,orion-gpio";
> -				reg = <0x18100 0x40>;
> +				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>;
> +				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..04dda6a 100644
> --- a/arch/arm/boot/dts/armada-xp-mv78260.dtsi
> +++ b/arch/arm/boot/dts/armada-xp-mv78260.dtsi
> @@ -286,24 +286,28 @@
>  		internal-regs {
>  			gpio0: gpio@18100 {
>  				compatible = "marvell,orion-gpio";
> -				reg = <0x18100 0x40>;
> +				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>;
> +				reg = <0x18140 0x40>, <0x181c8 0x08>;
>  				ngpios = <32>;
>  				gpio-controller;
>  				#gpio-cells = <2>;
>  				interrupt-controller;
>  				#interrupt-cells = <2>;
>  				interrupts = <87>, <88>, <89>, <90>;
> +				clocks = <&coreclk 0>;
>  			};
>  
>  			gpio2: gpio@18180 {
> diff --git a/arch/arm/boot/dts/armada-xp-mv78460.dtsi b/arch/arm/boot/dts/armada-xp-mv78460.dtsi
> index d1383dd..fb6d28a 100644
> --- a/arch/arm/boot/dts/armada-xp-mv78460.dtsi
> +++ b/arch/arm/boot/dts/armada-xp-mv78460.dtsi
> @@ -324,24 +324,30 @@
>  		internal-regs {
>  			gpio0: gpio@18100 {
>  				compatible = "marvell,orion-gpio";
> -				reg = <0x18100 0x40>;
> +				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>;
> +				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 {
> -- 
> 2.10.2
>
Andrew Lunn March 23, 2017, 9:22 p.m. | #2
> Also could you refresh my mind to expose why these patchse were not
> apply the first time and why we should apply them now?

Hi Gregory

Because i got busy with other things, and never spent the time needed
to address the comments. Ralph has addressed all the comments from the
original posting.

	 Andrew
--
To unsubscribe from this list: send the line "unsubscribe linux-gpio" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Gregory CLEMENT March 24, 2017, 8:37 a.m. | #3
Hi Ralph,
 
 On ven., mars 24 2017, Ralph Sennhauser <ralph.sennhauser@gmail.com> wrote:

> On Thu, 23 Mar 2017 17:40:53 +0100
> Gregory CLEMENT <gregory.clement@free-electrons.com> wrote:
>
>> Hi Ralph,
>>  
>>  On sam., mars 18 2017, Ralph Sennhauser <ralph.sennhauser@gmail.com>
>> wrote:
>> 
>> It seems that I don't receive the 1st patch of the series.
>
> Hi Gregory,
>
> it makes no sense to only send part of a series to a recipient. Will

To be frank it depends. Some maintainers don't want to receive a patch
which is not related to their subsystem. But it is not my case, I prefer
to have the full picture.

> have to improve my use of --cc-cmd it seems. Will pay attention to this
> for v3.

Also don't forget to add te cover letter too if you have written one.

Thanks!

Gregory

>
> Sorry
> Ralph
>
>> 
>> Also could you refresh my mind to expose why these patchse were not
>> apply the first time and why we should apply them now?
>> 
>> Thanks,
>> 
>> Gregory
>> 
>> 
>> > 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/
>> > Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>
>> > ---
>> >  arch/arm/boot/dts/armada-370.dtsi        | 10 ++++++++--
>> >  arch/arm/boot/dts/armada-xp-mv78230.dtsi | 10 ++++++++--
>> >  arch/arm/boot/dts/armada-xp-mv78260.dtsi |  8 ++++++--
>> >  arch/arm/boot/dts/armada-xp-mv78460.dtsi | 10 ++++++++--
>> >  4 files changed, 30 insertions(+), 8 deletions(-)
>> >
>> > diff --git a/arch/arm/boot/dts/armada-370.dtsi
>> > b/arch/arm/boot/dts/armada-370.dtsi index cc011c8..aa9fe72 100644
>> > --- a/arch/arm/boot/dts/armada-370.dtsi
>> > +++ b/arch/arm/boot/dts/armada-370.dtsi
>> > @@ -138,24 +138,30 @@
>> >  
>> >  			gpio0: gpio@18100 {
>> >  				compatible = "marvell,orion-gpio";
>> > -				reg = <0x18100 0x40>;
>> > +				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>;
>> > +				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 {
>> > diff --git a/arch/arm/boot/dts/armada-xp-mv78230.dtsi
>> > b/arch/arm/boot/dts/armada-xp-mv78230.dtsi index 07c5090..fc3934f
>> > 100644 --- a/arch/arm/boot/dts/armada-xp-mv78230.dtsi
>> > +++ b/arch/arm/boot/dts/armada-xp-mv78230.dtsi
>> > @@ -203,24 +203,30 @@
>> >  		internal-regs {
>> >  			gpio0: gpio@18100 {
>> >  				compatible = "marvell,orion-gpio";
>> > -				reg = <0x18100 0x40>;
>> > +				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>;
>> > +				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..04dda6a
>> > 100644 --- a/arch/arm/boot/dts/armada-xp-mv78260.dtsi
>> > +++ b/arch/arm/boot/dts/armada-xp-mv78260.dtsi
>> > @@ -286,24 +286,28 @@
>> >  		internal-regs {
>> >  			gpio0: gpio@18100 {
>> >  				compatible = "marvell,orion-gpio";
>> > -				reg = <0x18100 0x40>;
>> > +				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>;
>> > +				reg = <0x18140 0x40>, <0x181c8
>> > 0x08>; ngpios = <32>;
>> >  				gpio-controller;
>> >  				#gpio-cells = <2>;
>> >  				interrupt-controller;
>> >  				#interrupt-cells = <2>;
>> >  				interrupts = <87>, <88>, <89>,
>> > <90>;
>> > +				clocks = <&coreclk 0>;
>> >  			};
>> >  
>> >  			gpio2: gpio@18180 {
>> > diff --git a/arch/arm/boot/dts/armada-xp-mv78460.dtsi
>> > b/arch/arm/boot/dts/armada-xp-mv78460.dtsi index d1383dd..fb6d28a
>> > 100644 --- a/arch/arm/boot/dts/armada-xp-mv78460.dtsi
>> > +++ b/arch/arm/boot/dts/armada-xp-mv78460.dtsi
>> > @@ -324,24 +324,30 @@
>> >  		internal-regs {
>> >  			gpio0: gpio@18100 {
>> >  				compatible = "marvell,orion-gpio";
>> > -				reg = <0x18100 0x40>;
>> > +				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>;
>> > +				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 {
>> > -- 
>> > 2.10.2
>> >  
>> 
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Patch

diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi
index cc011c8..aa9fe72 100644
--- a/arch/arm/boot/dts/armada-370.dtsi
+++ b/arch/arm/boot/dts/armada-370.dtsi
@@ -138,24 +138,30 @@ 
 
 			gpio0: gpio@18100 {
 				compatible = "marvell,orion-gpio";
-				reg = <0x18100 0x40>;
+				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>;
+				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 {
diff --git a/arch/arm/boot/dts/armada-xp-mv78230.dtsi b/arch/arm/boot/dts/armada-xp-mv78230.dtsi
index 07c5090..fc3934f 100644
--- a/arch/arm/boot/dts/armada-xp-mv78230.dtsi
+++ b/arch/arm/boot/dts/armada-xp-mv78230.dtsi
@@ -203,24 +203,30 @@ 
 		internal-regs {
 			gpio0: gpio@18100 {
 				compatible = "marvell,orion-gpio";
-				reg = <0x18100 0x40>;
+				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>;
+				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..04dda6a 100644
--- a/arch/arm/boot/dts/armada-xp-mv78260.dtsi
+++ b/arch/arm/boot/dts/armada-xp-mv78260.dtsi
@@ -286,24 +286,28 @@ 
 		internal-regs {
 			gpio0: gpio@18100 {
 				compatible = "marvell,orion-gpio";
-				reg = <0x18100 0x40>;
+				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>;
+				reg = <0x18140 0x40>, <0x181c8 0x08>;
 				ngpios = <32>;
 				gpio-controller;
 				#gpio-cells = <2>;
 				interrupt-controller;
 				#interrupt-cells = <2>;
 				interrupts = <87>, <88>, <89>, <90>;
+				clocks = <&coreclk 0>;
 			};
 
 			gpio2: gpio@18180 {
diff --git a/arch/arm/boot/dts/armada-xp-mv78460.dtsi b/arch/arm/boot/dts/armada-xp-mv78460.dtsi
index d1383dd..fb6d28a 100644
--- a/arch/arm/boot/dts/armada-xp-mv78460.dtsi
+++ b/arch/arm/boot/dts/armada-xp-mv78460.dtsi
@@ -324,24 +324,30 @@ 
 		internal-regs {
 			gpio0: gpio@18100 {
 				compatible = "marvell,orion-gpio";
-				reg = <0x18100 0x40>;
+				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>;
+				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 {