arm: dts: da850: Re-sync da850-evm.dts from Linux 4.18

Signed-off-by: Adam Ford <aford173@gmail.com>

arch/arm/dts/da850-evm.dts

@@ -15,8 +15,55 @@
 	compatible = "ti,da850-evm", "ti,da850";
 	model = "DA850/AM1808/OMAP-L138 EVM";
 
-	soc@1c00000 {
-		pmx_core: pinmux@14120 {
+	chosen {
+		stdout-path = &serial2;
+	};
+
+	aliases {
+		serial0 = &serial0;
+		serial1 = &serial1;
+		serial2 = &serial2;
+		ethernet0 = &eth0;
+		spi0 = &spi1;
+	};
+
+	vbat: fixedregulator0 {
+		compatible = "regulator-fixed";
+		regulator-name = "vbat";
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		regulator-boot-on;
+	};
+
+	sound {
+		compatible = "simple-audio-card";
+		simple-audio-card,name = "DA850/OMAP-L138 EVM";
+		simple-audio-card,widgets =
+			"Line", "Line In",
+			"Line", "Line Out";
+		simple-audio-card,routing =
+			"LINE1L", "Line In",
+			"LINE1R", "Line In",
+			"Line Out", "LLOUT",
+			"Line Out", "RLOUT";
+		simple-audio-card,format = "dsp_b";
+		simple-audio-card,bitclock-master = <&link0_codec>;
+		simple-audio-card,frame-master = <&link0_codec>;
+		simple-audio-card,bitclock-inversion;
+
+		simple-audio-card,cpu {
+			sound-dai = <&mcasp0>;
+			system-clock-frequency = <24576000>;
+		};
+
+		link0_codec: simple-audio-card,codec {
+			sound-dai = <&tlv320aic3106>;
+			system-clock-frequency = <24576000>;
+		};
+	};
+};
+
+&pmx_core {
 	status = "okay";
 
 	mcasp0_pins: pinmux_mcasp0_pins {
@@ -45,19 +92,24 @@
 		>;
 	};
 };
-		serial0: serial@42000 {
+
+&serial0 {
 	status = "okay";
 };
-		serial1: serial@10c000 {
+
+&serial1 {
 	status = "okay";
 };
-		serial2: serial@10d000 {
+
+&serial2 {
 	status = "okay";
 };
-		rtc0: rtc@23000 {
+
+&rtc0 {
 	status = "okay";
 };
-		i2c0: i2c@22000 {
+
+&i2c0 {
 	status = "okay";
 	clock-frequency = <100000>;
 	pinctrl-names = "default";
@@ -86,17 +138,22 @@
 		#gpio-cells = <2>;
 	};
 };
-		wdt: wdt@21000 {
+
+&wdt {
 	status = "okay";
 };
-		mmc0: mmc@40000 {
+
+&mmc0 {
 	max-frequency = <50000000>;
 	bus-width = <4>;
 	status = "okay";
 	pinctrl-names = "default";
 	pinctrl-0 = <&mmc0_pins>;
+	cd-gpios = <&gpio 64 GPIO_ACTIVE_LOW>;
+	wp-gpios = <&gpio 65 GPIO_ACTIVE_HIGH>;
 };
-		spi1: spi@30e000 {
+
+&spi1 {
 	status = "okay";
 	pinctrl-names = "default";
 	pinctrl-0 = <&spi1_pins &spi1_cs0_pin>;
@@ -137,55 +194,22 @@
 		};
 	};
 };
-		mdio: mdio@224000 {
+
+&mdio {
 	status = "okay";
 	pinctrl-names = "default";
 	pinctrl-0 = <&mdio_pins>;
 	bus_freq = <2200000>;
 };
-		eth0: ethernet@220000 {
+
+&eth0 {
 	status = "okay";
 	pinctrl-names = "default";
 	pinctrl-0 = <&mii_pins>;
 };
-		gpio: gpio@226000 {
-			status = "okay";
-		};
-	};
-	vbat: fixedregulator0 {
-		compatible = "regulator-fixed";
-		regulator-name = "vbat";
-		regulator-min-microvolt = <5000000>;
-		regulator-max-microvolt = <5000000>;
-		regulator-boot-on;
-	};
-
-	sound {
-		compatible = "simple-audio-card";
-		simple-audio-card,name = "DA850/OMAP-L138 EVM";
-		simple-audio-card,widgets =
-			"Line", "Line In",
-			"Line", "Line Out";
-		simple-audio-card,routing =
-			"LINE1L", "Line In",
-			"LINE1R", "Line In",
-			"Line Out", "LLOUT",
-			"Line Out", "RLOUT";
-		simple-audio-card,format = "dsp_b";
-		simple-audio-card,bitclock-master = <&link0_codec>;
-		simple-audio-card,frame-master = <&link0_codec>;
-		simple-audio-card,bitclock-inversion;
-
-		simple-audio-card,cpu {
-			sound-dai = <&mcasp0>;
-			system-clock-frequency = <24576000>;
-		};
 
-		link0_codec: simple-audio-card,codec {
-			sound-dai = <&tlv320aic3106>;
-			system-clock-frequency = <24576000>;
-		};
-	};
+&gpio {
+	status = "okay";
 };
 
 /include/ "tps6507x.dtsi"
@@ -297,6 +321,18 @@
 	};
 };
 
+&usb_phy {
+	status = "okay";
+};
+
+&usb0 {
+	status = "okay";
+};
+
+&usb1 {
+	status = "okay";
+};
+
 &vpif {
 	pinctrl-names = "default";
 	pinctrl-0 = <&vpif_capture_pins>, <&vpif_display_pins>;