Whitebox
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mmc: tegra: use correct alias for SDHCI/MMC nodes

Browse Source 
The Tegra MMC driver currently honors "sdhci" entries in /aliases. The
MMC core however uses "mmc" entries in /aliases. This difference will be
relevant once the Tegra MMC driver is converted to DM, and the MMC core
handles alias lookups. To avoid issues during that conversion, fix the
Tegra MMC driver and all Tegra DTs to use the same alias name as the MMC
core does.

Cc: Jaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Jaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: Tom Warren <twarren@nvidia.com>
master
Stephen Warren 8 years ago committed by Tom Warren
parent 9a06a1a3a1
commit 67748a73b1
26 changed files with 53 additions and 53 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      arch/arm/dts/tegra114-dalmore.dts
  2. 4
      arch/arm/dts/tegra124-cei-tk1-som.dts
  3. 4
      arch/arm/dts/tegra124-jetson-tk1.dts
  4. 4
      arch/arm/dts/tegra124-nyan-big.dts
  5. 4
      arch/arm/dts/tegra124-venice2.dts
  6. 4
      arch/arm/dts/tegra186-p2771-0000.dtsi
  7. 2
      arch/arm/dts/tegra20-colibri.dts
  8. 4
      arch/arm/dts/tegra20-harmony.dts
  9. 2
      arch/arm/dts/tegra20-medcom-wide.dts
  10. 4
      arch/arm/dts/tegra20-paz00.dts
  11. 2
      arch/arm/dts/tegra20-plutux.dts
  12. 4
      arch/arm/dts/tegra20-seaboard.dts
  13. 2
      arch/arm/dts/tegra20-tec.dts
  14. 4
      arch/arm/dts/tegra20-trimslice.dts
  15. 4
      arch/arm/dts/tegra20-ventana.dts
  16. 4
      arch/arm/dts/tegra20-whistler.dts
  17. 4
      arch/arm/dts/tegra210-e2220-1170.dts
  18. 4
      arch/arm/dts/tegra210-p2371-0000.dts
  19. 4
      arch/arm/dts/tegra210-p2371-2180.dts
  20. 4
      arch/arm/dts/tegra210-p2571.dts
  21. 6
      arch/arm/dts/tegra30-apalis.dts
  22. 4
      arch/arm/dts/tegra30-beaver.dts
  23. 4
      arch/arm/dts/tegra30-cardhu.dts
  24. 4
      arch/arm/dts/tegra30-colibri.dts
  25. 6
      arch/arm/dts/tegra30-tamonten.dtsi
  26. 10
      drivers/mmc/tegra_mmc.c

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

@ -16,8 +16,8 @@
i2c2 = "/i2c@7000c400";
i2c3 = "/i2c@7000c500";
i2c4 = "/i2c@7000c700";
sdhci0 = "/sdhci@78000600";
sdhci1 = "/sdhci@78000400";
mmc0 = "/sdhci@78000600";
mmc1 = "/sdhci@78000400";
usb0 = "/usb@7d000000";
usb1 = "/usb@7d008000";
};

4
arch/arm/dts/tegra124-cei-tk1-som.dts
Unescape View File

@ -16,8 +16,8 @@
i2c2 = "/i2c@7000c400";
i2c3 = "/i2c@7000c500";
i2c4 = "/i2c@7000c700";
sdhci0 = "/sdhci@700b0600";
sdhci1 = "/sdhci@700b0400";
mmc0 = "/sdhci@700b0600";
mmc1 = "/sdhci@700b0400";
spi0 = "/spi@7000d400";
spi1 = "/spi@7000da00";
usb0 = "/usb@7d000000";

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

@ -16,8 +16,8 @@
i2c2 = "/i2c@7000c400";
i2c3 = "/i2c@7000c500";
i2c4 = "/i2c@7000c700";
sdhci0 = "/sdhci@700b0600";
sdhci1 = "/sdhci@700b0400";
mmc0 = "/sdhci@700b0600";
mmc1 = "/sdhci@700b0400";
spi0 = "/spi@7000d400";
spi1 = "/spi@7000da00";
usb0 = "/usb@7d000000";

4
arch/arm/dts/tegra124-nyan-big.dts
Unescape View File

