redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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: Thierry Reding <treding@nvidia.com>
zero-sugar-mainline-defconfig
Thierry Reding 2020-06-11 19:21:17 +02:00
parent afd92390fc
commit 32c096c227
33 changed files with 64 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/boot/dts/tegra114-dalmore.dts
View File

@ -1108,14 +1108,14 @@
};
};
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;

4
arch/arm/boot/dts/tegra114-roth.dts
View File

@ -962,7 +962,7 @@
};
/* SD card */
sdhci@78000400 {
mmc@78000400 {
status = "okay";
bus-width = <4>;
vqmmc-supply = <&vddio_sdmmc3>;
@ -971,7 +971,7 @@
};
/* eMMC */
sdhci@78000600 {
mmc@78000600 {
status = "okay";
bus-width = <8>;
non-removable;

2
arch/arm/boot/dts/tegra114-tn7.dts
View File

@ -242,7 +242,7 @@
};
/* eMMC */
sdhci@78000600 {
mmc@78000600 {
status = "okay";
bus-width = <8>;
non-removable;

8
arch/arm/boot/dts/tegra114.dtsi
View File

@ -646,7 +646,7 @@
#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 @@
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 @@
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 @@
status = "disabled";
};
sdhci@78000600 {
mmc@78000600 {
compatible = "nvidia,tegra114-sdhci", "nvidia,tegra30-sdhci";
reg = <0x78000600 0x200>;
interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;

4
arch/arm/boot/dts/tegra124-apalis-eval.dts
View File

@ -130,7 +130,7 @@
};
/* Apalis MMC1 */
sdhci@700b0000 {
mmc@700b0000 {
status = "okay";
bus-width = <4>;
/* MMC1_CD# */
@ -139,7 +139,7 @@
};
/* Apalis SD1 */
sdhci@700b0400 {
mmc@700b0400 {
status = "okay";
bus-width = <4>;
/* SD1_CD# */

4
arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts
View File

@ -132,7 +132,7 @@
};
/* Apalis MMC1 */
sdhci@700b0000 {
mmc@700b0000 {
status = "okay";
bus-width = <4>;
/* MMC1_CD# */
@ -141,7 +141,7 @@
};
/* Apalis SD1 */
sdhci@700b0400 {
mmc@700b0400 {
status = "okay";
bus-width = <4>;
/* SD1_CD# */

2
arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
View File

@ -1916,7 +1916,7 @@
};
/* eMMC */
sdhci@700b0600 {
mmc@700b0600 {
status = "okay";
bus-width = <8>;
non-removable;

2
arch/arm/boot/dts/tegra124-apalis.dtsi
View File

@ -1908,7 +1908,7 @@
};
/* eMMC */
sdhci@700b0600 {
mmc@700b0600 {
status = "okay";
bus-width = <8>;
non-removable;

4
arch/arm/boot/dts/tegra124-jetson-tk1.dts
View File

@ -1804,7 +1804,7 @@
};
/* 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 @@
};
/* eMMC */
sdhci@700b0600 {
mmc@700b0600 {
status = "okay";
bus-width = <8>;
non-removable;

2
arch/arm/boot/dts/tegra124-nyan-big.dts
View File

@ -20,7 +20,7 @@
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>;
};

6
arch/arm/boot/dts/tegra124-nyan.dtsi
View File

@ -495,7 +495,7 @@
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 @@
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 @@
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;

4
arch/arm/boot/dts/tegra124-venice2.dts
View File

@ -1002,7 +1002,7 @@
};
};
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 @@
vqmmc-supply = <&vddio_sdmmc3>;
};
sdhci@700b0600 {
mmc@700b0600 {
status = "okay";
bus-width = <8>;
non-removable;

8
arch/arm/boot/dts/tegra124.dtsi
View File

@ -833,7 +833,7 @@
};
};
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 @@
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 @@
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 @@
status = "disabled";
};
sdhci@700b0600 {
mmc@700b0600 {
compatible = "nvidia,tegra124-sdhci";
reg = <0x0 0x700b0600 0x0 0x200>;
interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;

2
arch/arm/boot/dts/tegra20-colibri-eval-v3.dts
View File

@ -183,7 +183,7 @@
};
/* SD/MMC */
sdhci@c8000600 {
mmc@c8000600 {
status = "okay";
bus-width = <4>;
cd-gpios = <&gpio TEGRA_GPIO(C, 7) GPIO_ACTIVE_LOW>; /* MMCD */

2
arch/arm/boot/dts/tegra20-colibri-iris.dts
View File

@ -171,7 +171,7 @@
};
/* SD/MMC */
sdhci@c8000600 {
mmc@c8000600 {
status = "okay";
bus-width = <4>;
cd-gpios = <&gpio TEGRA_GPIO(C, 7) GPIO_ACTIVE_LOW>; /* MMCD */

4
arch/arm/boot/dts/tegra20-harmony.dts
View File

@ -613,7 +613,7 @@
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 @@
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>;

4
arch/arm/boot/dts/tegra20-paz00.dts
View File

@ -543,7 +543,7 @@
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 @@
bus-width = <4>;
};
sdhci@c8000600 {
mmc@c8000600 {
status = "okay";
bus-width = <8>;
non-removable;

6
arch/arm/boot/dts/tegra20-seaboard.dts
View File

@ -760,14 +760,14 @@
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 @@
bus-width = <4>;
};
sdhci@c8000600 {
mmc@c8000600 {
status = "okay";
bus-width = <8>;
non-removable;

2
arch/arm/boot/dts/tegra20-tamonten.dtsi
View File

@ -495,7 +495,7 @@
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>;

4
arch/arm/boot/dts/tegra20-trimslice.dts
View File

@ -366,13 +366,13 @@
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>;

6
arch/arm/boot/dts/tegra20-ventana.dts
View File

@ -554,14 +554,14 @@
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 @@
bus-width = <4>;
};
sdhci@c8000600 {
mmc@c8000600 {
status = "okay";
bus-width = <8>;
non-removable;

8
arch/arm/boot/dts/tegra20.dtsi
View File

@ -807,7 +807,7 @@
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 @@
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 @@
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 @@
status = "disabled";
};
sdhci@c8000600 {
mmc@c8000600 {
compatible = "nvidia,tegra20-sdhci";
reg = <0xc8000600 0x200>;
interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;

4
arch/arm/boot/dts/tegra30-apalis-eval.dts
View File

@ -120,7 +120,7 @@
};
/* Apalis SD1 */
sdhci@78000000 {
mmc@78000000 {
status = "okay";
bus-width = <4>;
/* SD1_CD# */
@ -129,7 +129,7 @@
};
/* Apalis MMC1 */
sdhci@78000400 {
mmc@78000400 {
status = "okay";
bus-width = <8>;
/* MMC1_CD# */

4
arch/arm/boot/dts/tegra30-apalis-v1.1-eval.dts
View File

@ -121,7 +121,7 @@
};
/* Apalis SD1 */
sdhci@78000000 {
mmc@78000000 {
status = "okay";
bus-width = <4>;
/* SD1_CD# */
@ -130,7 +130,7 @@
};
/* Apalis MMC1 */
sdhci@78000400 {
mmc@78000400 {
status = "okay";
bus-width = <8>;
/* MMC1_CD# */

2
arch/arm/boot/dts/tegra30-apalis-v1.1.dtsi
View File

@ -1112,7 +1112,7 @@
};
/* eMMC */
sdhci@78000600 {
mmc@78000600 {
status = "okay";
bus-width = <8>;
non-removable;

2
arch/arm/boot/dts/tegra30-apalis.dtsi
View File

@ -1094,7 +1094,7 @@
};
/* eMMC */
sdhci@78000600 {
mmc@78000600 {
status = "okay";
bus-width = <8>;
non-removable;

4
arch/arm/boot/dts/tegra30-beaver.dts
View File

@ -1922,7 +1922,7 @@
};
};
sdhci@78000000 {
mmc@78000000 {
status = "okay";
vqmmc-supply = <&ldo5_reg>;
cd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>;
@ -1931,7 +1931,7 @@
bus-width = <4>;
};
sdhci@78000600 {
mmc@78000600 {
status = "okay";
bus-width = <8>;
non-removable;

2
arch/arm/boot/dts/tegra30-cardhu-a02.dts
View File

@ -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>;

2
arch/arm/boot/dts/tegra30-cardhu-a04.dts
View File

@ -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>;

4
arch/arm/boot/dts/tegra30-cardhu.dtsi
View File

@ -384,7 +384,7 @@
};
};
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 @@
bus-width = <4>;
};
sdhci@78000600 {
mmc@78000600 {
status = "okay";
bus-width = <8>;
non-removable;

2
arch/arm/boot/dts/tegra30-colibri-eval-v3.dts
View File

@ -98,7 +98,7 @@
};
/* SD/MMC */
sdhci@78000200 {
mmc@78000200 {
status = "okay";
bus-width = <4>;
cd-gpios = <&gpio TEGRA_GPIO(C, 7) GPIO_ACTIVE_LOW>; /* MMCD */

2
arch/arm/boot/dts/tegra30-colibri.dtsi
View File

@ -933,7 +933,7 @@
};
/* eMMC */
sdhci@78000600 {
mmc@78000600 {
status = "okay";
bus-width = <8>;
non-removable;

8
arch/arm/boot/dts/tegra30.dtsi
View File

@ -853,7 +853,7 @@
};
};
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 @@
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 @@
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 @@
status = "disabled";
};
sdhci@78000600 {
mmc@78000600 {
compatible = "nvidia,tegra30-sdhci", "nvidia,tegra20-sdhci";
reg = <0x78000600 0x200>;
interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;