Re: [U-Boot] [PATCH 02/21] mmc: tegra: use correct alias for SDHCI/MMC nodes
On 09/14/2016 01:45 AM, Stephen Warren wrote: > From: Stephen Warren> > 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 > Signed-off-by: Stephen Warren Reviewed-by: Jaehoon Chung 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-.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-.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@7d00"; > 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@7d00"; > 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@7d00"; > 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@7d00"; > 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 =
Re: [U-Boot] [PATCH 02/21] mmc: tegra: use correct alias for SDHCI/MMC nodes
On 13 September 2016 at 10:45, Stephen Warrenwrote: > From: Stephen Warren > > 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 > Signed-off-by: Stephen Warren > --- > 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-.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-.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 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 02/21] mmc: tegra: use correct alias for SDHCI/MMC nodes
From: Stephen WarrenThe 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 Signed-off-by: Stephen Warren --- 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-.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-.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@7d00"; 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@7d00"; 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@7d00"; 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@7d00"; 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";