@ -17,8 +17,8 @@
i2c5 = "/i2c@7000d100";
rtc0 = "/i2c@0,7000d000/pmic@40";
rtc1 = "/rtc@0,7000e000";
sdhci0 = "/sdhci@700b0600";
sdhci1 = "/sdhci@700b0400";
mmc0 = "/sdhci@700b0600";
mmc1 = "/sdhci@700b0400";
spi0 = "/spi@7000d400";
spi1 = "/spi@7000da00";
usb0 = "/usb@7d000000";

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

@ -17,8 +17,8 @@
i2c3 = "/i2c@7000c500";
i2c4 = "/i2c@7000c700";
i2c5 = "/i2c@7000d100";
sdhci0 = "/sdhci@700b0600";
sdhci1 = "/sdhci@700b0400";
mmc0 = "/sdhci@700b0600";
mmc1 = "/sdhci@700b0400";
spi0 = "/spi@7000d400";
spi1 = "/spi@7000da00";
usb0 = "/usb@7d000000";

4
arch/arm/dts/tegra186-p2771-0000.dtsi
Unescape View File

@ -9,8 +9,8 @@
};
aliases {
sdhci0 = "/sdhci@3460000";
sdhci1 = "/sdhci@3400000";
mmc0 = "/sdhci@3460000";
mmc1 = "/sdhci@3400000";
i2c0 = "/bpmp/i2c";
i2c1 = "/i2c@3160000";
i2c2 = "/i2c@c240000";

2
arch/arm/dts/tegra20-colibri.dts
Unescape View File

@ -17,7 +17,7 @@
usb0 = "/usb@c5008000";
usb1 = "/usb@c5000000";
usb2 = "/usb@c5004000";
sdhci0 = "/sdhci@c8000600";
mmc0 = "/sdhci@c8000600";
};
host1x@50000000 {

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

@ -17,8 +17,8 @@
serial0 = &uartd;
usb0 = "/usb@c5008000";
usb1 = "/usb@c5004000";
sdhci0 = "/sdhci@c8000600";
sdhci1 = "/sdhci@c8000200";
mmc0 = "/sdhci@c8000600";
mmc1 = "/sdhci@c8000200";
};
memory {

2
arch/arm/dts/tegra20-medcom-wide.dts
Unescape View File

@ -12,7 +12,7 @@
aliases {
usb0 = "/usb@c5008000";
sdhci0 = "/sdhci@c8000600";
mmc0 = "/sdhci@c8000600";
};
memory {

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

@ -12,8 +12,8 @@
aliases {
usb0 = "/usb@c5008000";
sdhci0 = "/sdhci@c8000600";
sdhci1 = "/sdhci@c8000000";
mmc0 = "/sdhci@c8000600";
mmc1 = "/sdhci@c8000000";
};
memory {

2
arch/arm/dts/tegra20-plutux.dts
Unescape View File

@ -12,7 +12,7 @@
aliases {
usb0 = "/usb@c5008000";
sdhci0 = "/sdhci@c8000600";
mmc0 = "/sdhci@c8000600";
};
memory {

4
arch/arm/dts/tegra20-seaboard.dts
Unescape View File

@ -18,8 +18,8 @@
rtc0 = "/i2c@7000d000/tps6586x@34";
rtc1 = "/rtc@7000e000";
serial0 = &uartd;
sdhci0 = "/sdhci@c8000600";
sdhci1 = "/sdhci@c8000400";
mmc0 = "/sdhci@c8000600";
mmc1 = "/sdhci@c8000400";
};
chosen {

2
arch/arm/dts/tegra20-tec.dts
Unescape View File

@ -12,7 +12,7 @@
aliases {
usb0 = "/usb@c5008000";
sdhci0 = "/sdhci@c8000600";
mmc0 = "/sdhci@c8000600";
};
memory {

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

@ -13,8 +13,8 @@
aliases {
usb0 = "/usb@c5008000";
usb1 = "/usb@c5000000";
sdhci0 = "/sdhci@c8000600";
sdhci1 = "/sdhci@c8000000";
mmc0 = "/sdhci@c8000600";
mmc1 = "/sdhci@c8000000";
spi0 = "/spi@7000c380";
};

4
arch/arm/dts/tegra20-ventana.dts
Unescape View File

@ -16,8 +16,8 @@
rtc1 = "/rtc@7000e000";
serial0 = &uartd;
usb0 = "/usb@c5008000";
sdhci0 = "/sdhci@c8000600";
sdhci1 = "/sdhci@c8000400";
mmc0 = "/sdhci@c8000600";
mmc1 = "/sdhci@c8000400";
};
memory {

4
arch/arm/dts/tegra20-whistler.dts
Unescape View File

@ -13,8 +13,8 @@
aliases {
i2c0 = "/i2c@7000d000";
usb0 = "/usb@c5008000";
sdhci0 = "/sdhci@c8000600";
sdhci1 = "/sdhci@c8000400";
mmc0 = "/sdhci@c8000600";
mmc1 = "/sdhci@c8000400";
};
memory {

4
arch/arm/dts/tegra210-e2220-1170.dts
Unescape View File

@ -12,8 +12,8 @@
aliases {
i2c0 = "/i2c@0,7000d000";
sdhci0 = "/sdhci@0,700b0600";
sdhci1 = "/sdhci@0,700b0000";
mmc0 = "/sdhci@0,700b0600";
mmc1 = "/sdhci@0,700b0000";
usb0 = "/usb@0,7d000000";
};

4
arch/arm/dts/tegra210-p2371-0000.dts
Unescape View File

@ -12,8 +12,8 @@
aliases {
i2c0 = "/i2c@0,7000d000";
sdhci0 = "/sdhci@0,700b0600";
sdhci1 = "/sdhci@0,700b0000";
mmc0 = "/sdhci@0,700b0600";
mmc1 = "/sdhci@0,700b0000";
usb0 = "/usb@0,7d000000";
};

4
arch/arm/dts/tegra210-p2371-2180.dts
Unescape View File

@ -12,8 +12,8 @@
aliases {
i2c0 = "/i2c@0,7000d000";
sdhci0 = "/sdhci@0,700b0600";
sdhci1 = "/sdhci@0,700b0000";
mmc0 = "/sdhci@0,700b0600";
mmc1 = "/sdhci@0,700b0000";
usb0 = "/usb@0,7d000000";
};

4
arch/arm/dts/tegra210-p2571.dts
Unescape View File

@ -17,8 +17,8 @@
i2c3 = "/i2c@0,7000c500";
i2c4 = "/i2c@0,7000c700";
i2c5 = "/i2c@0,7000d100";
sdhci0 = "/sdhci@0,700b0600";
sdhci1 = "/sdhci@0,700b0000";
mmc0 = "/sdhci@0,700b0600";
mmc1 = "/sdhci@0,700b0000";
spi0 = "/spi@0,7000d400";
spi1 = "/spi@0,7000da00";
spi2 = "/spi@0,70410000";

6
arch/arm/dts/tegra30-apalis.dts
Unescape View File

@ -15,9 +15,9 @@
i2c1 = "/i2c@7000c000";
i2c2 = "/i2c@7000c500";
i2c3 = "/i2c@7000c700";
sdhci0 = "/sdhci@78000600";
sdhci1 = "/sdhci@78000400";
sdhci2 = "/sdhci@78000000";
mmc0 = "/sdhci@78000600";
mmc1 = "/sdhci@78000400";
mmc2 = "/sdhci@78000000";
spi0 = "/spi@7000d400";
spi1 = "/spi@7000dc00";
spi2 = "/spi@7000de00";

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

@ -16,8 +16,8 @@
i2c2 = "/i2c@7000c400";
i2c3 = "/i2c@7000c500";
i2c4 = "/i2c@7000c700";
sdhci0 = "/sdhci@78000600";
sdhci1 = "/sdhci@78000000";
mmc0 = "/sdhci@78000600";
mmc1 = "/sdhci@78000000";
spi0 = "/spi@7000da00";
usb0 = "/usb@7d000000";
usb1 = "/usb@7d008000";

4
arch/arm/dts/tegra30-cardhu.dts
Unescape View File

@ -16,8 +16,8 @@
i2c2 = "/i2c@7000c400";
i2c3 = "/i2c@7000c500";
i2c4 = "/i2c@7000c700";
sdhci0 = "/sdhci@78000600";
sdhci1 = "/sdhci@78000000";
mmc0 = "/sdhci@78000600";
mmc1 = "/sdhci@78000000";
spi0 = "/spi@7000da00";
usb0 = "/usb@7d008000";
};

4
arch/arm/dts/tegra30-colibri.dts
Unescape View File

@ -14,8 +14,8 @@
i2c0 = "/i2c@7000d000";
i2c1 = "/i2c@7000c000";
i2c2 = "/i2c@7000c700";
sdhci0 = "/sdhci@78000600";
sdhci1 = "/sdhci@78000200";
mmc0 = "/sdhci@78000600";
mmc1 = "/sdhci@78000200";
spi0 = "/spi@7000d400";
usb0 = "/usb@7d000000";
usb1 = "/usb@7d004000"; /* on module only, for ASIX */

6
arch/arm/dts/tegra30-tamonten.dtsi
Unescape View File

@ -18,9 +18,9 @@
i2c2 = "/i2c@7000c400";
i2c3 = "/i2c@7000c500";
i2c4 = "/i2c@7000d000";
sdhci0 = "/sdhci@78000600";
sdhci1 = "/sdhci@78000400";
sdhci2 = "/sdhci@78000000";
mmc0 = "/sdhci@78000600";
mmc1 = "/sdhci@78000400";
mmc2 = "/sdhci@78000000";
usb0 = "/usb@7d008000";
};

10
drivers/mmc/tegra_mmc.c
Unescape View File

@ -736,7 +736,7 @@ void tegra_mmc_init(void)
debug("%s entry\n", __func__);
/* See if any Tegra186 MMC controllers are present */
count = fdtdec_find_aliases_for_id(blob, "sdhci",
count = fdtdec_find_aliases_for_id(blob, "mmc",
COMPAT_NVIDIA_TEGRA186_SDMMC, node_list,
CONFIG_SYS_MMC_MAX_DEVICE);
debug("%s: count of Tegra186 sdhci nodes is %d\n", __func__, count);
@ -746,7 +746,7 @@ void tegra_mmc_init(void)
}
/* See if any Tegra210 MMC controllers are present */
count = fdtdec_find_aliases_for_id(blob, "sdhci",
count = fdtdec_find_aliases_for_id(blob, "mmc",
COMPAT_NVIDIA_TEGRA210_SDMMC, node_list,
CONFIG_SYS_MMC_MAX_DEVICE);
debug("%s: count of Tegra210 sdhci nodes is %d\n", __func__, count);
@ -756,7 +756,7 @@ void tegra_mmc_init(void)
}
/* See if any Tegra124 MMC controllers are present */
count = fdtdec_find_aliases_for_id(blob, "sdhci",
count = fdtdec_find_aliases_for_id(blob, "mmc",
COMPAT_NVIDIA_TEGRA124_SDMMC, node_list,
CONFIG_SYS_MMC_MAX_DEVICE);
debug("%s: count of Tegra124 sdhci nodes is %d\n", __func__, count);
@ -766,7 +766,7 @@ void tegra_mmc_init(void)
}
/* See if any Tegra30 MMC controllers are present */
count = fdtdec_find_aliases_for_id(blob, "sdhci",
count = fdtdec_find_aliases_for_id(blob, "mmc",
COMPAT_NVIDIA_TEGRA30_SDMMC, node_list,
CONFIG_SYS_MMC_MAX_DEVICE);
debug("%s: count of T30 sdhci nodes is %d\n", __func__, count);
@ -776,7 +776,7 @@ void tegra_mmc_init(void)
}
/* Now look for any Tegra20 MMC controllers */
count = fdtdec_find_aliases_for_id(blob, "sdhci",
count = fdtdec_find_aliases_for_id(blob, "mmc",
COMPAT_NVIDIA_TEGRA20_SDMMC, node_list,
CONFIG_SYS_MMC_MAX_DEVICE);
debug("%s: count of T20 sdhci nodes is %d\n", __func__, count);

Write Preview
Loading…
Cancel
Save