Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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 <marex@denx.de>
Cc: Alan Tull <atull@altera.com>
Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
Cc: Marek Vasut <marex@denx.de>
Cc: Olof Johansson <olof@lixom.net>
Cc: Thor Thayer <tthayer@altera.com>
Cc: Vince Bridgers <vbridgers2013@gmail.com>
Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com>

authored by

Marek Vasut and committed by
Dinh Nguyen
91f69147 dfd35b77

+6
+1
arch/arm/boot/dts/socfpga.dtsi
··· 677 677 #size-cells = <0>; 678 678 clocks = <&l4_mp_clk>, <&sdmmc_clk_divided>; 679 679 clock-names = "biu", "ciu"; 680 + status = "disabled"; 680 681 }; 681 682 682 683 ocram: sram@ffff0000 {
+1
arch/arm/boot/dts/socfpga_arria5_socdk.dts
··· 79 79 &mmc0 { 80 80 vmmc-supply = <&regulator_3_3v>; 81 81 vqmmc-supply = <&regulator_3_3v>; 82 + status = "okay"; 82 83 }; 83 84 84 85 &usb1 {
+1
arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts
··· 100 100 &mmc0 { 101 101 vmmc-supply = <&regulator_3_3v>; 102 102 vqmmc-supply = <&regulator_3_3v>; 103 + status = "okay"; 103 104 }; 104 105 105 106 &uart0 {
+1
arch/arm/boot/dts/socfpga_cyclone5_mcv.dtsi
··· 30 30 31 31 &mmc0 { /* On-SoM eMMC */ 32 32 bus-width = <8>; 33 + status = "okay"; 33 34 };
+1
arch/arm/boot/dts/socfpga_cyclone5_socdk.dts
··· 84 84 cd-gpios = <&portb 18 0>; 85 85 vmmc-supply = <&regulator_3_3v>; 86 86 vqmmc-supply = <&regulator_3_3v>; 87 + status = "okay"; 87 88 }; 88 89 89 90 &usb1 {
+1
arch/arm/boot/dts/socfpga_cyclone5_sockit.dts
··· 80 80 &mmc0 { 81 81 vmmc-supply = <&regulator_3_3v>; 82 82 vqmmc-supply = <&regulator_3_3v>; 83 + status = "okay"; 83 84 }; 84 85 85 86 &usb1 {