Skip to contentSkip to conversation

arm: socfpga: Make the DT mmc node consistent

PATCH New Marek Vasut 2 participants 3 messages Aug 10, 2015 – Aug 18, 2015 Arm (32-bit)

lore
Share & tools
lore

Marek Vasut

author
#0 lore raw

PATCH 1/1 arm: socfpga: Make the DT mmc node consistent

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 <[email protected]>
---
 arch/arm/dts/socfpga.dtsi                  | 3 +--
 arch/arm/dts/socfpga_cyclone5_socrates.dts | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)
arch/arm/dts/socfpga.dtsi +1 -2
index 125034b..8588221 100644
@@ -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 at ff704000 {
+		mmc0: dwmmc0 at ff704000 {
 			compatible = "altr,socfpga-dw-mshc";
 			reg = <0xff704000 0x1000>;
 			interrupts = <0 139 4>;
arch/arm/dts/socfpga_cyclone5_socrates.dts +1 -1
index 00b1830..3c98558 100644
@@ -34,7 +34,7 @@
 	};
 };
 
-&mmc {
+&mmc0 {
 	status = "okay";
 };
Signature · 1 line
2.1.4
#1 lore raw

PATCH 1/1 arm: socfpga: Make the DT mmc node consistent

Quoted 10 lines · Marek Vasut

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 <[email protected]>
---
 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 <[email protected]>

Thanks,
Dinh

author
#2 lore raw

PATCH 1/1 arm: socfpga: Make the DT mmc node consistent

Quoted 5 lines · Dinh Nguyen
Quoted 4 lines · Marek Vasut

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.

Quoted 8 lines
Quoted 6 lines
Signed-off-by Marek Vasut <[email protected]>

---

 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 <[email protected]>

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

Best regards,
Marek Vasut