Skip to content

L
linux
Commit 32c096c2 authored by Thierry Reding's avatar Thierry Reding
Browse files
Options

ARM: 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.

Cc: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Cc: Philippe Schenker <philippe.schenker@toradex.com>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent afd92390
Hide whitespace changes
Inline Side-by-side
Showing with 64 additions and 64 deletions
arch/arm/boot/dts/tegra114-dalmore.dts
View file @ 32c096c2
......@@ -1108,14 +1108,14 @@ i2s@70080400 {
};
};
sdhci@78000400 {
mmc@78000400 {
cd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;
wp-gpios = <&gpio TEGRA_GPIO(Q, 4) GPIO_ACTIVE_HIGH>;
bus-width = <4>;
status = "okay";
};
sdhci@78000600 {
mmc@78000600 {
bus-width = <8>;
status = "okay";
non-removable;
......
arch/arm/boot/dts/tegra114-roth.dts
View file @ 32c096c2
......@@ -962,7 +962,7 @@ pmc@7000e400 {
};
/* SD card */
sdhci@78000400 {
mmc@78000400 {
status = "okay";
bus-width = <4>;
vqmmc-supply = <&vddio_sdmmc3>;
......@@ -971,7 +971,7 @@ sdhci@78000400 {
};
/* eMMC */
sdhci@78000600 {
mmc@78000600 {
status = "okay";
bus-width = <8>;
non-removable;
......
arch/arm/boot/dts/tegra114-tn7.dts
View file @ 32c096c2
......@@ -242,7 +242,7 @@ pmc@7000e400 {
};
/* eMMC */
sdhci@78000600 {
mmc@78000600 {
status = "okay";
bus-width = <8>;
non-removable;
......
arch/arm/boot/dts/tegra114.dtsi
View file @ 32c096c2
......@@ -646,7 +646,7 @@ mipi: mipi@700e3000 {
#nvidia,mipi-calibrate-cells = <1>;
};
sdhci@78000000 {
mmc@78000000 {
compatible = "nvidia,tegra114-sdhci", "nvidia,tegra30-sdhci";
reg = <0x78000000 0x200>;
interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
......@@ -657,7 +657,7 @@ sdhci@78000000 {
status = "disabled";
};
sdhci@78000200 {
mmc@78000200 {
compatible = "nvidia,tegra114-sdhci", "nvidia,tegra30-sdhci";
reg = <0x78000200 0x200>;
interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
......@@ -668,7 +668,7 @@ sdhci@78000200 {
status = "disabled";
};
sdhci@78000400 {
mmc@78000400 {
compatible = "nvidia,tegra114-sdhci", "nvidia,tegra30-sdhci";
reg = <0x78000400 0x200>;
interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
......@@ -679,7 +679,7 @@ sdhci@78000400 {
status = "disabled";
};
sdhci@78000600 {
mmc@78000600 {
compatible = "nvidia,tegra114-sdhci", "nvidia,tegra30-sdhci";
reg = <0x78000600 0x200>;
interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
......
arch/arm/boot/dts/tegra124-apalis-eval.dts
View file @ 32c096c2
......@@ -130,7 +130,7 @@ usb@70090000 {
};
/* Apalis MMC1 */
sdhci@700b0000 {
mmc@700b0000 {
status = "okay";
bus-width = <4>;
/* MMC1_CD# */
......@@ -139,7 +139,7 @@ sdhci@700b0000 {
};
/* Apalis SD1 */
sdhci@700b0400 {
mmc@700b0400 {
status = "okay";
bus-width = <4>;
/* SD1_CD# */
......
arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts
View file @ 32c096c2
......@@ -132,7 +132,7 @@ usb@70090000 {
};
/* Apalis MMC1 */
sdhci@700b0000 {
mmc@700b0000 {
status = "okay";
bus-width = <4>;
/* MMC1_CD# */
......@@ -141,7 +141,7 @@ sdhci@700b0000 {
};
/* Apalis SD1 */
sdhci@700b0400 {
mmc@700b0400 {
status = "okay";
bus-width = <4>;
/* SD1_CD# */
......
arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
View file @ 32c096c2
......@@ -1916,7 +1916,7 @@ usb3-1 {
};
/* eMMC */
sdhci@700b0600 {
mmc@700b0600 {
status = "okay";
bus-width = <8>;
non-removable;
......
arch/arm/boot/dts/tegra124-apalis.dtsi
View file @ 32c096c2
......@@ -1908,7 +1908,7 @@ usb3-1 {
};
/* eMMC */
sdhci@700b0600 {
mmc@700b0600 {
status = "okay";
bus-width = <8>;
non-removable;
......
arch/arm/boot/dts/tegra124-jetson-tk1.dts
View file @ 32c096c2
......@@ -1804,7 +1804,7 @@ usb3-0 {
};
/* SD card */
sdhci@700b0400 {
mmc@700b0400 {
status = "okay";
cd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;
power-gpios = <&gpio TEGRA_GPIO(R, 0) GPIO_ACTIVE_HIGH>;
......@@ -1814,7 +1814,7 @@ sdhci@700b0400 {
};
/* eMMC */
sdhci@700b0600 {
mmc@700b0600 {
status = "okay";
bus-width = <8>;
non-removable;
......
arch/arm/boot/dts/tegra124-nyan-big.dts
View file @ 32c096c2
......@@ -20,7 +20,7 @@ panel: panel {
ddc-i2c-bus = <&dpaux>;
};
sdhci@700b0400 { /* SD Card on this bus */
mmc@700b0400 { /* SD Card on this bus */
wp-gpios = <&gpio TEGRA_GPIO(Q, 4) GPIO_ACTIVE_LOW>;
};
......
arch/arm/boot/dts/tegra124-nyan.dtsi
View file @ 32c096c2
......@@ -495,7 +495,7 @@ sdhci0_pwrseq: sdhci0_pwrseq {
reset-gpios = <&gpio TEGRA_GPIO(X, 7) GPIO_ACTIVE_LOW>;
};
sdhci@700b0000 { /* WiFi/BT on this bus */
mmc@700b0000 { /* WiFi/BT on this bus */
status = "okay";
bus-width = <4>;
no-1-8-v;
......@@ -506,7 +506,7 @@ sdhci@700b0000 { /* WiFi/BT on this bus */
keep-power-in-suspend;
};
sdhci@700b0400 { /* SD Card on this bus */
mmc@700b0400 { /* SD Card on this bus */
status = "okay";
cd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;
power-gpios = <&gpio TEGRA_GPIO(R, 0) GPIO_ACTIVE_HIGH>;
......@@ -515,7 +515,7 @@ sdhci@700b0400 { /* SD Card on this bus */
vqmmc-supply = <&vddio_sdmmc3>;
};
sdhci@700b0600 { /* eMMC on this bus */
mmc@700b0600 { /* eMMC on this bus */
status = "okay";
bus-width = <8>;
no-1-8-v;
......
arch/arm/boot/dts/tegra124-venice2.dts
View file @ 32c096c2
......@@ -1002,7 +1002,7 @@ usb3-1 {
};
};
sdhci@700b0400 {
mmc@700b0400 {
cd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_HIGH>;
power-gpios = <&gpio TEGRA_GPIO(R, 0) GPIO_ACTIVE_HIGH>;
wp-gpios = <&gpio TEGRA_GPIO(Q, 4) GPIO_ACTIVE_LOW>;
......@@ -1011,7 +1011,7 @@ sdhci@700b0400 {
vqmmc-supply = <&vddio_sdmmc3>;
};
sdhci@700b0600 {
mmc@700b0600 {
status = "okay";
bus-width = <8>;
non-removable;
......
arch/arm/boot/dts/tegra124.dtsi
View file @ 32c096c2
......@@ -833,7 +833,7 @@ usb3-1 {
};
};
sdhci@700b0000 {
mmc@700b0000 {
compatible = "nvidia,tegra124-sdhci";
reg = <0x0 0x700b0000 0x0 0x200>;
interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
......@@ -843,7 +843,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>;
......@@ -853,7 +853,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>;
......@@ -863,7 +863,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/arm/boot/dts/tegra20-colibri-eval-v3.dts
View file @ 32c096c2
......@@ -183,7 +183,7 @@ can@0 {
};
/* SD/MMC */
sdhci@c8000600 {
mmc@c8000600 {
status = "okay";
bus-width = <4>;
cd-gpios = <&gpio TEGRA_GPIO(C, 7) GPIO_ACTIVE_LOW>; /* MMCD */
......
arch/arm/boot/dts/tegra20-colibri-iris.dts
View file @ 32c096c2
......@@ -171,7 +171,7 @@ spi@7000da00 {
};
/* SD/MMC */
sdhci@c8000600 {
mmc@c8000600 {
status = "okay";
bus-width = <4>;
cd-gpios = <&gpio TEGRA_GPIO(C, 7) GPIO_ACTIVE_LOW>; /* MMCD */
......
arch/arm/boot/dts/tegra20-harmony.dts
View file @ 32c096c2
......@@ -613,7 +613,7 @@ usb-phy@c5008000 {
status = "okay";
};
sdhci@c8000200 {
mmc@c8000200 {
status = "okay";
cd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>;
wp-gpios = <&gpio TEGRA_GPIO(H, 1) GPIO_ACTIVE_HIGH>;
......@@ -621,7 +621,7 @@ sdhci@c8000200 {
bus-width = <4>;
};
sdhci@c8000600 {
mmc@c8000600 {
status = "okay";
cd-gpios = <&gpio TEGRA_GPIO(H, 2) GPIO_ACTIVE_LOW>;
wp-gpios = <&gpio TEGRA_GPIO(H, 3) GPIO_ACTIVE_HIGH>;
......
arch/arm/boot/dts/tegra20-paz00.dts
View file @ 32c096c2
......@@ -543,7 +543,7 @@ usb-phy@c5008000 {
status = "okay";
};
sdhci@c8000000 {
mmc@c8000000 {
status = "okay";
cd-gpios = <&gpio TEGRA_GPIO(V, 5) GPIO_ACTIVE_LOW>;
wp-gpios = <&gpio TEGRA_GPIO(H, 1) GPIO_ACTIVE_HIGH>;
......@@ -551,7 +551,7 @@ sdhci@c8000000 {
bus-width = <4>;
};
sdhci@c8000600 {
mmc@c8000600 {
status = "okay";
bus-width = <8>;
non-removable;
......
arch/arm/boot/dts/tegra20-seaboard.dts
View file @ 32c096c2
......@@ -760,14 +760,14 @@ usb-phy@c5008000 {
status = "okay";
};
sdhci@c8000000 {
mmc@c8000000 {
status = "okay";
power-gpios = <&gpio TEGRA_GPIO(K, 6) GPIO_ACTIVE_HIGH>;
bus-width = <4>;
keep-power-in-suspend;
};
sdhci@c8000400 {
mmc@c8000400 {
status = "okay";
cd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>;
wp-gpios = <&gpio TEGRA_GPIO(H, 1) GPIO_ACTIVE_HIGH>;
......@@ -775,7 +775,7 @@ sdhci@c8000400 {
bus-width = <4>;
};
sdhci@c8000600 {
mmc@c8000600 {
status = "okay";
bus-width = <8>;
non-removable;
......
arch/arm/boot/dts/tegra20-tamonten.dtsi
View file @ 32c096c2
......@@ -495,7 +495,7 @@ usb-phy@c5008000 {
status = "okay";
};
sdhci@c8000600 {
mmc@c8000600 {
cd-gpios = <&gpio TEGRA_GPIO(H, 2) GPIO_ACTIVE_LOW>;
wp-gpios = <&gpio TEGRA_GPIO(H, 3) GPIO_ACTIVE_HIGH>;
bus-width = <4>;
......
arch/arm/boot/dts/tegra20-trimslice.dts
View file @ 32c096c2
......@@ -366,13 +366,13 @@ usb-phy@c5008000 {
status = "okay";
};
sdhci@c8000000 {
mmc@c8000000 {
status = "okay";
broken-cd;
bus-width = <4>;
};
sdhci@c8000600 {
mmc@c8000600 {
status = "okay";
cd-gpios = <&gpio TEGRA_GPIO(P, 1) GPIO_ACTIVE_LOW>;
wp-gpios = <&gpio TEGRA_GPIO(P, 2) GPIO_ACTIVE_HIGH>;
......
arch/arm/boot/dts/tegra20-ventana.dts
View file @ 32c096c2
......@@ -554,14 +554,14 @@ usb-phy@c5008000 {
status = "okay";
};
sdhci@c8000000 {
mmc@c8000000 {
status = "okay";
power-gpios = <&gpio TEGRA_GPIO(K, 6) GPIO_ACTIVE_HIGH>;
bus-width = <4>;
keep-power-in-suspend;
};
sdhci@c8000400 {
mmc@c8000400 {
status = "okay";
cd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>;
wp-gpios = <&gpio TEGRA_GPIO(H, 1) GPIO_ACTIVE_HIGH>;
......@@ -569,7 +569,7 @@ sdhci@c8000400 {
bus-width = <4>;
};
sdhci@c8000600 {
mmc@c8000600 {
status = "okay";
bus-width = <8>;
non-removable;
......
arch/arm/boot/dts/tegra20.dtsi
View file @ 32c096c2
......@@ -807,7 +807,7 @@ phy3: usb-phy@c5008000 {
status = "disabled";
};
sdhci@c8000000 {
mmc@c8000000 {
compatible = "nvidia,tegra20-sdhci";
reg = <0xc8000000 0x200>;
interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
......@@ -817,7 +817,7 @@ sdhci@c8000000 {
status = "disabled";
};
sdhci@c8000200 {
mmc@c8000200 {
compatible = "nvidia,tegra20-sdhci";
reg = <0xc8000200 0x200>;
interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
......@@ -827,7 +827,7 @@ sdhci@c8000200 {
status = "disabled";
};
sdhci@c8000400 {
mmc@c8000400 {
compatible = "nvidia,tegra20-sdhci";
reg = <0xc8000400 0x200>;
interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
......@@ -837,7 +837,7 @@ sdhci@c8000400 {
status = "disabled";
};
sdhci@c8000600 {
mmc@c8000600 {
compatible = "nvidia,tegra20-sdhci";
reg = <0xc8000600 0x200>;
interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
......
arch/arm/boot/dts/tegra30-apalis-eval.dts
View file @ 32c096c2
......@@ -120,7 +120,7 @@ spi@7000dc00 {
};
/* Apalis SD1 */
sdhci@78000000 {
mmc@78000000 {
status = "okay";
bus-width = <4>;
/* SD1_CD# */
......@@ -129,7 +129,7 @@ sdhci@78000000 {
};
/* Apalis MMC1 */
sdhci@78000400 {
mmc@78000400 {
status = "okay";
bus-width = <8>;
/* MMC1_CD# */
......
arch/arm/boot/dts/tegra30-apalis-v1.1-eval.dts
View file @ 32c096c2
......@@ -121,7 +121,7 @@ spi@7000dc00 {
};
/* Apalis SD1 */
sdhci@78000000 {
mmc@78000000 {
status = "okay";
bus-width = <4>;
/* SD1_CD# */
......@@ -130,7 +130,7 @@ sdhci@78000000 {
};
/* Apalis MMC1 */
sdhci@78000400 {
mmc@78000400 {
status = "okay";
bus-width = <8>;
/* MMC1_CD# */
......
arch/arm/boot/dts/tegra30-apalis-v1.1.dtsi
View file @ 32c096c2
......@@ -1112,7 +1112,7 @@ i2s@70080500 {
};
/* eMMC */
sdhci@78000600 {
mmc@78000600 {
status = "okay";
bus-width = <8>;
non-removable;
......
arch/arm/boot/dts/tegra30-apalis.dtsi
View file @ 32c096c2
......@@ -1094,7 +1094,7 @@ i2s@70080500 {
};
/* eMMC */
sdhci@78000600 {
mmc@78000600 {
status = "okay";
bus-width = <8>;
non-removable;
......
arch/arm/boot/dts/tegra30-beaver.dts
View file @ 32c096c2
......@@ -1922,7 +1922,7 @@ i2s@70080400 {
};
};
sdhci@78000000 {
mmc@78000000 {
status = "okay";
vqmmc-supply = <&ldo5_reg>;
cd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>;
......@@ -1931,7 +1931,7 @@ sdhci@78000000 {
bus-width = <4>;
};
sdhci@78000600 {
mmc@78000600 {
status = "okay";
bus-width = <8>;
non-removable;
......
arch/arm/boot/dts/tegra30-cardhu-a02.dts
View file @ 32c096c2
......@@ -9,7 +9,7 @@ / {
model = "NVIDIA Tegra30 Cardhu A02 evaluation board";
compatible = "nvidia,cardhu-a02", "nvidia,cardhu", "nvidia,tegra30";
sdhci@78000400 {
mmc@78000400 {
status = "okay";
power-gpios = <&gpio TEGRA_GPIO(D, 4) GPIO_ACTIVE_HIGH>;
bus-width = <4>;
......
arch/arm/boot/dts/tegra30-cardhu-a04.dts
View file @ 32c096c2
......@@ -11,7 +11,7 @@ / {
model = "NVIDIA Tegra30 Cardhu A04 (A05, A06, A07) evaluation board";
compatible = "nvidia,cardhu-a04", "nvidia,cardhu", "nvidia,tegra30";
sdhci@78000400 {
mmc@78000400 {
status = "okay";
power-gpios = <&gpio TEGRA_GPIO(D, 3) GPIO_ACTIVE_HIGH>;
bus-width = <4>;
......
arch/arm/boot/dts/tegra30-cardhu.dtsi
View file @ 32c096c2
......@@ -384,7 +384,7 @@ i2s@70080400 {
};
};
sdhci@78000000 {
mmc@78000000 {
status = "okay";
cd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>;
wp-gpios = <&gpio TEGRA_GPIO(T, 3) GPIO_ACTIVE_HIGH>;
......@@ -392,7 +392,7 @@ sdhci@78000000 {
bus-width = <4>;
};
sdhci@78000600 {
mmc@78000600 {
status = "okay";
bus-width = <8>;
non-removable;
......
arch/arm/boot/dts/tegra30-colibri-eval-v3.dts
View file @ 32c096c2
......@@ -98,7 +98,7 @@ can@0 {
};
/* SD/MMC */
sdhci@78000200 {
mmc@78000200 {
status = "okay";
bus-width = <4>;
cd-gpios = <&gpio TEGRA_GPIO(C, 7) GPIO_ACTIVE_LOW>; /* MMCD */
......
arch/arm/boot/dts/tegra30-colibri.dtsi
View file @ 32c096c2
......@@ -933,7 +933,7 @@ i2s@70080500 {
};
/* eMMC */
sdhci@78000600 {
mmc@78000600 {
status = "okay";
bus-width = <8>;
non-removable;
......
arch/arm/boot/dts/tegra30.dtsi
View file @ 32c096c2
......@@ -853,7 +853,7 @@ tegra_i2s4: i2s@70080700 {
};
};
sdhci@78000000 {
mmc@78000000 {
compatible = "nvidia,tegra30-sdhci", "nvidia,tegra20-sdhci";
reg = <0x78000000 0x200>;
interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
......@@ -863,7 +863,7 @@ sdhci@78000000 {
status = "disabled";
};
sdhci@78000200 {
mmc@78000200 {
compatible = "nvidia,tegra30-sdhci", "nvidia,tegra20-sdhci";
reg = <0x78000200 0x200>;
interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
......@@ -873,7 +873,7 @@ sdhci@78000200 {
status = "disabled";
};
sdhci@78000400 {
mmc@78000400 {
compatible = "nvidia,tegra30-sdhci", "nvidia,tegra20-sdhci";
reg = <0x78000400 0x200>;
interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
......@@ -883,7 +883,7 @@ sdhci@78000400 {
status = "disabled";
};
sdhci@78000600 {
mmc@78000600 {
compatible = "nvidia,tegra30-sdhci", "nvidia,tegra20-sdhci";
reg = <0x78000600 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