diff mbox

[U-Boot] arm: socfpga: Make the DT mmc node consistent

Message ID 1439247761-9205-1-git-send-email-marex@denx.de
State Accepted
Delegated to: Marek Vasut
Headers show

Commit Message

Marek Vasut Aug. 10, 2015, 11:02 p.m. UTC 
The socfpga_cyclone5.dtsi has an mmc0 node, socrates has mmc node.
This makes aliases not very usable, so make everything into mmc0.
Moreover, zap the useless mmc alias while at this.

Signed-off-by: Marek Vasut <marex@denx.de>
---
 arch/arm/dts/socfpga.dtsi                  | 3 +--
 arch/arm/dts/socfpga_cyclone5_socrates.dts | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

Comments

Dinh Nguyen Aug. 18, 2015, 8:30 p.m. UTC | #1 
On 8/10/15 6:02 PM, Marek Vasut wrote:
> The socfpga_cyclone5.dtsi has an mmc0 node, socrates has mmc node.
> This makes aliases not very usable, so make everything into mmc0.
> Moreover, zap the useless mmc alias while at this.
> 
> Signed-off-by: Marek Vasut <marex@denx.de>
> ---
>  arch/arm/dts/socfpga.dtsi                  | 3 +--
>  arch/arm/dts/socfpga_cyclone5_socrates.dts | 2 +-
>  2 files changed, 2 insertions(+), 3 deletions(-)
> 

Acked-by: Dinh Nguyen <dinguyen@opensource.altera.com>

Thanks,
Dinh
Marek Vasut Aug. 18, 2015, 10:06 p.m. UTC | #2 
On Tuesday, August 18, 2015 at 10:30:15 PM, Dinh Nguyen wrote:
> On 8/10/15 6:02 PM, Marek Vasut wrote:
> > The socfpga_cyclone5.dtsi has an mmc0 node, socrates has mmc node.
> > This makes aliases not very usable, so make everything into mmc0.
> > Moreover, zap the useless mmc alias while at this.
> > 
> > Signed-off-by: Marek Vasut <marex@denx.de>
> > ---
> > 
> >  arch/arm/dts/socfpga.dtsi                  | 3 +--
> >  arch/arm/dts/socfpga_cyclone5_socrates.dts | 2 +-
> >  2 files changed, 2 insertions(+), 3 deletions(-)
> 
> Acked-by: Dinh Nguyen <dinguyen@opensource.altera.com>

Applied to u-boot-socfpga/master, thanks!

Best regards,
Marek Vasut
diff mbox

Patch

diff --git a/arch/arm/dts/socfpga.dtsi b/arch/arm/dts/socfpga.dtsi
index 125034b..8588221 100644
--- a/arch/arm/dts/socfpga.dtsi
+++ b/arch/arm/dts/socfpga.dtsi
@@ -23,7 +23,6 @@ 
 		spi0 = &qspi;
 		spi1 = &spi0;
 		spi2 = &spi1;
-		mmc = &mmc;
 	};
 
 	cpus {
@@ -624,7 +623,7 @@ 
 			arm,data-latency = <2 1 1>;
 		};
 
-		mmc: dwmmc0@ff704000 {
+		mmc0: dwmmc0@ff704000 {
 			compatible = "altr,socfpga-dw-mshc";
 			reg = <0xff704000 0x1000>;
 			interrupts = <0 139 4>;
diff --git a/arch/arm/dts/socfpga_cyclone5_socrates.dts b/arch/arm/dts/socfpga_cyclone5_socrates.dts
index 00b1830..3c98558 100644
--- a/arch/arm/dts/socfpga_cyclone5_socrates.dts
+++ b/arch/arm/dts/socfpga_cyclone5_socrates.dts
@@ -34,7 +34,7 @@ 
 	};
 };
 
-&mmc {
+&mmc0 {
 	status = "okay";
 };