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.

Signed-off-by: Chris Packham <judge.packham@gmail.com>
Reviewed-by: Stefan Roese <sr@denx.de>

diff --git a/arch/arm/dts/cn9130-crb.dtsi b/arch/arm/dts/cn9130-crb.dtsi
index b229725184a964e23e0d62a70413df6733ae4715..7dd36cae282bd6da0f9b2358fd8821c467cbe247 100644 (file)
--- a/arch/arm/dts/cn9130-crb.dtsi
+++ b/arch/arm/dts/cn9130-crb.dtsi
@@ -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 */