Merge tag 'socfpga_dts_for_v4.5_part_2' of...

Merge tag 'socfpga_dts_for_v4.5_part_2' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into next/dt

SoCFPGA DTS update for v4.5, part 2
- clean up mcvevk dts file, replace space with tab
- Disable SDMMC node in base socfpga.dtsi file

* tag 'socfpga_dts_for_v4.5_part_2' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
  ARM: socfpga: dts: Enable MMC support at correct place in the DT
  ARM: socfpga: Repair incorrectly applied MCV patch
Signed-off-by: Olof Johansson <olof@lixom.net>

arch/arm/boot/dts/socfpga.dtsi

@@ -677,6 +677,7 @@ mmc: dwmmc0@ff704000 {
 			#size-cells = <0>;
 			clocks = <&l4_mp_clk>, <&sdmmc_clk_divided>;
 			clock-names = "biu", "ciu";
+			status = "disabled";
 		};
 
 		ocram: sram@ffff0000 {

arch/arm/boot/dts/socfpga_arria5_socdk.dts

@@ -79,6 +79,7 @@ rtc@68 {
 &mmc0 {
 	vmmc-supply = <&regulator_3_3v>;
 	vqmmc-supply = <&regulator_3_3v>;
+	status = "okay";
 };
 
 &usb1 {

arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts

@@ -100,6 +100,7 @@ adxl345: adxl345@0 {
 &mmc0 {
 	vmmc-supply = <&regulator_3_3v>;
 	vqmmc-supply = <&regulator_3_3v>;
+	status = "okay";
 };
 
 &uart0 {

arch/arm/boot/dts/socfpga_cyclone5_mcv.dtsi

@@ -30,4 +30,5 @@ memory {
 
 &mmc0 {	/* On-SoM eMMC */
 	bus-width = <8>;
+	status = "okay";
 };

arch/arm/boot/dts/socfpga_cyclone5_socdk.dts

@@ -84,6 +84,7 @@ &mmc0 {
 	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

@@ -80,6 +80,7 @@ accel1: accelerometer@53 {
 &mmc0 {
 	vmmc-supply = <&regulator_3_3v>;
 	vqmmc-supply = <&regulator_3_3v>;
+	status = "okay";
 };
 
 &usb1 {