| Message ID | 20160913164602.23963-2-swarren@wwwdotorg.org |
|---|---|
| State | Accepted |
| Commit | 67748a73b14b239283bc1ace7564a124b714b75e |
| Delegated to: | Tom Warren |
| Headers | show |
On 13 September 2016 at 10:45, Stephen Warren <swarren@wwwdotorg.org> wrote: > From: Stephen Warren <swarren@nvidia.com> > > 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> > --- > arch/arm/dts/tegra114-dalmore.dts | 4 ++-- > arch/arm/dts/tegra124-cei-tk1-som.dts | 4 ++-- > arch/arm/dts/tegra124-jetson-tk1.dts | 4 ++-- > arch/arm/dts/tegra124-nyan-big.dts | 4 ++-- > arch/arm/dts/tegra124-venice2.dts | 4 ++-- > arch/arm/dts/tegra186-p2771-0000.dtsi | 4 ++-- > arch/arm/dts/tegra20-colibri.dts | 2 +- > arch/arm/dts/tegra20-harmony.dts | 4 ++-- > arch/arm/dts/tegra20-medcom-wide.dts | 2 +- > arch/arm/dts/tegra20-paz00.dts | 4 ++-- > arch/arm/dts/tegra20-plutux.dts | 2 +- > arch/arm/dts/tegra20-seaboard.dts | 4 ++-- > arch/arm/dts/tegra20-tec.dts | 2 +- > arch/arm/dts/tegra20-trimslice.dts | 4 ++-- > arch/arm/dts/tegra20-ventana.dts | 4 ++-- > arch/arm/dts/tegra20-whistler.dts | 4 ++-- > arch/arm/dts/tegra210-e2220-1170.dts | 4 ++-- > arch/arm/dts/tegra210-p2371-0000.dts | 4 ++-- > arch/arm/dts/tegra210-p2371-2180.dts | 4 ++-- > arch/arm/dts/tegra210-p2571.dts | 4 ++-- > arch/arm/dts/tegra30-apalis.dts | 6 +++--- > arch/arm/dts/tegra30-beaver.dts | 4 ++-- > arch/arm/dts/tegra30-cardhu.dts | 4 ++-- > arch/arm/dts/tegra30-colibri.dts | 4 ++-- > arch/arm/dts/tegra30-tamonten.dtsi | 6 +++--- > drivers/mmc/tegra_mmc.c | 10 +++++----- > 26 files changed, 53 insertions(+), 53 deletions(-) Reviewed-by: Simon Glass <sjg@chromium.org>
On 09/14/2016 01:45 AM, Stephen Warren wrote: > From: Stephen Warren <swarren@nvidia.com> > > 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: Jaehoon Chung <jh80.chung@samsung.com> Best Regards, Jaehoon Chung > --- > arch/arm/dts/tegra114-dalmore.dts | 4 ++-- > arch/arm/dts/tegra124-cei-tk1-som.dts | 4 ++-- > arch/arm/dts/tegra124-jetson-tk1.dts | 4 ++-- > arch/arm/dts/tegra124-nyan-big.dts | 4 ++-- > arch/arm/dts/tegra124-venice2.dts | 4 ++-- > arch/arm/dts/tegra186-p2771-0000.dtsi | 4 ++-- > arch/arm/dts/tegra20-colibri.dts | 2 +- > arch/arm/dts/tegra20-harmony.dts | 4 ++-- > arch/arm/dts/tegra20-medcom-wide.dts | 2 +- > arch/arm/dts/tegra20-paz00.dts | 4 ++-- > arch/arm/dts/tegra20-plutux.dts | 2 +- > arch/arm/dts/tegra20-seaboard.dts | 4 ++-- > arch/arm/dts/tegra20-tec.dts | 2 +- > arch/arm/dts/tegra20-trimslice.dts | 4 ++-- > arch/arm/dts/tegra20-ventana.dts | 4 ++-- > arch/arm/dts/tegra20-whistler.dts | 4 ++-- > arch/arm/dts/tegra210-e2220-1170.dts | 4 ++-- > arch/arm/dts/tegra210-p2371-0000.dts | 4 ++-- > arch/arm/dts/tegra210-p2371-2180.dts | 4 ++-- > arch/arm/dts/tegra210-p2571.dts | 4 ++-- > arch/arm/dts/tegra30-apalis.dts | 6 +++--- > arch/arm/dts/tegra30-beaver.dts | 4 ++-- > arch/arm/dts/tegra30-cardhu.dts | 4 ++-- > arch/arm/dts/tegra30-colibri.dts | 4 ++-- > arch/arm/dts/tegra30-tamonten.dtsi | 6 +++--- > drivers/mmc/tegra_mmc.c | 10 +++++----- > 26 files changed, 53 insertions(+), 53 deletions(-) > > diff --git a/arch/arm/dts/tegra114-dalmore.dts b/arch/arm/dts/tegra114-dalmore.dts > index f0331a740178..9325149cba6f 100644 > --- a/arch/arm/dts/tegra114-dalmore.dts > +++ b/arch/arm/dts/tegra114-dalmore.dts > @@ -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"; > }; > diff --git a/arch/arm/dts/tegra124-cei-tk1-som.dts b/arch/arm/dts/tegra124-cei-tk1-som.dts > index d22c0cabec7a..c4d4f9d89f12 100644 > --- a/arch/arm/dts/tegra124-cei-tk1-som.dts > +++ b/arch/arm/dts/tegra124-cei-tk1-som.dts > @@ -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"; > diff --git a/arch/arm/dts/tegra124-jetson-tk1.dts b/arch/arm/dts/tegra124-jetson-tk1.dts > index 4a63b6d86160..f1db952355b8 100644 > --- a/arch/arm/dts/tegra124-jetson-tk1.dts > +++ b/arch/arm/dts/tegra124-jetson-tk1.dts > @@ -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"; > diff --git a/arch/arm/dts/tegra124-nyan-big.dts b/arch/arm/dts/tegra124-nyan-big.dts > index 20e0be30e980..a0f1d09bee58 100644 > --- a/arch/arm/dts/tegra124-nyan-big.dts > +++ b/arch/arm/dts/tegra124-nyan-big.dts > @@ -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"; > diff --git a/arch/arm/dts/tegra124-venice2.dts b/arch/arm/dts/tegra124-venice2.dts > index 6c39563bfc64..add9244e6874 100644 > --- a/arch/arm/dts/tegra124-venice2.dts > +++ b/arch/arm/dts/tegra124-venice2.dts > @@ -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"; > diff --git a/arch/arm/dts/tegra186-p2771-0000.dtsi b/arch/arm/dts/tegra186-p2771-0000.dtsi > index 28fac5d8a261..54b2539ff456 100644 > --- a/arch/arm/dts/tegra186-p2771-0000.dtsi > +++ b/arch/arm/dts/tegra186-p2771-0000.dtsi > @@ -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"; > diff --git a/arch/arm/dts/tegra20-colibri.dts b/arch/arm/dts/tegra20-colibri.dts > index 2cf24d3ee771..a291d93c7d01 100644 > --- a/arch/arm/dts/tegra20-colibri.dts > +++ b/arch/arm/dts/tegra20-colibri.dts > @@ -17,7 +17,7 @@ > usb0 = "/usb@c5008000"; > usb1 = "/usb@c5000000"; > usb2 = "/usb@c5004000"; > - sdhci0 = "/sdhci@c8000600"; > + mmc0 = "/sdhci@c8000600"; > }; > > host1x@50000000 { > diff --git a/arch/arm/dts/tegra20-harmony.dts b/arch/arm/dts/tegra20-harmony.dts > index 8e9fe5ad3f16..cace74339483 100644 > --- a/arch/arm/dts/tegra20-harmony.dts > +++ b/arch/arm/dts/tegra20-harmony.dts > @@ -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 { > diff --git a/arch/arm/dts/tegra20-medcom-wide.dts b/arch/arm/dts/tegra20-medcom-wide.dts > index 3d37257189e0..1c79d757467d 100644 > --- a/arch/arm/dts/tegra20-medcom-wide.dts > +++ b/arch/arm/dts/tegra20-medcom-wide.dts > @@ -12,7 +12,7 @@ > > aliases { > usb0 = "/usb@c5008000"; > - sdhci0 = "/sdhci@c8000600"; > + mmc0 = "/sdhci@c8000600"; > }; > > memory { > diff --git a/arch/arm/dts/tegra20-paz00.dts b/arch/arm/dts/tegra20-paz00.dts > index 946862e72095..cf6bd70189b8 100644 > --- a/arch/arm/dts/tegra20-paz00.dts > +++ b/arch/arm/dts/tegra20-paz00.dts > @@ -12,8 +12,8 @@ > > aliases { > usb0 = "/usb@c5008000"; > - sdhci0 = "/sdhci@c8000600"; > - sdhci1 = "/sdhci@c8000000"; > + mmc0 = "/sdhci@c8000600"; > + mmc1 = "/sdhci@c8000000"; > }; > > memory { > diff --git a/arch/arm/dts/tegra20-plutux.dts b/arch/arm/dts/tegra20-plutux.dts > index 7f57f1d4b573..1b642be99281 100644 > --- a/arch/arm/dts/tegra20-plutux.dts > +++ b/arch/arm/dts/tegra20-plutux.dts > @@ -12,7 +12,7 @@ > > aliases { > usb0 = "/usb@c5008000"; > - sdhci0 = "/sdhci@c8000600"; > + mmc0 = "/sdhci@c8000600"; > }; > > memory { > diff --git a/arch/arm/dts/tegra20-seaboard.dts b/arch/arm/dts/tegra20-seaboard.dts > index 0a454f98cf3a..14210519a6c2 100644 > --- a/arch/arm/dts/tegra20-seaboard.dts > +++ b/arch/arm/dts/tegra20-seaboard.dts > @@ -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 { > diff --git a/arch/arm/dts/tegra20-tec.dts b/arch/arm/dts/tegra20-tec.dts > index 4f68077fafa1..4733c8134900 100644 > --- a/arch/arm/dts/tegra20-tec.dts > +++ b/arch/arm/dts/tegra20-tec.dts > @@ -12,7 +12,7 @@ > > aliases { > usb0 = "/usb@c5008000"; > - sdhci0 = "/sdhci@c8000600"; > + mmc0 = "/sdhci@c8000600"; > }; > > memory { > diff --git a/arch/arm/dts/tegra20-trimslice.dts b/arch/arm/dts/tegra20-trimslice.dts > index db13ff965178..be64e667cd5b 100644 > --- a/arch/arm/dts/tegra20-trimslice.dts > +++ b/arch/arm/dts/tegra20-trimslice.dts > @@ -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"; > }; > > diff --git a/arch/arm/dts/tegra20-ventana.dts b/arch/arm/dts/tegra20-ventana.dts > index 143e964459a0..371445622c1e 100644 > --- a/arch/arm/dts/tegra20-ventana.dts > +++ b/arch/arm/dts/tegra20-ventana.dts > @@ -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 { > diff --git a/arch/arm/dts/tegra20-whistler.dts b/arch/arm/dts/tegra20-whistler.dts > index d4577c99c5d9..447874674d72 100644 > --- a/arch/arm/dts/tegra20-whistler.dts > +++ b/arch/arm/dts/tegra20-whistler.dts > @@ -13,8 +13,8 @@ > aliases { > i2c0 = "/i2c@7000d000"; > usb0 = "/usb@c5008000"; > - sdhci0 = "/sdhci@c8000600"; > - sdhci1 = "/sdhci@c8000400"; > + mmc0 = "/sdhci@c8000600"; > + mmc1 = "/sdhci@c8000400"; > }; > > memory { > diff --git a/arch/arm/dts/tegra210-e2220-1170.dts b/arch/arm/dts/tegra210-e2220-1170.dts > index c6e21762815f..69af9cfe2a3d 100644 > --- a/arch/arm/dts/tegra210-e2220-1170.dts > +++ b/arch/arm/dts/tegra210-e2220-1170.dts > @@ -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"; > }; > > diff --git a/arch/arm/dts/tegra210-p2371-0000.dts b/arch/arm/dts/tegra210-p2371-0000.dts > index 3aa59d087bc8..44315476275f 100644 > --- a/arch/arm/dts/tegra210-p2371-0000.dts > +++ b/arch/arm/dts/tegra210-p2371-0000.dts > @@ -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"; > }; > > diff --git a/arch/arm/dts/tegra210-p2371-2180.dts b/arch/arm/dts/tegra210-p2371-2180.dts > index c4db2a45c561..aa18dd27ceaf 100644 > --- a/arch/arm/dts/tegra210-p2371-2180.dts > +++ b/arch/arm/dts/tegra210-p2371-2180.dts > @@ -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"; > }; > > diff --git a/arch/arm/dts/tegra210-p2571.dts b/arch/arm/dts/tegra210-p2571.dts > index 726c893aa500..d2ad9eded632 100644 > --- a/arch/arm/dts/tegra210-p2571.dts > +++ b/arch/arm/dts/tegra210-p2571.dts > @@ -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"; > diff --git a/arch/arm/dts/tegra30-apalis.dts b/arch/arm/dts/tegra30-apalis.dts > index 3e0545c8befb..60e87a4f3af5 100644 > --- a/arch/arm/dts/tegra30-apalis.dts > +++ b/arch/arm/dts/tegra30-apalis.dts > @@ -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"; > diff --git a/arch/arm/dts/tegra30-beaver.dts b/arch/arm/dts/tegra30-beaver.dts > index 2ff7497a37ea..340fcaf845c7 100644 > --- a/arch/arm/dts/tegra30-beaver.dts > +++ b/arch/arm/dts/tegra30-beaver.dts > @@ -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"; > diff --git a/arch/arm/dts/tegra30-cardhu.dts b/arch/arm/dts/tegra30-cardhu.dts > index 3dc2043d547e..2237682e0ebd 100644 > --- a/arch/arm/dts/tegra30-cardhu.dts > +++ b/arch/arm/dts/tegra30-cardhu.dts > @@ -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"; > }; > diff --git a/arch/arm/dts/tegra30-colibri.dts b/arch/arm/dts/tegra30-colibri.dts > index 487e1f6ae54c..8784cd20b4c4 100644 > --- a/arch/arm/dts/tegra30-colibri.dts > +++ b/arch/arm/dts/tegra30-colibri.dts > @@ -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 */ > diff --git a/arch/arm/dts/tegra30-tamonten.dtsi b/arch/arm/dts/tegra30-tamonten.dtsi > index 50ae9ccce278..75c0f42d919f 100644 > --- a/arch/arm/dts/tegra30-tamonten.dtsi > +++ b/arch/arm/dts/tegra30-tamonten.dtsi > @@ -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"; > }; > > diff --git a/drivers/mmc/tegra_mmc.c b/drivers/mmc/tegra_mmc.c > index 3d0845e31735..08b4bd48245a 100644 > --- a/drivers/mmc/tegra_mmc.c > +++ b/drivers/mmc/tegra_mmc.c > @@ -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); >
diff --git a/arch/arm/dts/tegra114-dalmore.dts b/arch/arm/dts/tegra114-dalmore.dts index f0331a740178..9325149cba6f 100644 --- a/arch/arm/dts/tegra114-dalmore.dts +++ b/arch/arm/dts/tegra114-dalmore.dts @@ -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"; }; diff --git a/arch/arm/dts/tegra124-cei-tk1-som.dts b/arch/arm/dts/tegra124-cei-tk1-som.dts index d22c0cabec7a..c4d4f9d89f12 100644 --- a/arch/arm/dts/tegra124-cei-tk1-som.dts +++ b/arch/arm/dts/tegra124-cei-tk1-som.dts @@ -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"; diff --git a/arch/arm/dts/tegra124-jetson-tk1.dts b/arch/arm/dts/tegra124-jetson-tk1.dts index 4a63b6d86160..f1db952355b8 100644 --- a/arch/arm/dts/tegra124-jetson-tk1.dts +++ b/arch/arm/dts/tegra124-jetson-tk1.dts @@ -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"; diff --git a/arch/arm/dts/tegra124-nyan-big.dts b/arch/arm/dts/tegra124-nyan-big.dts index 20e0be30e980..a0f1d09bee58 100644 --- a/arch/arm/dts/tegra124-nyan-big.dts +++ b/arch/arm/dts/tegra124-nyan-big.dts @@ -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"; diff --git a/arch/arm/dts/tegra124-venice2.dts b/arch/arm/dts/tegra124-venice2.dts index 6c39563bfc64..add9244e6874 100644 --- a/arch/arm/dts/tegra124-venice2.dts +++ b/arch/arm/dts/tegra124-venice2.dts @@ -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"; diff --git a/arch/arm/dts/tegra186-p2771-0000.dtsi b/arch/arm/dts/tegra186-p2771-0000.dtsi index 28fac5d8a261..54b2539ff456 100644 --- a/arch/arm/dts/tegra186-p2771-0000.dtsi +++ b/arch/arm/dts/tegra186-p2771-0000.dtsi @@ -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"; diff --git a/arch/arm/dts/tegra20-colibri.dts b/arch/arm/dts/tegra20-colibri.dts index 2cf24d3ee771..a291d93c7d01 100644 --- a/arch/arm/dts/tegra20-colibri.dts +++ b/arch/arm/dts/tegra20-colibri.dts @@ -17,7 +17,7 @@ usb0 = "/usb@c5008000"; usb1 = "/usb@c5000000"; usb2 = "/usb@c5004000"; - sdhci0 = "/sdhci@c8000600"; + mmc0 = "/sdhci@c8000600"; }; host1x@50000000 { diff --git a/arch/arm/dts/tegra20-harmony.dts b/arch/arm/dts/tegra20-harmony.dts index 8e9fe5ad3f16..cace74339483 100644 --- a/arch/arm/dts/tegra20-harmony.dts +++ b/arch/arm/dts/tegra20-harmony.dts @@ -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 { diff --git a/arch/arm/dts/tegra20-medcom-wide.dts b/arch/arm/dts/tegra20-medcom-wide.dts index 3d37257189e0..1c79d757467d 100644 --- a/arch/arm/dts/tegra20-medcom-wide.dts +++ b/arch/arm/dts/tegra20-medcom-wide.dts @@ -12,7 +12,7 @@ aliases { usb0 = "/usb@c5008000"; - sdhci0 = "/sdhci@c8000600"; + mmc0 = "/sdhci@c8000600"; }; memory { diff --git a/arch/arm/dts/tegra20-paz00.dts b/arch/arm/dts/tegra20-paz00.dts index 946862e72095..cf6bd70189b8 100644 --- a/arch/arm/dts/tegra20-paz00.dts +++ b/arch/arm/dts/tegra20-paz00.dts @@ -12,8 +12,8 @@ aliases { usb0 = "/usb@c5008000"; - sdhci0 = "/sdhci@c8000600"; - sdhci1 = "/sdhci@c8000000"; + mmc0 = "/sdhci@c8000600"; + mmc1 = "/sdhci@c8000000"; }; memory { diff --git a/arch/arm/dts/tegra20-plutux.dts b/arch/arm/dts/tegra20-plutux.dts index 7f57f1d4b573..1b642be99281 100644 --- a/arch/arm/dts/tegra20-plutux.dts +++ b/arch/arm/dts/tegra20-plutux.dts @@ -12,7 +12,7 @@ aliases { usb0 = "/usb@c5008000"; - sdhci0 = "/sdhci@c8000600"; + mmc0 = "/sdhci@c8000600"; }; memory { diff --git a/arch/arm/dts/tegra20-seaboard.dts b/arch/arm/dts/tegra20-seaboard.dts index 0a454f98cf3a..14210519a6c2 100644 --- a/arch/arm/dts/tegra20-seaboard.dts +++ b/arch/arm/dts/tegra20-seaboard.dts @@ -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 { diff --git a/arch/arm/dts/tegra20-tec.dts b/arch/arm/dts/tegra20-tec.dts index 4f68077fafa1..4733c8134900 100644 --- a/arch/arm/dts/tegra20-tec.dts +++ b/arch/arm/dts/tegra20-tec.dts @@ -12,7 +12,7 @@ aliases { usb0 = "/usb@c5008000"; - sdhci0 = "/sdhci@c8000600"; + mmc0 = "/sdhci@c8000600"; }; memory { diff --git a/arch/arm/dts/tegra20-trimslice.dts b/arch/arm/dts/tegra20-trimslice.dts index db13ff965178..be64e667cd5b 100644 --- a/arch/arm/dts/tegra20-trimslice.dts +++ b/arch/arm/dts/tegra20-trimslice.dts @@ -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"; }; diff --git a/arch/arm/dts/tegra20-ventana.dts b/arch/arm/dts/tegra20-ventana.dts index 143e964459a0..371445622c1e 100644 --- a/arch/arm/dts/tegra20-ventana.dts +++ b/arch/arm/dts/tegra20-ventana.dts @@ -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 { diff --git a/arch/arm/dts/tegra20-whistler.dts b/arch/arm/dts/tegra20-whistler.dts index d4577c99c5d9..447874674d72 100644 --- a/arch/arm/dts/tegra20-whistler.dts +++ b/arch/arm/dts/tegra20-whistler.dts @@ -13,8 +13,8 @@ aliases { i2c0 = "/i2c@7000d000"; usb0 = "/usb@c5008000"; - sdhci0 = "/sdhci@c8000600"; - sdhci1 = "/sdhci@c8000400"; + mmc0 = "/sdhci@c8000600"; + mmc1 = "/sdhci@c8000400"; }; memory { diff --git a/arch/arm/dts/tegra210-e2220-1170.dts b/arch/arm/dts/tegra210-e2220-1170.dts index c6e21762815f..69af9cfe2a3d 100644 --- a/arch/arm/dts/tegra210-e2220-1170.dts +++ b/arch/arm/dts/tegra210-e2220-1170.dts @@ -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"; }; diff --git a/arch/arm/dts/tegra210-p2371-0000.dts b/arch/arm/dts/tegra210-p2371-0000.dts index 3aa59d087bc8..44315476275f 100644 --- a/arch/arm/dts/tegra210-p2371-0000.dts +++ b/arch/arm/dts/tegra210-p2371-0000.dts @@ -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"; }; diff --git a/arch/arm/dts/tegra210-p2371-2180.dts b/arch/arm/dts/tegra210-p2371-2180.dts index c4db2a45c561..aa18dd27ceaf 100644 --- a/arch/arm/dts/tegra210-p2371-2180.dts +++ b/arch/arm/dts/tegra210-p2371-2180.dts @@ -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"; }; diff --git a/arch/arm/dts/tegra210-p2571.dts b/arch/arm/dts/tegra210-p2571.dts index 726c893aa500..d2ad9eded632 100644 --- a/arch/arm/dts/tegra210-p2571.dts +++ b/arch/arm/dts/tegra210-p2571.dts @@ -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"; diff --git a/arch/arm/dts/tegra30-apalis.dts b/arch/arm/dts/tegra30-apalis.dts index 3e0545c8befb..60e87a4f3af5 100644 --- a/arch/arm/dts/tegra30-apalis.dts +++ b/arch/arm/dts/tegra30-apalis.dts @@ -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"; diff --git a/arch/arm/dts/tegra30-beaver.dts b/arch/arm/dts/tegra30-beaver.dts index 2ff7497a37ea..340fcaf845c7 100644 --- a/arch/arm/dts/tegra30-beaver.dts +++ b/arch/arm/dts/tegra30-beaver.dts @@ -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"; diff --git a/arch/arm/dts/tegra30-cardhu.dts b/arch/arm/dts/tegra30-cardhu.dts index 3dc2043d547e..2237682e0ebd 100644 --- a/arch/arm/dts/tegra30-cardhu.dts +++ b/arch/arm/dts/tegra30-cardhu.dts @@ -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"; }; diff --git a/arch/arm/dts/tegra30-colibri.dts b/arch/arm/dts/tegra30-colibri.dts index 487e1f6ae54c..8784cd20b4c4 100644 --- a/arch/arm/dts/tegra30-colibri.dts +++ b/arch/arm/dts/tegra30-colibri.dts @@ -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 */ diff --git a/arch/arm/dts/tegra30-tamonten.dtsi b/arch/arm/dts/tegra30-tamonten.dtsi index 50ae9ccce278..75c0f42d919f 100644 --- a/arch/arm/dts/tegra30-tamonten.dtsi +++ b/arch/arm/dts/tegra30-tamonten.dtsi @@ -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"; }; diff --git a/drivers/mmc/tegra_mmc.c b/drivers/mmc/tegra_mmc.c index 3d0845e31735..08b4bd48245a 100644 --- a/drivers/mmc/tegra_mmc.c +++ b/drivers/mmc/tegra_mmc.c @@ -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);