Skip to contentSkip to conversation

ARM64: dts: marvell: cn9310: Use appropriate label for spi1 pins

PATCH In review Chris Packham 2 participants 6 messages Aug 20, 2023 – Oct 16, 2023 Arm (32-bit)

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 ARM64: dts: marvell: cn9310: Use appropriate label for spi1 pins

The CN9130-DB uses the SPI1 interface but had the pinctrl node labelled as "cp0_spi0_pins". Use the label "cp0_spi1_pins" and update the node name to "cp0-spi-pins-1" to avoid confusion with the pinctrl options for SPI0.

---

 arch/arm/dts/cn9130-db.dtsi | 2 +-
 arch/arm/dts/cn9130.dtsi    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/dts/cn9130-db.dtsi +1 -1
index 1b28732ee752..4b21ff46d507 100644
@@ -183,7 +183,7 @@
 /* U55 */
 &cp0_spi1 {
 	pinctrl-names = "default";
-	pinctrl-0 = <&cp0_spi0_pins>;
+	pinctrl-0 = <&cp0_spi1_pins>;
 	reg = <0x700680 0x50>,		/* control */
 	      <0x2000000 0x1000000>,	/* CS0 */
 	      <0 0xffffffff>,		/* CS1 */
arch/arm/dts/cn9130.dtsi +1 -1
index 68b767a70639..efcb2e906b91 100644
@@ -66,7 +66,7 @@
 		marvell,pins = < 56 57 58 59 60 61 >;
 		marvell,function = <14>;
 	};
-	cp0_spi0_pins: cp0-spi-pins-0 {
+	cp0_spi1_pins: cp0-spi-pins-1 {
 		marvell,pins = < 13 14 15 16 >;
 		marvell,function = <3>;
 	};
Signature · 1 line
2.41.0
#1 lore raw

PATCH 2/2 ARM64: dts: marvell: cn9310-crb: Remove duplicate pinctrl

The cn9130.dtsi defines a pinctrl node for SPI1 (until recently it was mislabeled as spi0). Use this instead of having a duplicate definition with a different label.

---

 arch/arm/dts/cn9130-crb.dtsi | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)
arch/arm/dts/cn9130-crb.dtsi +1 -6
index b229725184a9..7dd36cae282b 100644
@@ -125,11 +125,6 @@
 		marvell,function = <0>;
 	};
 
