dlan17/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ARM: dts: Fix up MMC host node names

Browse Source 
The standard mandates that these nodes be named
mmc@... not sdi_foo@...

Acked-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Linus Walleij
2021-01-22 21:45:43 +01:00
parent 7ac9266120
commit 28734f87a0
8 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/boot/dts/ste-dbx5x0.dtsi
+6 -6
View File
@@ -883,7 +883,7 @@
status = "disabled";
};
sdi0_per1@80126000 {
mmc@80126000 {
compatible = "arm,pl18x", "arm,primecell";
reg = <0x80126000 0x1000>;
interrupts = <GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH>;
@@ -899,7 +899,7 @@
status = "disabled";
};
sdi1_per2@80118000 {
mmc@80118000 {
compatible = "arm,pl18x", "arm,primecell";
reg = <0x80118000 0x1000>;
interrupts = <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>;
@@ -915,7 +915,7 @@
status = "disabled";
};
sdi2_per3@80005000 {
mmc@80005000 {
compatible = "arm,pl18x", "arm,primecell";
reg = <0x80005000 0x1000>;
interrupts = <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>;
@@ -931,7 +931,7 @@
status = "disabled";
};
sdi3_per2@80119000 {
mmc@80119000 {
compatible = "arm,pl18x", "arm,primecell";
reg = <0x80119000 0x1000>;
interrupts = <GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH>;
@@ -947,7 +947,7 @@
status = "disabled";
};
sdi4_per2@80114000 {
mmc@80114000 {
compatible = "arm,pl18x", "arm,primecell";
reg = <0x80114000 0x1000>;
interrupts = <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>;
@@ -963,7 +963,7 @@
status = "disabled";
};
sdi5_per3@80008000 {
mmc@80008000 {
compatible = "arm,pl18x", "arm,primecell";
reg = <0x80008000 0x1000>;
interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>;
arch/arm/boot/dts/ste-href.dtsi
+4 -4
View File
@@ -114,7 +114,7 @@
};
// External Micro SD slot
sdi0_per1@80126000 {
mmc@80126000 {
arm,primecell-periphid = <0x10480180>;
max-frequency = <100000000>;
bus-width = <4>;
@@ -137,7 +137,7 @@
};
// WLAN SDIO channel
sdi1_per2@80118000 {
mmc@80118000 {
arm,primecell-periphid = <0x10480180>;
max-frequency = <100000000>;
bus-width = <4>;
@@ -150,7 +150,7 @@
};
// PoP:ed eMMC
sdi2_per3@80005000 {
mmc@80005000 {
arm,primecell-periphid = <0x10480180>;
max-frequency = <100000000>;
bus-width = <8>;
@@ -165,7 +165,7 @@
};
// On-board eMMC
sdi4_per2@80114000 {
mmc@80114000 {
arm,primecell-periphid = <0x10480180>;
max-frequency = <100000000>;
bus-width = <8>;
arch/arm/boot/dts/ste-hrefprev60.dtsi
+1 -1
View File
@@ -61,7 +61,7 @@
};
// External Micro SD slot
sdi0_per1@80126000 {
mmc@80126000 {
cd-gpios = <&tc3589x_gpio 3 GPIO_ACTIVE_HIGH>;
};
arch/arm/boot/dts/ste-hrefv60plus.dtsi
+1 -1
View File
@@ -190,7 +190,7 @@
};
// External Micro SD slot
sdi0_per1@80126000 {
mmc@80126000 {
cd-gpios = <&gpio2 31 GPIO_ACTIVE_HIGH>; // 95
};
arch/arm/boot/dts/ste-snowball.dts
+4 -4
View File
@@ -213,7 +213,7 @@
};
// External Micro SD slot
sdi0_per1@80126000 {
mmc@80126000 {
arm,primecell-periphid = <0x10480180>;
max-frequency = <100000000>;
bus-width = <4>;
@@ -241,7 +241,7 @@
};
// WLAN SDIO channel
sdi1_per2@80118000 {
mmc@80118000 {
arm,primecell-periphid = <0x10480180>;
max-frequency = <100000000>;
bus-width = <4>;
@@ -253,7 +253,7 @@
};
// Unused PoP eMMC - register and put it to sleep by default */
sdi2_per3@80005000 {
mmc@80005000 {
arm,primecell-periphid = <0x10480180>;
pinctrl-names = "default";
pinctrl-0 = <&mc2_a_1_sleep>;
@@ -262,7 +262,7 @@
};
// On-board eMMC
sdi4_per2@80114000 {
mmc@80114000 {
arm,primecell-periphid = <0x10480180>;
max-frequency = <100000000>;
bus-width = <8>;
arch/arm/boot/dts/ste-ux500-samsung-golden.dts
+3 -3
View File
@@ -72,7 +72,7 @@
soc {
/* External Micro SD card slot */
sdi0_per1@80126000 {
mmc@80126000 {
status = "okay";
arm,primecell-periphid = <0x10480180>;
@@ -100,7 +100,7 @@
};
/* WLAN SDIO */
sdi1_per2@80118000 {
mmc@80118000 {
status = "okay";
arm,primecell-periphid = <0x10480180>;
@@ -134,7 +134,7 @@
};
/* eMMC */
sdi2_per3@80005000 {
mmc@80005000 {
status = "okay";
arm,primecell-periphid = <0x10480180>;
arch/arm/boot/dts/ste-ux500-samsung-janice.dts
+3 -3
View File
@@ -329,7 +329,7 @@
soc {
/* External Micro SD slot */
sdi0_per1@80126000 {
mmc@80126000 {
arm,primecell-periphid = <0x10480180>;
max-frequency = <50000000>;
bus-width = <4>;
@@ -352,7 +352,7 @@
};
/* WLAN SDIO channel */
sdi1_per2@80118000 {
mmc@80118000 {
arm,primecell-periphid = <0x10480180>;
max-frequency = <50000000>;
bus-width = <4>;
@@ -390,7 +390,7 @@
};
/* eMMC */
sdi2_per3@80005000 {
mmc@80005000 {
arm,primecell-periphid = <0x10480180>;
max-frequency = <50000000>;
bus-width = <8>;
arch/arm/boot/dts/ste-ux500-samsung-skomer.dts
+3 -3
View File
@@ -147,7 +147,7 @@
soc {
// External Micro SD slot
sdi0_per1@80126000 {
mmc@80126000 {
arm,primecell-periphid = <0x10480180>;
max-frequency = <100000000>;
bus-width = <4>;
@@ -169,7 +169,7 @@
};
// WLAN SDIO channel
sdi1_per2@80118000 {
mmc@80118000 {
arm,primecell-periphid = <0x10480180>;
max-frequency = <50000000>;
bus-width = <4>;
@@ -196,7 +196,7 @@
};
// eMMC
sdi2_per3@80005000 {
mmc@80005000 {
arm,primecell-periphid = <0x10480180>;
max-frequency = <100000000>;
bus-width = <8>;