Skip to contentSkip to conversation

ARM: socfpga: dts: Enable MMC support at correct place in the DT

PATCH Superseded Marek Vasut 2 participants 3 messages Dec 17, 2015 – Dec 20, 2015 Device tree bindings

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Marek Vasut

author
#0 lore raw

PATCH 1/1 ARM: socfpga: dts: Enable MMC support at correct place in the DT

The socfpga.dtsi explicitly enabled MMC support, but not all boards are equiped with an MMC card. There are setups which only have QSPI NOR. Therefore, disable the MMC support on socfpga.dtsi level and enable it on per-board basis.

Signed-off-by Marek Vasut <[email protected]>
Cc Alan Tull <[email protected]>
Cc Dinh Nguyen <[email protected]>
Cc Marek Vasut <[email protected]>
Cc Olof Johansson <[email protected]>
Cc Thor Thayer <[email protected]>
Cc Vince Bridgers <[email protected]>
---
 arch/arm/boot/dts/socfpga.dtsi                    | 1 +
 arch/arm/boot/dts/socfpga_arria5_socdk.dts        | 1 +
 arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts | 1 +
 arch/arm/boot/dts/socfpga_cyclone5_mcv.dtsi       | 1 +
 arch/arm/boot/dts/socfpga_cyclone5_socdk.dts      | 1 +
 arch/arm/boot/dts/socfpga_cyclone5_sockit.dts     | 1 +
 6 files changed, 6 insertions(+)

NOTE: This should not cause any trouble, since I checked all the boards
for the presence of the HPS SD card slot / eMMC.

arch/arm/boot/dts/socfpga.dtsi +1 -0
index cffea91..ebcd081 100644
@@ -677,6 +677,7 @@
 			#size-cells = <0>;
 			clocks = <&l4_mp_clk>, <&sdmmc_clk_divided>;
 			clock-names = "biu", "ciu";
+			status = "disabled";
 		};
 
 		ocram: sram at ffff0000 {
arch/arm/boot/dts/socfpga_arria5_socdk.dts +1 -0
index a75a666..3c88678 100644
@@ -79,6 +79,7 @@
 &mmc0 {
 	vmmc-supply = <&regulator_3_3v>;
 	vqmmc-supply = <&regulator_3_3v>;
+	status = "okay";
 };
 
 &usb1 {
arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts +1 -0
index 555e9ca..afea364 100644
@@ -100,6 +100,7 @@
 &mmc0 {
 	vmmc-supply = <&regulator_3_3v>;
 	vqmmc-supply = <&regulator_3_3v>;
+	status = "okay";
 };
 
 &uart0 {
arch/arm/boot/dts/socfpga_cyclone5_mcv.dtsi +1 -0
index baecd98..f86f9c0 100644
@@ -30,4 +30,5 @@
 
 &mmc0 {	/* On-SoM eMMC */
 	bus-width = <8>;
+	status = "okay";
 };
arch/arm/boot/dts/socfpga_cyclone5_socdk.dts +1 -0
index d4d0a28..15e43f4 100644
@@ -84,6 +84,7 @@
 	cd-gpios = <&portb 18 0>;
 	vmmc-supply = <&regulator_3_3v>;
 	vqmmc-supply = <&regulator_3_3v>;
+	status = "okay";
 };
 
 &usb1 {
arch/arm/boot/dts/socfpga_cyclone5_sockit.dts +1 -0
index 54ed3f9..1a0c726 100644
@@ -172,6 +172,7 @@
 &mmc0 {
 	vmmc-supply = <&regulator_3_3v>;
 	vqmmc-supply = <&regulator_3_3v>;
+	status = "okay";
 };
 
 &qspi {
Signature · 1 line
2.6.4
#1 lore raw

PATCH 1/1 ARM: socfpga: dts: Enable MMC support at correct place in the DT

Quoted 14 lines · Marek Vasut

The socfpga.dtsi explicitly enabled MMC support, but not all boards are equiped with an MMC card. There are setups which only have QSPI NOR. Therefore, disable the MMC support on socfpga.dtsi level and enable it on per-board basis.

Signed-off-by Marek Vasut <[email protected]>
Cc Alan Tull <[email protected]>
Cc Dinh Nguyen <[email protected]>
Cc Marek Vasut <[email protected]>
Cc Olof Johansson <[email protected]>
Cc Thor Thayer <[email protected]>
Cc Vince Bridgers <[email protected]>
---
 arch/arm/boot/dts/socfpga.dtsi                    | 1 +

<snip>

arch/arm/boot/dts/socfpga_cyclone5_sockit.dts line 178

Quoted 12 lines
arch/arm/boot/dts/socfpga_cyclone5_sockit.dts +1 -0
index 54ed3f9..1a0c726 100644
@@ -172,6 +172,7 @@
 &mmc0 {
 	vmmc-supply = <&regulator_3_3v>;
 	vqmmc-supply = <&regulator_3_3v>;
+	status = "okay";
 };
 
 &qspi {

This part doesn't apply to any of the upstream branches. "&qspi" has not been enabled yet, unless I have missed that patch? Can you please rebase this patch to my branch:

git://git.kernel.org:pub/scm/linux/kernel/git/dinguyen/linux.git socfpga_for_next_v4.5_dts

Thanks,,
Dinh

author
#2 lore raw

PATCH 1/1 ARM: socfpga: dts: Enable MMC support at correct place in the DT

Quoted 33 lines · Dinh Nguyen
Quoted 15 lines · Marek Vasut

The socfpga.dtsi explicitly enabled MMC support, but not all boards are equiped with an MMC card. There are setups which only have QSPI NOR. Therefore, disable the MMC support on socfpga.dtsi level and enable it on per-board basis.

Signed-off-by Marek Vasut <[email protected]>
Cc Alan Tull <[email protected]>
Cc Dinh Nguyen <[email protected]>
Cc Marek Vasut <[email protected]>
Cc Olof Johansson <[email protected]>
Cc Thor Thayer <[email protected]>
Cc Vince Bridgers <[email protected]>

---

 arch/arm/boot/dts/socfpga.dtsi                    | 1 +

<snip>

Quoted 14 lines
(quoted diff) +0 -0

b/arch/arm/boot/dts/socfpga_cyclone5_sockit.dts index 54ed3f9..1a0c726 100644

arch/arm/boot/dts/socfpga_cyclone5_sockit.dts +1 -0
@@ -172,6 +172,7 @@
 
 &mmc0 {
 
 	vmmc-supply = <&regulator_3_3v>;
 	vqmmc-supply = <&regulator_3_3v>;
 
+	status = "okay";
Quoted 7 lines
Quoted 3 lines

};

&qspi {

This part doesn't apply to any of the upstream branches. "&qspi" has not been enabled yet, unless I have missed that patch? Can you please rebase this patch to my branch:

V2 is out, should be better.

I'm still working on the QSPI and had this patch way too high in the queue, sorry about that ;-)

Quoted 5 lines

git://git.kernel.org:pub/scm/linux/kernel/git/dinguyen/linux.git
socfpga_for_next_v4.5_dts

Thanks,,
Dinh

Best regards,
Marek Vasut