Skip to content

Commit dd95b54

Browse files
lkundrakarndb
authored andcommitted
ARM: dts: berlin*: Fix up the SDHCI node names
The node name preferred by mmc-controller.yaml binding spec is "mmc": berlin2-sony-nsz-gs7.dt.yaml: sdhci@ab0000: $nodename:0: 'sdhci@ab0000' does not match '^mmc(@.*)?$' berlin2-sony-nsz-gs7.dt.yaml: sdhci@ab0800: $nodename:0: 'sdhci@ab0800' does not match '^mmc(@.*)?$' berlin2-sony-nsz-gs7.dt.yaml: sdhci@ab1000: $nodename:0: 'sdhci@ab1000' does not match '^mmc(@.*)?$' berlin2cd-google-chromecast.dt.yaml: sdhci@ab0000: $nodename:0: 'sdhci@ab0000' does not match '^mmc(@.*)?$' berlin2cd-valve-steamlink.dt.yaml: sdhci@ab0000: $nodename:0: 'sdhci@ab0000' does not match '^mmc(@.*)?$' berlin2q-marvell-dmp.dt.yaml: sdhci@ab0000: $nodename:0: 'sdhci@ab0000' does not match '^mmc(@.*)?$' berlin2q-marvell-dmp.dt.yaml: sdhci@ab0800: $nodename:0: 'sdhci@ab0800' does not match '^mmc(@.*)?$' berlin2q-marvell-dmp.dt.yaml: sdhci@ab1000: $nodename:0: 'sdhci@ab1000' does not match '^mmc(@.*)?$' Signed-off-by: Lubomir Rintel <[email protected]> Reviewed-by: Andrew Lunn <[email protected]> Signed-off-by: Arnd Bergmann <[email protected]>
1 parent bbbea1f commit dd95b54

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

arch/arm/boot/dts/berlin2.dtsi

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777

7878
ranges = <0 0xf7000000 0x1000000>;
7979

80-
sdhci0: sdhci@ab0000 {
80+
sdhci0: mmc@ab0000 {
8181
compatible = "mrvl,pxav3-mmc";
8282
reg = <0xab0000 0x200>;
8383
clocks = <&chip_clk CLKID_SDIO0XIN>, <&chip_clk CLKID_SDIO0>;
@@ -86,7 +86,7 @@
8686
status = "disabled";
8787
};
8888

89-
sdhci1: sdhci@ab0800 {
89+
sdhci1: mmc@ab0800 {
9090
compatible = "mrvl,pxav3-mmc";
9191
reg = <0xab0800 0x200>;
9292
clocks = <&chip_clk CLKID_SDIO1XIN>, <&chip_clk CLKID_SDIO1>;
@@ -95,7 +95,7 @@
9595
status = "disabled";
9696
};
9797

98-
sdhci2: sdhci@ab1000 {
98+
sdhci2: mmc@ab1000 {
9999
compatible = "mrvl,pxav3-mmc";
100100
reg = <0xab1000 0x200>;
101101
interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;

arch/arm/boot/dts/berlin2cd.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262

6363
ranges = <0 0xf7000000 0x1000000>;
6464

65-
sdhci0: sdhci@ab0000 {
65+
sdhci0: mmc@ab0000 {
6666
compatible = "mrvl,pxav3-mmc";
6767
reg = <0xab0000 0x200>;
6868
clocks = <&chip_clk CLKID_SDIO0XIN>, <&chip_clk CLKID_SDIO0>;

arch/arm/boot/dts/berlin2q.dtsi

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@
122122
ranges = <0 0xf7000000 0x1000000>;
123123
interrupt-parent = <&gic>;
124124

125-
sdhci0: sdhci@ab0000 {
125+
sdhci0: mmc@ab0000 {
126126
compatible = "mrvl,pxav3-mmc";
127127
reg = <0xab0000 0x200>;
128128
clocks = <&chip_clk CLKID_SDIO1XIN>, <&chip_clk CLKID_SDIO>;
@@ -131,7 +131,7 @@
131131
status = "disabled";
132132
};
133133

134-
sdhci1: sdhci@ab0800 {
134+
sdhci1: mmc@ab0800 {
135135
compatible = "mrvl,pxav3-mmc";
136136
reg = <0xab0800 0x200>;
137137
clocks = <&chip_clk CLKID_SDIO1XIN>, <&chip_clk CLKID_SDIO>;
@@ -140,7 +140,7 @@
140140
status = "disabled";
141141
};
142142

143-
sdhci2: sdhci@ab1000 {
143+
sdhci2: mmc@ab1000 {
144144
compatible = "mrvl,pxav3-mmc";
145145
reg = <0xab1000 0x200>;
146146
interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;

0 commit comments

Comments
 (0)