-	cp0_spi1_pins_crb: cp0-spi-pins-crb {
-		marvell,pins = < 13 14 15 16 >;
-		marvell,function = <3>;
-	};
-
 	cp0_smi_pins_crb: cp0-smi-pins-crb {
 		marvell,pins = < 40 41 >;
 		marvell,function = <8>;
@@ -170,7 +165,7 @@
 
 &cp0_spi1 {
 	pinctrl-names = "default";
-	pinctrl-0 = <&cp0_spi1_pins_crb>;
+	pinctrl-0 = <&cp0_spi1_pins>;
 	reg = <0x700680 0x50>,		/* control */
 	      <0x2000000 0x1000000>,	/* CS0 */
 	      <0 0xffffffff>,		/* CS1 */
Signature · 1 line
2.41.0
Reviewed-by on v1 2/2
#2 lore raw

Re: [PATCH 2/2] ARM64: dts: marvell: cn9310-crb: Remove duplicate pinctrl

Quoted 5 lines · Chris Packham

The cn9130.dtsi defines a pinctrl node for SPI1 (until recently it was mislabeled as spi0). Use this instead of having a duplicate definition with a different label.

Thanks,
Stefan

Quoted 22 lines

---

  arch/arm/dts/cn9130-crb.dtsi | 7 +------
  1 file changed, 1 insertion(+), 6 deletions(-)
arch/arm/dts/cn9130-crb.dtsi +0 -5
index b229725184a9..7dd36cae282b 100644
@@ -125,11 +125,6 @@
  		marvell,function = <0>;
  	};
 
-	cp0_spi1_pins_crb: cp0-spi-pins-crb {
-		marvell,pins = < 13 14 15 16 >;
-		marvell,function = <3>;
-	};
-
  	cp0_smi_pins_crb: cp0-smi-pins-crb {
  		marvell,pins = < 40 41 >;
  		marvell,function = <8>;

arch/arm/dts/cn9130-crb.dtsi line 171

Quoted 8 lines
arch/arm/dts/cn9130-crb.dtsi +1 -1
@@ -170,7 +165,7 @@
 
  &cp0_spi1 {
  	pinctrl-names = "default";
-	pinctrl-0 = <&cp0_spi1_pins_crb>;
+	pinctrl-0 = <&cp0_spi1_pins>;
  	reg = <0x700680 0x50>,		/* control */
  	      <0x2000000 0x1000000>,	/* CS0 */
  	      <0 0xffffffff>,		/* CS1 */

Viele Grüße,
Stefan Roese

Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Erika Unter
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: [email protected]
#3 lore raw

Re: [PATCH 2/2] ARM64: dts: marvell: cn9310-crb: Remove duplicate pinctrl

Quoted 8 lines · Stefan Roese
Quoted 5 lines · Chris Packham

The cn9130.dtsi defines a pinctrl node for SPI1 (until recently it was mislabeled as spi0). Use this instead of having a duplicate definition with a different label.

Applied to u-boot-marvell/master

Thanks,
Stefan

Quoted 26 lines

Thanks,
Stefan

Quoted 23 lines

---

  arch/arm/dts/cn9130-crb.dtsi | 7 +------

  1 file changed, 1 insertion(+), 6 deletions(-)
arch/arm/dts/cn9130-crb.dtsi +0 -5
index b229725184a9..7dd36cae282b 100644
@@ -125,11 +125,6 @@
           marvell,function = <0>;
       };
-    cp0_spi1_pins_crb: cp0-spi-pins-crb {
-        marvell,pins = < 13 14 15 16 >;
-        marvell,function = <3>;
-    };
-
       cp0_smi_pins_crb: cp0-smi-pins-crb {
           marvell,pins = < 40 41 >;
           marvell,function = <8>;
@@ -170,7 +165,7 @@
   &cp0_spi1 {
       pinctrl-names = "default";
Quoted 9 lines
Quoted 5 lines
arch/arm/dts/cn9130-crb.dtsi +1 -1
-    pinctrl-0 = <&cp0_spi1_pins_crb>;
+    pinctrl-0 = <&cp0_spi1_pins>;

      reg = <0x700680 0x50>,        /* control */
            <0x2000000 0x1000000>,    /* CS0 */
            <0 0xffffffff>,        /* CS1 */

Viele Grüße,
Stefan Roese

Viele Grüße,
Stefan Roese

Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Erika Unter
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: [email protected]
Reviewed-by on v1 1/2
#4 lore raw
In reply to Chris Packham
Quoted 6 lines · Chris Packham

The CN9130-DB uses the SPI1 interface but had the pinctrl node labelled as "cp0_spi0_pins". Use the label "cp0_spi1_pins" and update the node name to "cp0-spi-pins-1" to avoid confusion with the pinctrl options for SPI0.

Thanks,
Stefan

Quoted 24 lines

---

  arch/arm/dts/cn9130-db.dtsi | 2 +-
  arch/arm/dts/cn9130.dtsi    | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/dts/cn9130-db.dtsi +1 -1
index 1b28732ee752..4b21ff46d507 100644
@@ -183,7 +183,7 @@
  /* U55 */
  &cp0_spi1 {
  	pinctrl-names = "default";
-	pinctrl-0 = <&cp0_spi0_pins>;
+	pinctrl-0 = <&cp0_spi1_pins>;
  	reg = <0x700680 0x50>,		/* control */
  	      <0x2000000 0x1000000>,	/* CS0 */
  	      <0 0xffffffff>,		/* CS1 */
arch/arm/dts/cn9130.dtsi +0 -0
index 68b767a70639..efcb2e906b91 100644

arch/arm/dts/cn9130.dtsi line 72

Quoted 8 lines
arch/arm/dts/cn9130.dtsi +1 -1
@@ -66,7 +66,7 @@
  		marvell,pins = < 56 57 58 59 60 61 >;
  		marvell,function = <14>;
  	};
-	cp0_spi0_pins: cp0-spi-pins-0 {
+	cp0_spi1_pins: cp0-spi-pins-1 {
  		marvell,pins = < 13 14 15 16 >;
  		marvell,function = <3>;
  	};

Viele Grüße,
Stefan Roese

Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Erika Unter
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: [email protected]
#5 lore raw
Quoted 9 lines · Stefan Roese
Quoted 6 lines · Chris Packham

The CN9130-DB uses the SPI1 interface but had the pinctrl node labelled as "cp0_spi0_pins". Use the label "cp0_spi1_pins" and update the node name to "cp0-spi-pins-1" to avoid confusion with the pinctrl options for SPI0.

Applied to u-boot-marvell/master

Thanks,
Stefan

Quoted 31 lines

Thanks,
Stefan

Quoted 27 lines

---

  arch/arm/dts/cn9130-db.dtsi | 2 +-
  arch/arm/dts/cn9130.dtsi    | 2 +-

  2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/dts/cn9130-db.dtsi +1 -1
index 1b28732ee752..4b21ff46d507 100644
@@ -183,7 +183,7 @@
   /* U55 */
   &cp0_spi1 {
       pinctrl-names = "default";
-    pinctrl-0 = <&cp0_spi0_pins>;
+    pinctrl-0 = <&cp0_spi1_pins>;

      reg = <0x700680 0x50>,        /* control */
            <0x2000000 0x1000000>,    /* CS0 */
            <0 0xffffffff>,        /* CS1 */

arch/arm/dts/cn9130.dtsi +0 -0
index 68b767a70639..efcb2e906b91 100644
@@ -66,7 +66,7 @@
           marvell,pins = < 56 57 58 59 60 61 >;
           marvell,function = <14>;
       };
Quoted 9 lines

arch/arm/dts/cn9130.dtsi line 72

Quoted 5 lines
arch/arm/dts/cn9130.dtsi +1 -1
-    cp0_spi0_pins: cp0-spi-pins-0 {
+    cp0_spi1_pins: cp0-spi-pins-1 {
           marvell,pins = < 13 14 15 16 >;
           marvell,function = <3>;
       };

Viele Grüße,
Stefan Roese

Viele Grüße,
Stefan Roese

Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Erika Unter
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: [email protected]