Skip to content

Commit 0878fd8

Browse files
cpackham-atlnzgclement
authored andcommitted
ARM64: dts: marvell: cn9310: Use appropriate label for spi1 pins
Both the CN9130-CRB and CN9130-DB use 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. Fixes: 4c43a41 ("arm64: dts: cn913x: add device trees for topology B boards") Fixes: 5c0ee54 ("arm64: dts: add support for Marvell cn9130-crb platform") Signed-off-by: Chris Packham <[email protected]> Reviewed-by: Andrew Lunn <[email protected]> Signed-off-by: Gregory CLEMENT <[email protected]>
1 parent 0bb80ec commit 0878fd8

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

arch/arm64/boot/dts/marvell/cn9130-crb.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
"mpp59", "mpp60", "mpp61";
121121
marvell,function = "sdio";
122122
};
123-
cp0_spi0_pins: cp0-spi-pins-0 {
123+
cp0_spi1_pins: cp0-spi-pins-1 {
124124
marvell,pins = "mpp13", "mpp14", "mpp15", "mpp16";
125125
marvell,function = "spi1";
126126
};
@@ -170,7 +170,7 @@
170170

171171
&cp0_spi1 {
172172
pinctrl-names = "default";
173-
pinctrl-0 = <&cp0_spi0_pins>;
173+
pinctrl-0 = <&cp0_spi1_pins>;
174174
reg = <0x700680 0x50>, /* control */
175175
<0x2000000 0x1000000>; /* CS0 */
176176
status = "okay";

arch/arm64/boot/dts/marvell/cn9130-db.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@
307307
&cp0_spi1 {
308308
status = "disabled";
309309
pinctrl-names = "default";
310-
pinctrl-0 = <&cp0_spi0_pins>;
310+
pinctrl-0 = <&cp0_spi1_pins>;
311311
reg = <0x700680 0x50>;
312312

313313
flash@0 {
@@ -371,7 +371,7 @@
371371
"mpp59", "mpp60", "mpp61";
372372
marvell,function = "sdio";
373373
};
374-
cp0_spi0_pins: cp0-spi-pins-0 {
374+
cp0_spi1_pins: cp0-spi-pins-1 {
375375
marvell,pins = "mpp13", "mpp14", "mpp15", "mpp16";
376376
marvell,function = "spi1";
377377
};

0 commit comments

Comments
 (0)