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

@@ -18,16 +18,17 @@
 #include "socfpga_cyclone5.dtsi"
 
 / {
-       model = "DENX MCV";
-       compatible = "altr,socfpga-cyclone5", "altr,socfpga";
+	model = "DENX MCV";
+	compatible = "altr,socfpga-cyclone5", "altr,socfpga";
 
-       memory {
-               name = "memory";
-               device_type = "memory";
-               reg = <0x0 0x40000000>; /* 1 GiB */
-       };
+	memory {
+		name = "memory";
+		device_type = "memory";
+		reg = <0x0 0x40000000>; /* 1 GiB */
+	};
 };
 
-&mmc0 {        /* On-SoM eMMC */
-       bus-width = <8>;
+&mmc0 {	/* On-SoM eMMC */
+	bus-width = <8>;
+	status = "okay";
 };

arch/arm/boot/dts/socfpga_cyclone5_mcvevk.dts

@@ -18,77 +18,77 @@
 #include "socfpga_cyclone5_mcv.dtsi"
 
 / {
-       model = "DENX MCV EVK";
-       compatible = "altr,socfpga-cyclone5", "altr,socfpga";
+	model = "DENX MCV EVK";
+	compatible = "altr,socfpga-cyclone5", "altr,socfpga";
 
-       aliases {
-               ethernet0 = &gmac0;
-               stmpe-i2c0 = &stmpe1;
-       };
+	aliases {
+		ethernet0 = &gmac0;
+		stmpe-i2c0 = &stmpe1;
+	};
 
-       chosen {
-               stdout-path = "serial0:115200n8";
-       };
+	chosen {
+		stdout-path = "serial0:115200n8";
+	};
 };
 
 &can0 {
-       status = "okay";
+	status = "okay";
 };
 
 &can1 {
-       status = "okay";
+	status = "okay";
 };
 
 &gmac0 {
-       phy-mode = "rgmii";
-       status = "okay";
+	phy-mode = "rgmii";
+	status = "okay";
 };
 
-&gpio0 {       /* GPIO  0 ... 28 */
-       status = "okay";
+&gpio0 {	/* GPIO  0 ... 28 */
+	status = "okay";
 };
 
-&gpio1 {       /* GPIO 29 ... 57 */
-       status = "okay";
+&gpio1 {	/* GPIO 29 ... 57 */
+	status = "okay";
 };
 
-&gpio2 {       /* GPIO 58..66 (HLGPI 0..13 at offset 13) */
-       status = "okay";
+&gpio2 {	/* GPIO 58..66 (HLGPI 0..13 at offset 13) */
+	status = "okay";
 };
 
 &i2c0 {
-       status = "okay";
-       speed-mode = <0>;
+	status = "okay";
+	speed-mode = <0>;
 
-       stmpe1: stmpe811@41 {
-               compatible = "st,stmpe811";
-               #address-cells = <1>;
-               #size-cells = <0>;
-               reg = <0x41>;
-               id = <0>;
-               blocks = <0x5>;
-               irq-gpio = <&portb 28 0x4>;     /* GPIO 57, trig. level HI */
+	stmpe1: stmpe811@41 {
+		compatible = "st,stmpe811";
+		#address-cells = <1>;
+		#size-cells = <0>;
+		reg = <0x41>;
+		id = <0>;
+		blocks = <0x5>;
+		irq-gpio = <&portb 28 0x4>;     /* GPIO 57, trig. level HI */
 
-               stmpe_touchscreen {
-                       compatible = "st,stmpe-ts";
-                       reg = <0>;
-                       ts,sample-time = <4>;
-                       ts,mod-12b = <1>;
-                       ts,ref-sel = <0>;
-                       ts,adc-freq = <1>;
-                       ts,ave-ctrl = <1>;
-                       ts,touch-det-delay = <3>;
-                       ts,settling = <4>;
-                       ts,fraction-z = <7>;
-                       ts,i-drive = <1>;
-               };
-       };
+		stmpe_touchscreen {
+			compatible = "st,stmpe-ts";
+			reg = <0>;
+			ts,sample-time = <4>;
+			ts,mod-12b = <1>;
+			ts,ref-sel = <0>;
+			ts,adc-freq = <1>;
+			ts,ave-ctrl = <1>;
+			ts,touch-det-delay = <3>;
+			ts,settling = <4>;
+			ts,fraction-z = <7>;
+			ts,i-drive = <1>;
+		};
+	};
 };
 
 &uart0 {
-       status = "okay";
+	status = "okay";
 };
 
 &usb1 {
-       status = "okay";
+	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 {