Skip to content

Commit 239466b

Browse files
cpackham-atlnzgclement
authored andcommitted
arm64: dts: marvell: Update sdhci node names to match schema
Update the node names of the sdhci@ interfaces to be mmc@ to match the node name enforced by the mmc-controller.yaml schema. Signed-off-by: Chris Packham <[email protected]> Acked-by: Krzysztof Kozlowski <[email protected]> Signed-off-by: Gregory CLEMENT <[email protected]>
1 parent eacec7e commit 239466b

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

arch/arm64/boot/dts/marvell/armada-37xx.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,7 @@
444444
#mbox-cells = <1>;
445445
};
446446

447-
sdhci1: sdhci@d0000 {
447+
sdhci1: mmc@d0000 {
448448
compatible = "marvell,armada-3700-sdhci",
449449
"marvell,sdhci-xenon";
450450
reg = <0xd0000 0x300>,
@@ -455,7 +455,7 @@
455455
status = "disabled";
456456
};
457457

458-
sdhci0: sdhci@d8000 {
458+
sdhci0: mmc@d8000 {
459459
compatible = "marvell,armada-3700-sdhci",
460460
"marvell,sdhci-xenon";
461461
reg = <0xd8000 0x300>,

arch/arm64/boot/dts/marvell/armada-ap80x.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@
250250
interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;
251251
};
252252

253-
ap_sdhci0: sdhci@6e0000 {
253+
ap_sdhci0: mmc@6e0000 {
254254
compatible = "marvell,armada-ap806-sdhci";
255255
reg = <0x6e0000 0x300>;
256256
interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;

arch/arm64/boot/dts/marvell/armada-cp11x.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,7 @@
493493
status = "okay";
494494
};
495495

496-
CP11X_LABEL(sdhci0): sdhci@780000 {
496+
CP11X_LABEL(sdhci0): mmc@780000 {
497497
compatible = "marvell,armada-cp110-sdhci";
498498
reg = <0x780000 0x300>;
499499
interrupts = <27 IRQ_TYPE_LEVEL_HIGH>;

0 commit comments

Comments
 (0)