Skip to contentSkip to conversation

arm64: dt marvell: extend AP806 system controller size

PATCH New Baruch Siach 2 participants 5 messages Sep 15, 2017 – Sep 20, 2017

Subsystems (2)
Device tree bindings Arm/Marvell Kirkwood and Armada 370, 375, 38x, 39x, XP, 3700, 7K/8K, CN9130 SoC support
lore
Share & tools
lore

Baruch Siach

author
#0 lore raw

PATCH 1/1 arm64: dt marvell: extend AP806 system controller size

Extend the container size to 0x2000 to include the gpio controller at offset 0x1040.

While at it, add start address notation to the gpio node name to match its 'offset' property.

Signed-off-by Baruch Siach <[email protected]>
---
 arch/arm64/boot/dts/marvell/armada-ap806.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/marvell/armada-ap806.dtsi +2 -2
index 4d360713ed12..30d48ecf46e0 100644
@@ -254,7 +254,7 @@
 
 			ap_syscon: system-controller at 6f4000 {
 				compatible = "syscon", "simple-mfd";
-				reg = <0x6f4000 0x1000>;
+				reg = <0x6f4000 0x2000>;
 
 				ap_clk: clock {
 					compatible = "marvell,ap806-clock";

@@ -265,7 +265,7 @@
 					compatible = "marvell,ap806-pinctrl";
 				};
 
-				ap_gpio: gpio {
+				ap_gpio: gpio at 1040 {
 					compatible = "marvell,armada-8k-gpio";
 					offset = <0x1040>;
 					ngpios = <20>;
Signature · 1 line
2.14.1
#1 lore raw

PATCH 1/1 arm64: dt marvell: extend AP806 system controller size

Hi Baruch,

Quoted 7 lines · Baruch Siach

Extend the container size to 0x2000 to include the gpio controller at offset 0x1040.

While at it, add start address notation to the gpio node name to match its 'offset' property.

Signed-off-by Baruch Siach <[email protected]>

I made a quick test on a mcbin and I confirm that the watchdog is here and usable.

Tested-by Gregory CLEMENT <[email protected]>

and
Applied on mvebu/dt64

Thanks,

Gregory

Quoted 29 lines
---
 arch/arm64/boot/dts/marvell/armada-ap806.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/marvell/armada-ap806.dtsi +2 -2
index 4d360713ed12..30d48ecf46e0 100644
@@ -254,7 +254,7 @@
 
 			ap_syscon: system-controller at 6f4000 {
 				compatible = "syscon", "simple-mfd";
-				reg = <0x6f4000 0x1000>;
+				reg = <0x6f4000 0x2000>;
 
 				ap_clk: clock {
 					compatible = "marvell,ap806-clock";

@@ -265,7 +265,7 @@
 					compatible = "marvell,ap806-pinctrl";
 				};
 
-				ap_gpio: gpio {
+				ap_gpio: gpio at 1040 {
 					compatible = "marvell,armada-8k-gpio";
 					offset = <0x1040>;
 					ngpios = <20>;
Signature · 1 line
2.14.1
Signature · 4 lines
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
author
#2 lore raw

PATCH 1/1 arm64: dt marvell: extend AP806 system controller size

Hi Gregory,

Quoted 8 lines · Gregory CLEMENT
Quoted 6 lines · Baruch Siach

Extend the container size to 0x2000 to include the gpio controller at offset 0x1040.

While at it, add start address notation to the gpio node name to match its 'offset' property.

Quoted 8 lines
Quoted 1 line
Signed-off-by Baruch Siach <[email protected]>

I made a quick test on a mcbin and I confirm that the watchdog is here and usable.

Tested-by Gregory CLEMENT <[email protected]>

and
Applied on mvebu/dt64

This is meant to be a reply to https://patchwork.kernel.org/patch/9947525/,
right?

Anyway, I see the right patch[1] at mvebu/dt64.

Thanks,
baruch

[1] http://git.infradead.org/linux-mvebu.git/commitdiff/e34ffe32f6e7ae9191d14226ff9d8c0c47400a71

Quoted 26 lines
Quoted 26 lines
---
 arch/arm64/boot/dts/marvell/armada-ap806.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/marvell/armada-ap806.dtsi +2 -2
index 4d360713ed12..30d48ecf46e0 100644
@@ -254,7 +254,7 @@
 
 			ap_syscon: system-controller at 6f4000 {
 				compatible = "syscon", "simple-mfd";
-				reg = <0x6f4000 0x1000>;
+				reg = <0x6f4000 0x2000>;
 
 				ap_clk: clock {
 					compatible = "marvell,ap806-clock";

@@ -265,7 +265,7 @@
 					compatible = "marvell,ap806-pinctrl";
 				};
 
-				ap_gpio: gpio {
+				ap_gpio: gpio at 1040 {
 					compatible = "marvell,armada-8k-gpio";
 					offset = <0x1040>;
 					ngpios = <20>;
Signature · 3 lines
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
#3 lore raw

PATCH 1/1 arm64: dt marvell: extend AP806 system controller size

Hi Baruch,

Quoted 16 lines · Baruch Siach

Hi Gregory,

Quoted 13 lines · Gregory CLEMENT
Quoted 7 lines · Baruch Siach

Extend the container size to 0x2000 to include the gpio controller at offset 0x1040.

While at it, add start address notation to the gpio node name to match its 'offset' property.

Signed-off-by Baruch Siach <[email protected]>

I made a quick test on a mcbin and I confirm that the watchdog is here and usable.

Quoted 6 lines
Quoted 3 lines
Tested-by Gregory CLEMENT <[email protected]>

and
Applied on mvebu/dt64

This is meant to be a reply to https://patchwork.kernel.org/patch/9947525/,
right?

Yes!
Sorry for hte confusion.

Quoted 39 lines

Anyway, I see the right patch[1] at mvebu/dt64.

Thanks,
baruch

[1] http://git.infradead.org/linux-mvebu.git/commitdiff/e34ffe32f6e7ae9191d14226ff9d8c0c47400a71

Quoted 26 lines
Quoted 26 lines
---
 arch/arm64/boot/dts/marvell/armada-ap806.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/marvell/armada-ap806.dtsi +2 -2
index 4d360713ed12..30d48ecf46e0 100644
@@ -254,7 +254,7 @@
 
 			ap_syscon: system-controller at 6f4000 {
 				compatible = "syscon", "simple-mfd";
-				reg = <0x6f4000 0x1000>;
+				reg = <0x6f4000 0x2000>;
 
 				ap_clk: clock {
 					compatible = "marvell,ap806-clock";

@@ -265,7 +265,7 @@
 					compatible = "marvell,ap806-pinctrl";
 				};
 
-				ap_gpio: gpio {
+				ap_gpio: gpio at 1040 {
 					compatible = "marvell,armada-8k-gpio";
 					offset = <0x1040>;
 					ngpios = <20>;
Signature · 3 lines
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
Signature · 4 lines
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
#4 lore raw

PATCH 1/1 arm64: dt marvell: extend AP806 system controller size

In reply to Baruch Siach

Hi Baruch,

Quoted 3 lines · Baruch Siach

Extend the container size to 0x2000 to include the gpio controller at offset 0x1040.

Actually it is a fix as I don't see how we can use the gpio if it is not in the range. So I amended your patch by adding:

Fixes 63dac0f4924b ("arm64: dts: marvell: add gpio support for Armada

7K/8K")
Cc: <[email protected]>

And I also modified the title to:
arm64: dt marvell: Fix AP806 system controller size

Quoted 4 lines

While at it, add start address notation to the gpio node name to match its 'offset' property.

Signed-off-by Baruch Siach <[email protected]>

Applied on mvebu/fixes

Thanks,

Gregory

Quoted 29 lines
---
 arch/arm64/boot/dts/marvell/armada-ap806.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/marvell/armada-ap806.dtsi +2 -2
index 4d360713ed12..30d48ecf46e0 100644
@@ -254,7 +254,7 @@
 
 			ap_syscon: system-controller at 6f4000 {
 				compatible = "syscon", "simple-mfd";
-				reg = <0x6f4000 0x1000>;
+				reg = <0x6f4000 0x2000>;
 
 				ap_clk: clock {
 					compatible = "marvell,ap806-clock";

@@ -265,7 +265,7 @@
 					compatible = "marvell,ap806-pinctrl";
 				};
 
-				ap_gpio: gpio {
+				ap_gpio: gpio at 1040 {
 					compatible = "marvell,armada-8k-gpio";
 					offset = <0x1040>;
 					ngpios = <20>;
Signature · 1 line
2.14.1
Signature · 4 lines
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com