gpio: mvebu: Fix check for pwm support on non-A8K platforms

pwm support incompatible with Armada 80x0/70x0 API is not only in Armada 370, but also in Armada XP, 38x and 39x. So basically every non-A8K platform. Fix check for pwm support appropriately.

Fixes 85b7d8abfec7 ("gpio: mvebu: add pwm support for Armada 8K/7K")

Signed-off-by Pali Rohár <[email protected]>

---
 drivers/gpio/gpio-mvebu.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

drivers/gpio/gpio-mvebu.c +0 -0

index 2db19cd640a4..70a22b68c034 100644

pwm support incompatible with Armada 80x0/70x0 API is not only in Armada 370, but also in Armada XP, 38x and 39x. So basically every non-A8K platform. Fix check for pwm support appropriately.

Fixes 85b7d8abfec7 ("gpio: mvebu: add pwm support for Armada 8K/7K")

Signed-off-by Pali Rohár <[email protected]>

---
 drivers/gpio/gpio-mvebu.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

drivers/gpio/gpio-mvebu.c +0 -0

index 2db19cd640a4..70a22b68c034 100644

drivers/gpio/gpio-mvebu.c +0 -0

 		/*
 		 * There are only two sets of PWM configuration registers for
 		 * all the GPIO lines on those SoCs which this driver reserves

Armada 38x and Armada 39x should use compatible string "marvel,armadaxp-gpio".

Signed-off-by Pali Rohár <[email protected]>

---
 Documentation/devicetree/bindings/gpio/gpio-mvebu.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Armada 38x supports per CPU interrupts for gpios, like Armada XP. Pre-XP variants like Armada 370 do not support per CPU interrupts for gpios.

So change compatible string for Armada 38x from "marvell,armada-370-gpio" which indicates pre-XP variant to "marvell,armadaxp-gpio" which indicates XP variant or new.

Driver gpio-mvebu.c which handles both pre-XP and XP variants already provides support for per CPU interrupts on XP and newer variants.

Signed-off-by Pali Rohár <[email protected]>

Fixes 7cb2acb3fbae ("ARM: dts: mvebu: Add PWM properties for armada-38x")

---
 arch/arm/boot/dts/armada-38x.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

arch/arm/boot/dts/armada-38x.dtsi +0 -0

index df3c8d1d8f64..9343de6947b3 100644

Quoted 21 lines · Pali Rohár

Armada 38x supports per CPU interrupts for gpios, like Armada XP. Pre-XP variants like Armada 370 do not support per CPU interrupts for gpios.

So change compatible string for Armada 38x from "marvell,armada-370-gpio" which indicates pre-XP variant to "marvell,armadaxp-gpio" which indicates XP variant or new.

Driver gpio-mvebu.c which handles both pre-XP and XP variants already provides support for per CPU interrupts on XP and newer variants.

Signed-off-by Pali Rohár <[email protected]>

Fixes 7cb2acb3fbae ("ARM: dts: mvebu: Add PWM properties for armada-38x")

---
 arch/arm/boot/dts/armada-38x.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

arch/arm/boot/dts/armada-38x.dtsi +0 -0

index df3c8d1d8f64..9343de6947b3 100644

arch/arm/boot/dts/armada-38x.dtsi line 296

Quoted 6 lines

arch/arm/boot/dts/armada-38x.dtsi +1 -1

@@ -292,7 +292,7 @@
 			};
 
 			gpio0: gpio@18100 {
-				compatible = "marvell,armada-370-gpio",
+				compatible = "marvell,armadaxp-gpio",
 					     "marvell,orion-gpio";

If you can treat the XP variant as 370 and everything that is supposed to work on 370 works then, then maybe the right incarnation is:

	compatible = "marvell,armadaxp-gpio", "marvell,armada-370-gpio", "marvell,orion-gpio";

?

Best regards
Uwe

Signature · 2 lines

Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | https://www.pengutronix.de/ |

Quoted 34 lines · On Saturday 16 July 2022 16:40:28 Uwe Kleine-König wrote:

Quoted 21 lines · Pali Rohár

Armada 38x supports per CPU interrupts for gpios, like Armada XP. Pre-XP variants like Armada 370 do not support per CPU interrupts for gpios.

So change compatible string for Armada 38x from "marvell,armada-370-gpio" which indicates pre-XP variant to "marvell,armadaxp-gpio" which indicates XP variant or new.

Driver gpio-mvebu.c which handles both pre-XP and XP variants already provides support for per CPU interrupts on XP and newer variants.

Signed-off-by Pali Rohár <[email protected]>

Fixes 7cb2acb3fbae ("ARM: dts: mvebu: Add PWM properties for armada-38x")

---
 arch/arm/boot/dts/armada-38x.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

arch/arm/boot/dts/armada-38x.dtsi +0 -0

index df3c8d1d8f64..9343de6947b3 100644

arch/arm/boot/dts/armada-38x.dtsi line 296

Quoted 6 lines

arch/arm/boot/dts/armada-38x.dtsi +1 -1

@@ -292,7 +292,7 @@
 			};
 
 			gpio0: gpio@18100 {
-				compatible = "marvell,armada-370-gpio",
+				compatible = "marvell,armadaxp-gpio",
 					     "marvell,orion-gpio";

If you can treat the XP variant as 370 and everything that is supposed to work on 370 works then, then maybe the right incarnation is:

	compatible = "marvell,armadaxp-gpio", "marvell,armada-370-gpio", "marvell,orion-gpio";

Quoted 1 line

?

For pre-XP variants is "marvell,orion-gpio" enough and for XP + post-XP is needed "marvell,armadaxp-gpio" (with possible "marvell,orion-gpio" for backward compatibility).

So I do not see reason why to add "marvell,armada-370-gpio" nor what value it brings.

Quoted 41 lines · Pali Rohár

Quoted 32 lines · On Saturday 16 July 2022 16:40:28 Uwe Kleine-König wrote:

Quoted 21 lines · Pali Rohár

Armada 38x supports per CPU interrupts for gpios, like Armada XP. Pre-XP variants like Armada 370 do not support per CPU interrupts for gpios.

So change compatible string for Armada 38x from "marvell,armada-370-gpio" which indicates pre-XP variant to "marvell,armadaxp-gpio" which indicates XP variant or new.

Driver gpio-mvebu.c which handles both pre-XP and XP variants already provides support for per CPU interrupts on XP and newer variants.

Signed-off-by Pali Rohár <[email protected]>

Fixes 7cb2acb3fbae ("ARM: dts: mvebu: Add PWM properties for armada-38x")

---
 arch/arm/boot/dts/armada-38x.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

arch/arm/boot/dts/armada-38x.dtsi +0 -0

index df3c8d1d8f64..9343de6947b3 100644

arch/arm/boot/dts/armada-38x.dtsi line 296

Quoted 6 lines

arch/arm/boot/dts/armada-38x.dtsi +1 -1

@@ -292,7 +292,7 @@
 			};
 
 			gpio0: gpio@18100 {
-				compatible = "marvell,armada-370-gpio",
+				compatible = "marvell,armadaxp-gpio",
 					     "marvell,orion-gpio";

If you can treat the XP variant as 370 and everything that is supposed to work on 370 works then, then maybe the right incarnation is:

Quoted 3 lines

	compatible = "marvell,armadaxp-gpio", "marvell,armada-370-gpio", "marvell,orion-gpio";

?

For pre-XP variants is "marvell,orion-gpio" enough and for XP + post-XP is needed "marvell,armadaxp-gpio" (with possible "marvell,orion-gpio" for backward compatibility).

Quoted 2 lines

So I do not see reason why to add "marvell,armada-370-gpio" nor what value it brings.

If you boot an older kernel (i.e. one that doesn't support marvell,armadaxp-gpio, but does support marvell,armada-370-gpio), it

will work better as there are relevant differences between marvell,orion-gpio and marvell,armada-370-gpio.

For example some
registers seem to have a different offset ...

Quoted 42 lines · On Saturday 16 July 2022 17:07:51 Uwe Kleine-König wrote:

Quoted 41 lines · Pali Rohár

Quoted 32 lines · On Saturday 16 July 2022 16:40:28 Uwe Kleine-König wrote:

Quoted 21 lines · Pali Rohár

Armada 38x supports per CPU interrupts for gpios, like Armada XP. Pre-XP variants like Armada 370 do not support per CPU interrupts for gpios.

So change compatible string for Armada 38x from "marvell,armada-370-gpio" which indicates pre-XP variant to "marvell,armadaxp-gpio" which indicates XP variant or new.

Driver gpio-mvebu.c which handles both pre-XP and XP variants already provides support for per CPU interrupts on XP and newer variants.

Signed-off-by Pali Rohár <[email protected]>

Fixes 7cb2acb3fbae ("ARM: dts: mvebu: Add PWM properties for armada-38x")

---
 arch/arm/boot/dts/armada-38x.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

arch/arm/boot/dts/armada-38x.dtsi +0 -0

index df3c8d1d8f64..9343de6947b3 100644

arch/arm/boot/dts/armada-38x.dtsi line 296

Quoted 6 lines

arch/arm/boot/dts/armada-38x.dtsi +1 -1

@@ -292,7 +292,7 @@
 			};
 
 			gpio0: gpio@18100 {
-				compatible = "marvell,armada-370-gpio",
+				compatible = "marvell,armadaxp-gpio",
 					     "marvell,orion-gpio";

If you can treat the XP variant as 370 and everything that is supposed to work on 370 works then, then maybe the right incarnation is:

Quoted 3 lines

	compatible = "marvell,armadaxp-gpio", "marvell,armada-370-gpio", "marvell,orion-gpio";

?

For pre-XP variants is "marvell,orion-gpio" enough and for XP + post-XP is needed "marvell,armadaxp-gpio" (with possible "marvell,orion-gpio" for backward compatibility).

Quoted 5 lines

Quoted 2 lines

So I do not see reason why to add "marvell,armada-370-gpio" nor what value it brings.

If you boot an older kernel (i.e. one that doesn't support marvell,armadaxp-gpio, but does support marvell,armada-370-gpio), it

Is there such kernel version?

Quoted 2 lines

will work better as there are relevant differences between marvell,orion-gpio and marvell,armada-370-gpio.

And if yes, do we really need this in DTS files for new kernel versions? I can imagine that such change can be relevant for old LTS kernel version, but not for new versions.

Quoted 2 lines

For example some
registers seem to have a different offset ...

armada-370-gpio is mapped to MVEBU_GPIO_SOC_VARIANT_ORION, so it will get same offsets as orion-gpio. So no change.

Hello Pali,

Quoted 43 lines · Pali Rohár

Quoted 42 lines · On Saturday 16 July 2022 17:07:51 Uwe Kleine-König wrote:

Quoted 41 lines · Pali Rohár

Quoted 32 lines · On Saturday 16 July 2022 16:40:28 Uwe Kleine-König wrote:

Quoted 21 lines · Pali Rohár

Armada 38x supports per CPU interrupts for gpios, like Armada XP. Pre-XP variants like Armada 370 do not support per CPU interrupts for gpios.

So change compatible string for Armada 38x from "marvell,armada-370-gpio" which indicates pre-XP variant to "marvell,armadaxp-gpio" which indicates XP variant or new.

Driver gpio-mvebu.c which handles both pre-XP and XP variants already provides support for per CPU interrupts on XP and newer variants.

Signed-off-by Pali Rohár <[email protected]>

Fixes 7cb2acb3fbae ("ARM: dts: mvebu: Add PWM properties for armada-38x")

---
 arch/arm/boot/dts/armada-38x.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

arch/arm/boot/dts/armada-38x.dtsi +0 -0

index df3c8d1d8f64..9343de6947b3 100644

arch/arm/boot/dts/armada-38x.dtsi line 296

Quoted 6 lines

arch/arm/boot/dts/armada-38x.dtsi +1 -1

@@ -292,7 +292,7 @@
 			};
 
 			gpio0: gpio@18100 {
-				compatible = "marvell,armada-370-gpio",
+				compatible = "marvell,armadaxp-gpio",
 					     "marvell,orion-gpio";

If you can treat the XP variant as 370 and everything that is supposed to work on 370 works then, then maybe the right incarnation is:

Quoted 3 lines

	compatible = "marvell,armadaxp-gpio", "marvell,armada-370-gpio", "marvell,orion-gpio";

?

For pre-XP variants is "marvell,orion-gpio" enough and for XP + post-XP is needed "marvell,armadaxp-gpio" (with possible "marvell,orion-gpio" for backward compatibility).

Quoted 7 lines

Quoted 5 lines

Quoted 2 lines

So I do not see reason why to add "marvell,armada-370-gpio" nor what value it brings.

If you boot an older kernel (i.e. one that doesn't support marvell,armadaxp-gpio, but does support marvell,armada-370-gpio), it

Is there such kernel version?

Ah, I thought you added "marvell,armadaxp-gpio" with this patch series.

Quoted 7 lines

Quoted 2 lines

will work better as there are relevant differences between marvell,orion-gpio and marvell,armada-370-gpio.

And if yes, do we really need this in DTS files for new kernel versions? I can imagine that such change can be relevant for old LTS kernel version, but not for new versions.

Quoted 5 lines

Quoted 2 lines

For example some
registers seem to have a different offset ...

armada-370-gpio is mapped to MVEBU_GPIO_SOC_VARIANT_ORION, so it will get same offsets as orion-gpio. So no change.

OK, you're right, my assumptions were wrong. I'm convinced your change is fine now:

Acked-by Uwe Kleine-König <[email protected]>

Best regards
Uwe

Armada 38x supports per CPU interrupts for gpios, like Armada XP. Pre-XP variants like Armada 370 do not support per CPU interrupts for gpios.

So change compatible string for Armada 38x from "marvell,armada-370-gpio" which indicates pre-XP variant to "marvell,armadaxp-gpio" which indicates XP variant or new.

Driver gpio-mvebu.c which handles both pre-XP and XP variants already provides support for per CPU interrupts on XP and newer variants.

Signed-off-by Pali Rohár <[email protected]>

Fixes 7cb2acb3fbae ("ARM: dts: mvebu: Add PWM properties for armada-38x")

---
 arch/arm/boot/dts/armada-38x.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

arch/arm/boot/dts/armada-38x.dtsi +2 -2

index df3c8d1d8f64..9343de6947b3 100644
@@ -292,7 +292,7 @@
 			};
 
 			gpio0: gpio@18100 {
-				compatible = "marvell,armada-370-gpio",
+				compatible = "marvell,armadaxp-gpio",
 					     "marvell,orion-gpio";
 				reg = <0x18100 0x40>, <0x181c0 0x08>;
 				reg-names = "gpio", "pwm";

@@ -310,7 +310,7 @@
 			};
 
 			gpio1: gpio@18140 {
-				compatible = "marvell,armada-370-gpio",
+				compatible = "marvell,armadaxp-gpio",
 					     "marvell,orion-gpio";
 				reg = <0x18140 0x40>, <0x181c8 0x08>;
 				reg-names = "gpio", "pwm";

Signature · 1 line

2.20.1

Gregory: ping

Quoted 41 lines · On Thursday 14 July 2022 20:33:27 Pali Rohár wrote:

Armada 38x supports per CPU interrupts for gpios, like Armada XP. Pre-XP variants like Armada 370 do not support per CPU interrupts for gpios.

So change compatible string for Armada 38x from "marvell,armada-370-gpio" which indicates pre-XP variant to "marvell,armadaxp-gpio" which indicates XP variant or new.

Driver gpio-mvebu.c which handles both pre-XP and XP variants already provides support for per CPU interrupts on XP and newer variants.

Signed-off-by Pali Rohár <[email protected]>

Fixes 7cb2acb3fbae ("ARM: dts: mvebu: Add PWM properties for armada-38x")

---
 arch/arm/boot/dts/armada-38x.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

arch/arm/boot/dts/armada-38x.dtsi +2 -2

index df3c8d1d8f64..9343de6947b3 100644
@@ -292,7 +292,7 @@
 			};
 
 			gpio0: gpio@18100 {
-				compatible = "marvell,armada-370-gpio",
+				compatible = "marvell,armadaxp-gpio",
 					     "marvell,orion-gpio";
 				reg = <0x18100 0x40>, <0x181c0 0x08>;
 				reg-names = "gpio", "pwm";

@@ -310,7 +310,7 @@
 			};
 
 			gpio1: gpio@18140 {
-				compatible = "marvell,armada-370-gpio",
+				compatible = "marvell,armadaxp-gpio",
 					     "marvell,orion-gpio";
 				reg = <0x18140 0x40>, <0x181c8 0x08>;
 				reg-names = "gpio", "pwm";

Signature · 1 line

2.20.1

PING

Quoted 44 lines · On Saturday 01 October 2022 01:34:53 Pali Rohár wrote:

Gregory: ping

Quoted 41 lines · On Thursday 14 July 2022 20:33:27 Pali Rohár wrote:

Armada 38x supports per CPU interrupts for gpios, like Armada XP. Pre-XP variants like Armada 370 do not support per CPU interrupts for gpios.

So change compatible string for Armada 38x from "marvell,armada-370-gpio" which indicates pre-XP variant to "marvell,armadaxp-gpio" which indicates XP variant or new.

Driver gpio-mvebu.c which handles both pre-XP and XP variants already provides support for per CPU interrupts on XP and newer variants.

Signed-off-by Pali Rohár <[email protected]>

Fixes 7cb2acb3fbae ("ARM: dts: mvebu: Add PWM properties for armada-38x")

---
 arch/arm/boot/dts/armada-38x.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

arch/arm/boot/dts/armada-38x.dtsi +2 -2

index df3c8d1d8f64..9343de6947b3 100644
@@ -292,7 +292,7 @@
 			};
 
 			gpio0: gpio@18100 {
-				compatible = "marvell,armada-370-gpio",
+				compatible = "marvell,armadaxp-gpio",
 					     "marvell,orion-gpio";
 				reg = <0x18100 0x40>, <0x181c0 0x08>;
 				reg-names = "gpio", "pwm";

@@ -310,7 +310,7 @@
 			};
 
 			gpio1: gpio@18140 {
-				compatible = "marvell,armada-370-gpio",
+				compatible = "marvell,armadaxp-gpio",
 					     "marvell,orion-gpio";
 				reg = <0x18140 0x40>, <0x181c8 0x08>;
 				reg-names = "gpio", "pwm";

Signature · 1 line

2.20.1

Armada 38x supports per CPU interrupts for gpios, like Armada XP. Pre-XP variants like Armada 370 do not support per CPU interrupts for gpios.

So change compatible string for Armada 38x from "marvell,armada-370-gpio" which indicates pre-XP variant to "marvell,armadaxp-gpio" which indicates XP variant or new.

Driver gpio-mvebu.c which handles both pre-XP and XP variants already provides support for per CPU interrupts on XP and newer variants.

Signed-off-by Pali Rohár <[email protected]>

Fixes 7cb2acb3fbae ("ARM: dts: mvebu: Add PWM properties for armada-38x")

---
 arch/arm/boot/dts/armada-38x.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

arch/arm/boot/dts/armada-38x.dtsi +2 -2

index df3c8d1d8f64..9343de6947b3 100644
@@ -292,7 +292,7 @@
 			};
 
 			gpio0: gpio@18100 {
-				compatible = "marvell,armada-370-gpio",
+				compatible = "marvell,armadaxp-gpio",
 					     "marvell,orion-gpio";
 				reg = <0x18100 0x40>, <0x181c0 0x08>;
 				reg-names = "gpio", "pwm";

@@ -310,7 +310,7 @@
 			};
 
 			gpio1: gpio@18140 {
-				compatible = "marvell,armada-370-gpio",
+				compatible = "marvell,armadaxp-gpio",
 					     "marvell,orion-gpio";
 				reg = <0x18140 0x40>, <0x181c8 0x08>;
 				reg-names = "gpio", "pwm";

Signature · 1 line

2.20.1

Quoted 10 lines · Pali Rohár

Armada 38x supports per CPU interrupts for gpios, like Armada XP. Pre-XP variants like Armada 370 do not support per CPU interrupts for gpios.

So change compatible string for Armada 38x from "marvell,armada-370-gpio" which indicates pre-XP variant to "marvell,armadaxp-gpio" which indicates XP variant or new.

Driver gpio-mvebu.c which handles both pre-XP and XP variants already provides support for per CPU interrupts on XP and newer variants.

Quoted 2 lines

Signed-off-by Pali Rohár <[email protected]>

Fixes 7cb2acb3fbae ("ARM: dts: mvebu: Add PWM properties for armada-38x")

Applied on mvebu/dt

Thanks,

Gregory

Quoted 29 lines

---
 arch/arm/boot/dts/armada-38x.dtsi | 4 ++--

 1 file changed, 2 insertions(+), 2 deletions(-)

arch/arm/boot/dts/armada-38x.dtsi +0 -0

index df3c8d1d8f64..9343de6947b3 100644
@@ -292,7 +292,7 @@
                         };

                        gpio0: gpio@18100 {
-                               compatible = "marvell,armada-370-gpio", +                               compatible = "marvell,armadaxp-gpio", "marvell,orion-gpio"; reg = <0x18100 0x40>, <0x181c0 0x08>; reg-names = "gpio", "pwm";

arch/arm/boot/dts/armada-38x.dtsi +0 -0

@@ -310,7 +310,7 @@
                         };

                        gpio1: gpio@18140 {
-                               compatible = "marvell,armada-370-gpio", +                               compatible = "marvell,armadaxp-gpio", "marvell,orion-gpio"; reg = <0x18140 0x40>, <0x181c8 0x08>; reg-names = "gpio", "pwm";

Signature · 1 line

2.20.1

Armada 38x supports per CPU interrupts for gpios, like Armada XP. Pre-XP variants like Armada 370 do not support per CPU interrupts for gpios.

So change compatible string for Armada 38x from "marvell,armada-370-gpio" which indicates pre-XP variant to "marvell,armadaxp-gpio" which indicates XP variant or new.

Driver gpio-mvebu.c which handles both pre-XP and XP variants already provides support for per CPU interrupts on XP and newer variants.

Signed-off-by Pali Rohár <[email protected]>

Fixes 7cb2acb3fbae ("ARM: dts: mvebu: Add PWM properties for armada-38x")

---
  arch/arm/boot/dts/armada-38x.dtsi | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)

arch/arm/boot/dts/armada-38x.dtsi +0 -0

index df3c8d1d8f64..9343de6947b3 100644

arch/arm/boot/dts/armada-38x.dtsi +1 -1

@@ -310,7 +310,7 @@
  			};
 
  			gpio1: gpio@18140 {
-				compatible = "marvell,armada-370-gpio",
+				compatible = "marvell,armadaxp-gpio",
  					     "marvell,orion-gpio";
  				reg = <0x18140 0x40>, <0x181c8 0x08>;
  				reg-names = "gpio", "pwm";

Armada 39x supports per CPU interrupts for gpios, like Armada XP.

So add compatible string "marvell,armadaxp-gpio" for Armada 39x GPIO nodes.

Driver gpio-mvebu.c which handles both pre-XP and XP variants already provides support for per CPU interrupts on XP and newer variants.

Signed-off-by Pali Rohár <[email protected]>

Fixes d81a914fc630 ("ARM: dts: mvebu: armada-39x: add missing nodes describing GPIO's")

---
 arch/arm/boot/dts/armada-39x.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

arch/arm/boot/dts/armada-39x.dtsi +2 -2

index e0b7c2099831..ef3a3859802c 100644
@@ -213,7 +213,7 @@
 			};
 
 			gpio0: gpio@18100 {
-				compatible = "marvell,orion-gpio";
+				compatible = "marvell,armadaxp-gpio", "marvell,orion-gpio";
 				reg = <0x18100 0x40>;
 				ngpios = <32>;
 				gpio-controller;

@@ -227,7 +227,7 @@
 			};
 
 			gpio1: gpio@18140 {
-				compatible = "marvell,orion-gpio";
+				compatible = "marvell,armadaxp-gpio", "marvell,orion-gpio";
 				reg = <0x18140 0x40>;
 				ngpios = <28>;
 				gpio-controller;

Signature · 1 line

2.20.1

pwm support incompatible with Armada 80x0/70x0 API is not only in Armada 370, but also in Armada XP, 38x and 39x. So basically every non-A8K platform. Fix check for pwm support appropriately.

Fixes 85b7d8abfec7 ("gpio: mvebu: add pwm support for Armada 8K/7K")

Signed-off-by Pali Rohár <[email protected]>

---
Changes in v2:
* reverse the if/else order per Baruch request

---
 drivers/gpio/gpio-mvebu.c | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

drivers/gpio/gpio-mvebu.c +6 -9

index 2db19cd640a4..de1e7a1a76f2 100644
@@ -793,8 +793,12 @@ static int mvebu_pwm_probe(struct platform_device *pdev,
 	u32 offset;
 	u32 set;
 
-	if (of_device_is_compatible(mvchip->chip.of_node,
-				    "marvell,armada-370-gpio")) {
+	if (mvchip->soc_variant == MVEBU_GPIO_SOC_VARIANT_A8K) {
+		int ret = of_property_read_u32(dev->of_node,
+					       "marvell,pwm-offset", &offset);
+		if (ret < 0)
+			return 0;
+	} else {
 		/*
 		 * There are only two sets of PWM configuration registers for
 		 * all the GPIO lines on those SoCs which this driver reserves

@@ -804,13 +808,6 @@ static int mvebu_pwm_probe(struct platform_device *pdev,
 		if (!platform_get_resource_byname(pdev, IORESOURCE_MEM, "pwm"))
 			return 0;
 		offset = 0;
-	} else if (mvchip->soc_variant == MVEBU_GPIO_SOC_VARIANT_A8K) {
-		int ret = of_property_read_u32(dev->of_node,
-					       "marvell,pwm-offset", &offset);
-		if (ret < 0)
-			return 0;
-	} else {
-		return 0;
 	}
 
 	if (IS_ERR(mvchip->clk))

Signature · 1 line

2.20.1

pwm support incompatible with Armada 80x0/70x0 API is not only in Armada 370, but also in Armada XP, 38x and 39x. So basically every non-A8K platform. Fix check for pwm support appropriately.

Fixes 85b7d8abfec7 ("gpio: mvebu: add pwm support for Armada 8K/7K")

Signed-off-by Pali Rohár <[email protected]>

---
Changes in v2:
* reverse the if/else order per Baruch request