Skip to content

L
linux
Commit 67bb17f6 authored by Thierry Reding's avatar Thierry Reding
Browse files
Options

arm64: tegra: Rename sdhci nodes to mmc 

The new json-schema based validation tools require SD/MMC controller
nodes to be named mmc. Rename all references to them.
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent 772a6a7b
Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 36 deletions
arch/arm64/boot/dts/nvidia/tegra132-norrin.dts
View file @ 67bb17f6
......@@ -894,12 +894,12 @@ pmc@7000e400 {
};
/* WIFI/BT module */
sdhci@700b0000 {
mmc@700b0000 {
status = "disabled";
};
/* external SD/MMC */
sdhci@700b0400 {
mmc@700b0400 {
cd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;
power-gpios = <&gpio TEGRA_GPIO(R, 0) GPIO_ACTIVE_HIGH>;
wp-gpios = <&gpio TEGRA_GPIO(Q, 4) GPIO_ACTIVE_HIGH>;
......@@ -909,7 +909,7 @@ sdhci@700b0400 {
};
/* EMMC 4.51 */
sdhci@700b0600 {
mmc@700b0600 {
status = "okay";
bus-width = <8>;
non-removable;
......
arch/arm64/boot/dts/nvidia/tegra132.dtsi
View file @ 67bb17f6
......@@ -691,7 +691,7 @@ utmi-2 {
};
};
sdhci@700b0000 {
mmc@700b0000 {
compatible = "nvidia,tegra124-sdhci";
reg = <0x0 0x700b0000 0x0 0x200>;
interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
......@@ -702,7 +702,7 @@ sdhci@700b0000 {
status = "disabled";
};
sdhci@700b0200 {
mmc@700b0200 {
compatible = "nvidia,tegra124-sdhci";
reg = <0x0 0x700b0200 0x0 0x200>;
interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
......@@ -713,7 +713,7 @@ sdhci@700b0200 {
status = "disabled";
};
sdhci@700b0400 {
mmc@700b0400 {
compatible = "nvidia,tegra124-sdhci";
reg = <0x0 0x700b0400 0x0 0x200>;
interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
......@@ -724,7 +724,7 @@ sdhci@700b0400 {
status = "disabled";
};
sdhci@700b0600 {
mmc@700b0600 {
compatible = "nvidia,tegra124-sdhci";
reg = <0x0 0x700b0600 0x0 0x200>;
interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
......
arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts
View file @ 67bb17f6
......@@ -103,7 +103,7 @@ exp2: gpio@77 {
};
/* SDMMC1 (SD/MMC) */
sdhci@3400000 {
mmc@3400000 {
status = "okay";
vmmc-supply = <&vdd_sd>;
......
arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi
View file @ 67bb17f6
......@@ -9,8 +9,8 @@ / {
aliases {
ethernet0 = "/ethernet@2490000";
sdhci0 = "/sdhci@3460000";
sdhci1 = "/sdhci@3400000";
mmc0 = "/mmc@3460000";
mmc1 = "/mmc@3400000";
serial0 = &uarta;
i2c0 = "/bpmp/i2c";
i2c1 = "/i2c@3160000";
......@@ -135,7 +135,7 @@ i2c@31e0000 {
};
/* SDMMC1 (SD/MMC) */
sdhci@3400000 {
mmc@3400000 {
cd-gpios = <&gpio TEGRA186_MAIN_GPIO(P, 5) GPIO_ACTIVE_LOW>;
wp-gpios = <&gpio TEGRA186_MAIN_GPIO(P, 4) GPIO_ACTIVE_HIGH>;
......@@ -143,12 +143,12 @@ sdhci@3400000 {
};
/* SDMMC3 (SDIO) */
sdhci@3440000 {
mmc@3440000 {
status = "okay";
};
/* SDMMC4 (eMMC) */
sdhci@3460000 {
mmc@3460000 {
status = "okay";
bus-width = <8>;
non-removable;
......
arch/arm64/boot/dts/nvidia/tegra186.dtsi
View file @ 67bb17f6
......@@ -333,7 +333,7 @@ gen9_i2c: i2c@31e0000 {
status = "disabled";
};
sdmmc1: sdhci@3400000 {
sdmmc1: mmc@3400000 {
compatible = "nvidia,tegra186-sdhci";
reg = <0x0 0x03400000 0x0 0x10000>;
interrupts = <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>;
......@@ -362,7 +362,7 @@ sdmmc1: sdhci@3400000 {
status = "disabled";
};
sdmmc2: sdhci@3420000 {
sdmmc2: mmc@3420000 {
compatible = "nvidia,tegra186-sdhci";
reg = <0x0 0x03420000 0x0 0x10000>;
interrupts = <GIC_SPI 63 IRQ_TYPE_LEVEL_HIGH>;
......@@ -386,7 +386,7 @@ sdmmc2: sdhci@3420000 {
status = "disabled";
};
sdmmc3: sdhci@3440000 {
sdmmc3: mmc@3440000 {
compatible = "nvidia,tegra186-sdhci";
reg = <0x0 0x03440000 0x0 0x10000>;
interrupts = <GIC_SPI 64 IRQ_TYPE_LEVEL_HIGH>;
......@@ -412,7 +412,7 @@ sdmmc3: sdhci@3440000 {
status = "disabled";
};
sdmmc4: sdhci@3460000 {
sdmmc4: mmc@3460000 {
compatible = "nvidia,tegra186-sdhci";
reg = <0x0 0x03460000 0x0 0x10000>;
interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>;
......
arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi
View file @ 67bb17f6
......@@ -9,8 +9,8 @@ / {
aliases {
ethernet0 = "/cbb@0/ethernet@2490000";
sdhci0 = "/cbb@0/sdhci@3460000";
sdhci1 = "/cbb@0/sdhci@3400000";
mmc0 = "/cbb@0/mmc@3460000";
mmc1 = "/cbb@0/mmc@3400000";
serial0 = &tcu;
i2c0 = "/bpmp/i2c";
i2c1 = "/cbb@0/i2c@3160000";
......@@ -58,12 +58,12 @@ serial@3110000 {
};
/* SDMMC1 (SD/MMC) */
sdhci@3400000 {
mmc@3400000 {
cd-gpios = <&gpio TEGRA194_MAIN_GPIO(A, 0) GPIO_ACTIVE_LOW>;
};
/* SDMMC4 (eMMC) */
sdhci@3460000 {
mmc@3460000 {
status = "okay";
bus-width = <8>;
non-removable;
......
arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts
View file @ 67bb17f6
......@@ -28,7 +28,7 @@ ddc: i2c@31c0000 {
};
/* SDMMC1 (SD/MMC) */
sdhci@3400000 {
mmc@3400000 {
status = "okay";
};
......
arch/arm64/boot/dts/nvidia/tegra194.dtsi
View file @ 67bb17f6
......@@ -456,7 +456,7 @@ pwm8: pwm@32f0000 {
#pwm-cells = <2>;
};
sdmmc1: sdhci@3400000 {
sdmmc1: mmc@3400000 {
compatible = "nvidia,tegra194-sdhci";
reg = <0x03400000 0x10000>;
interrupts = <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>;
......@@ -481,7 +481,7 @@ sdmmc1: sdhci@3400000 {
status = "disabled";
};
sdmmc3: sdhci@3440000 {
sdmmc3: mmc@3440000 {
compatible = "nvidia,tegra194-sdhci";
reg = <0x03440000 0x10000>;
interrupts = <GIC_SPI 64 IRQ_TYPE_LEVEL_HIGH>;
......@@ -507,7 +507,7 @@ sdmmc3: sdhci@3440000 {
status = "disabled";
};
sdmmc4: sdhci@3460000 {
sdmmc4: mmc@3460000 {
compatible = "nvidia,tegra194-sdhci";
reg = <0x03460000 0x10000>;
interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>;
......
arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi
View file @ 67bb17f6
......@@ -293,7 +293,7 @@ pmc@7000e400 {
};
/* eMMC */
sdhci@700b0600 {
mmc@700b0600 {
status = "okay";
bus-width = <8>;
non-removable;
......
arch/arm64/boot/dts/nvidia/tegra210-p2530.dtsi
View file @ 67bb17f6
......@@ -34,7 +34,7 @@ pmc@7000e400 {
};
/* eMMC */
sdhci@700b0600 {
mmc@700b0600 {
status = "okay";
bus-width = <8>;
non-removable;
......
arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi
View file @ 67bb17f6
......@@ -1505,7 +1505,7 @@ usb3-1 {
};
/* MMC/SD */
sdhci@700b0000 {
mmc@700b0000 {
status = "okay";
bus-width = <4>;
......
arch/arm64/boot/dts/nvidia/tegra210-p2894.dtsi
View file @ 67bb17f6
......@@ -1580,7 +1580,7 @@ pmc@7000e400 {
status = "okay";
};
sdhci@700b0600 {
mmc@700b0600 {
bus-width = <8>;
non-removable;
status = "okay";
......
arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts
View file @ 67bb17f6
......@@ -543,7 +543,7 @@ usb3-0 {
};
};
sdhci@700b0000 {
mmc@700b0000 {
status = "okay";
bus-width = <4>;
......@@ -561,7 +561,7 @@ usb@700d0000 {
hvdd-usb-supply = <&vdd_1v8>;
};
sdhci@700b0400 {
mmc@700b0400 {
status = "okay";
bus-width = <4>;
......
arch/arm64/boot/dts/nvidia/tegra210-smaug.dts
View file @ 67bb17f6
......@@ -1697,7 +1697,7 @@ usb3-0 {
};
};
sdhci@700b0600 {
mmc@700b0600 {
bus-width = <8>;
non-removable;
status = "okay";
......
arch/arm64/boot/dts/nvidia/tegra210.dtsi
View file @ 67bb17f6
......@@ -1175,7 +1175,7 @@ usb3-3 {
};
};
sdhci@700b0000 {
mmc@700b0000 {
compatible = "nvidia,tegra210-sdhci";
reg = <0x0 0x700b0000 0x0 0x200>;
interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
......@@ -1203,7 +1203,7 @@ sdhci@700b0000 {
status = "disabled";
};
sdhci@700b0200 {
mmc@700b0200 {
compatible = "nvidia,tegra210-sdhci";
reg = <0x0 0x700b0200 0x0 0x200>;
interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
......@@ -1220,7 +1220,7 @@ sdhci@700b0200 {
status = "disabled";
};
sdhci@700b0400 {
mmc@700b0400 {
compatible = "nvidia,tegra210-sdhci";
reg = <0x0 0x700b0400 0x0 0x200>;
interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
......@@ -1243,7 +1243,7 @@ sdhci@700b0400 {
status = "disabled";
};
sdhci@700b0600 {
mmc@700b0600 {
compatible = "nvidia,tegra210-sdhci";
reg = <0x0 0x700b0600 0x0 0x200>;
interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7