Skip to contentSkip to conversation

arm64: dts: marvell: armada-80x0: Fix pinctrl compatible string

PATCH New Gregory CLEMENT 2 participants 4 messages Jan 12, 2018

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arm64: dts: marvell: armada-80x0: Fix pinctrl compatible string

When replacing the cpm by cp0 and cps by cp1 [1] not only the label and the alias were replaced but also the compatible string which was wrong.

Due to this the pinctrl driver was no more probed.

This patch fix it by reverting this change for the pinctrl compatible string on Armada 8K.

[1]: "arm64: dts: marvell: replace cpm by cp0, cps by cp1"

---
 arch/arm64/boot/dts/marvell/armada-80x0.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/marvell/armada-80x0.dtsi +2 -2
index 0d36b0fa7153..e9c84a1d3c4d 100644
@@ -108,13 +108,13 @@
 
 &cp0_syscon0 {
 	cp0_pinctrl: pinctrl {
-		compatible = "marvell,armada-8k-cp0-pinctrl";
+		compatible = "marvell,armada-8k-cpm-pinctrl";
 	};
 };
 
 &cp1_syscon0 {
 	cp1_pinctrl: pinctrl {
-		compatible = "marvell,armada-8k-cp1-pinctrl";
+		compatible = "marvell,armada-8k-cps-pinctrl";
 
 		nand_pins: nand-pins {
 			marvell,pins =
Signature · 1 line
2.15.1
#1 lore raw

PATCH 1/1 arm64: dts: marvell: armada-80x0: Fix pinctrl compatible string

Hello,

Quoted 9 lines · Gregory CLEMENT

When replacing the cpm by cp0 and cps by cp1 [1] not only the label and the alias were replaced but also the compatible string which was wrong.

Due to this the pinctrl driver was no more probed.

This patch fix it by reverting this change for the pinctrl compatible string on Armada 8K.

[1]: "arm64: dts: marvell: replace cpm by cp0, cps by cp1"

It is normally recommended to give the commit ID, i.e:

In commit 01b451ed3bd2 ("arm64: dts: marvell: replace cpm by cp0, cps by cp1"), ...

Quoted 2 lines

Thanks for fixing this mistake!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
#2 lore raw

PATCH 1/1 arm64: dts: marvell: armada-80x0: Fix pinctrl compatible string

Hi Thomas,

Quoted 11 lines · Thomas Petazzoni

Hello,

Quoted 8 lines · Gregory CLEMENT

When replacing the cpm by cp0 and cps by cp1 [1] not only the label and the alias were replaced but also the compatible string which was wrong.

Due to this the pinctrl driver was no more probed.

This patch fix it by reverting this change for the pinctrl compatible string on Armada 8K.

Quoted 6 lines
Quoted 1 line

[1]: "arm64: dts: marvell: replace cpm by cp0, cps by cp1"

It is normally recommended to give the commit ID, i.e:

In commit 01b451ed3bd2 ("arm64: dts: marvell: replace cpm by cp0, cps by cp1"), ...

But this commit in not yet in Linus tree, the ID you point is in linux-next, so once this patch will be merged the commit ID would become meaningless.

Gregory

Quoted 18 lines
Quoted 3 lines

Thanks for fixing this mistake!

Thomas

Signature · 8 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Signature · 4 lines
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
#3 lore raw

PATCH 1/1 arm64: dts: marvell: armada-80x0: Fix pinctrl compatible string

In reply to Gregory CLEMENT

Hi,

Quoted 11 lines · Gregory CLEMENT

When replacing the cpm by cp0 and cps by cp1 [1] not only the label and the alias were replaced but also the compatible string which was wrong.

Due to this the pinctrl driver was no more probed.

This patch fix it by reverting this change for the pinctrl compatible string on Armada 8K.

[1]: "arm64: dts: marvell: replace cpm by cp0, cps by cp1"

Applied on mvebu/dt64 with the reviewed-by flag from Thomas Petazzoni. I do it right now because I hope being able to make a late pull request with it in order to have the dtbs in the right state from the beginning of the 4.16-rc1.

Gregory

Quoted 27 lines
---
 arch/arm64/boot/dts/marvell/armada-80x0.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/marvell/armada-80x0.dtsi +2 -2
index 0d36b0fa7153..e9c84a1d3c4d 100644
@@ -108,13 +108,13 @@
 
 &cp0_syscon0 {
 	cp0_pinctrl: pinctrl {
-		compatible = "marvell,armada-8k-cp0-pinctrl";
+		compatible = "marvell,armada-8k-cpm-pinctrl";
 	};
 };
 
 &cp1_syscon0 {
 	cp1_pinctrl: pinctrl {
-		compatible = "marvell,armada-8k-cp1-pinctrl";
+		compatible = "marvell,armada-8k-cps-pinctrl";
 
 		nand_pins: nand-pins {
 			marvell,pins =
Signature · 1 line
2.15.1
Signature · 4 lines
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com