tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

ARM: dts: bcm-mobile: align SDHCI node name with bindings

Bindings expect SDHCI/MMC node names to be "mmc".

Signed-off-by: Stanislav Jakubek <stano.jakubek@gmail.com>
Link: https://lore.kernel.org/r/88c64da50a1af868d8b14054c440e5ff96a63399.1683548624.git.stano.jakubek@gmail.com
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>

authored by

Stanislav Jakubek and committed by
Florian Fainelli 4eaa40bd 79a8ec38

+17 -17
+4 -4
arch/arm/boot/dts/bcm11351.dtsi
··· 125 125 interrupt-controller; 126 126 }; 127 127 128 - sdio1: sdio@3f180000 { 128 + sdio1: mmc@3f180000 { 129 129 compatible = "brcm,kona-sdhci"; 130 130 reg = <0x3f180000 0x10000>; 131 131 interrupts = <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>; ··· 133 133 status = "disabled"; 134 134 }; 135 135 136 - sdio2: sdio@3f190000 { 136 + sdio2: mmc@3f190000 { 137 137 compatible = "brcm,kona-sdhci"; 138 138 reg = <0x3f190000 0x10000>; 139 139 interrupts = <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>; ··· 141 141 status = "disabled"; 142 142 }; 143 143 144 - sdio3: sdio@3f1a0000 { 144 + sdio3: mmc@3f1a0000 { 145 145 compatible = "brcm,kona-sdhci"; 146 146 reg = <0x3f1a0000 0x10000>; 147 147 interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>; ··· 149 149 status = "disabled"; 150 150 }; 151 151 152 - sdio4: sdio@3f1b0000 { 152 + sdio4: mmc@3f1b0000 { 153 153 compatible = "brcm,kona-sdhci"; 154 154 reg = <0x3f1b0000 0x10000>; 155 155 interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;
+3 -3
arch/arm/boot/dts/bcm21664-garnet.dts
··· 20 20 status = "okay"; 21 21 }; 22 22 23 - sdio1: sdio@3f180000 { 23 + sdio1: mmc@3f180000 { 24 24 max-frequency = <48000000>; 25 25 status = "okay"; 26 26 }; 27 27 28 - sdio2: sdio@3f190000 { 28 + sdio2: mmc@3f190000 { 29 29 non-removable; 30 30 max-frequency = <48000000>; 31 31 status = "okay"; 32 32 }; 33 33 34 - sdio4: sdio@3f1b0000 { 34 + sdio4: mmc@3f1b0000 { 35 35 max-frequency = <48000000>; 36 36 cd-gpios = <&gpio 91 GPIO_ACTIVE_LOW>; 37 37 status = "okay";
+4 -4
arch/arm/boot/dts/bcm21664.dtsi
··· 113 113 interrupt-controller; 114 114 }; 115 115 116 - sdio1: sdio@3f180000 { 116 + sdio1: mmc@3f180000 { 117 117 compatible = "brcm,kona-sdhci"; 118 118 reg = <0x3f180000 0x801c>; 119 119 interrupts = <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>; ··· 121 121 status = "disabled"; 122 122 }; 123 123 124 - sdio2: sdio@3f190000 { 124 + sdio2: mmc@3f190000 { 125 125 compatible = "brcm,kona-sdhci"; 126 126 reg = <0x3f190000 0x801c>; 127 127 interrupts = <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>; ··· 129 129 status = "disabled"; 130 130 }; 131 131 132 - sdio3: sdio@3f1a0000 { 132 + sdio3: mmc@3f1a0000 { 133 133 compatible = "brcm,kona-sdhci"; 134 134 reg = <0x3f1a0000 0x801c>; 135 135 interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>; ··· 137 137 status = "disabled"; 138 138 }; 139 139 140 - sdio4: sdio@3f1b0000 { 140 + sdio4: mmc@3f1b0000 { 141 141 compatible = "brcm,kona-sdhci"; 142 142 reg = <0x3f1b0000 0x801c>; 143 143 interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;
+4 -4
arch/arm/boot/dts/bcm23550.dtsi
··· 224 224 status = "disabled"; 225 225 }; 226 226 227 - sdio1: sdio@e80000 { 227 + sdio1: mmc@e80000 { 228 228 compatible = "brcm,kona-sdhci"; 229 229 reg = <0x00e80000 0x801c>; 230 230 interrupts = <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>; ··· 232 232 status = "disabled"; 233 233 }; 234 234 235 - sdio2: sdio@e90000 { 235 + sdio2: mmc@e90000 { 236 236 compatible = "brcm,kona-sdhci"; 237 237 reg = <0x00e90000 0x801c>; 238 238 interrupts = <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>; ··· 240 240 status = "disabled"; 241 241 }; 242 242 243 - sdio3: sdio@ea0000 { 243 + sdio3: mmc@ea0000 { 244 244 compatible = "brcm,kona-sdhci"; 245 245 reg = <0x00ea0000 0x801c>; 246 246 interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>; ··· 248 248 status = "disabled"; 249 249 }; 250 250 251 - sdio4: sdio@eb0000 { 251 + sdio4: mmc@eb0000 { 252 252 compatible = "brcm,kona-sdhci"; 253 253 reg = <0x00eb0000 0x801c>; 254 254 interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;
+2 -2
arch/arm/boot/dts/bcm28155-ap.dts
··· 44 44 }; 45 45 }; 46 46 47 - sdio2: sdio@3f190000 { 47 + sdio2: mmc@3f190000 { 48 48 non-removable; 49 49 max-frequency = <48000000>; 50 50 vmmc-supply = <&camldo1_reg>; ··· 52 52 status = "okay"; 53 53 }; 54 54 55 - sdio4: sdio@3f1b0000 { 55 + sdio4: mmc@3f1b0000 { 56 56 max-frequency = <48000000>; 57 57 cd-gpios = <&gpio 14 GPIO_ACTIVE_LOW>; 58 58 vmmc-supply = <&sdldo_reg>;