ipq806x: ap148: reorganize dts

Reorganize dts to use tags from ipq8064 dtsi

Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>

target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ap148.dts

@@ -29,21 +29,42 @@
 	};
 
 	soc {
-		pinmux@800000 {
+		mdio0: mdio {
+			compatible = "virtual,mdio-gpio";
+			#address-cells = <1>;
+			#size-cells = <0>;
+			gpios = <&qcom_pinmux 1 GPIO_ACTIVE_HIGH>,
+				<&qcom_pinmux 0 GPIO_ACTIVE_HIGH>;
+			pinctrl-0 = <&mdio0_pins>;
+			pinctrl-names = "default";
+
+			phy0: ethernet-phy@0 {
+				reg = <0>;
+				qca,ar8327-initvals = <
+					0x00004 0x7600000   /* PAD0_MODE */
+					0x00008 0x1000000   /* PAD5_MODE */
+					0x0000c 0x80        /* PAD6_MODE */
+					0x000e4 0x6a545     /* MAC_POWER_SEL */
+					0x000e0 0xc74164de  /* SGMII_CTRL */
+					0x0007c 0x4e        /* PORT0_STATUS */
+					0x00094 0x4e        /* PORT6_STATUS */
+					>;
+			};
+
+			phy4: ethernet-phy@4 {
+				reg = <4>;
+			};
+		};
+	};
+};
+
+&qcom_pinmux {
 	i2c4_pins: i2c4_pinmux {
 		pins = "gpio12", "gpio13";
 		function = "gsbi4";
 		bias-disable;
 	};
 
-			spi_pins: spi_pins {
-				mux {
-					pins = "gpio18", "gpio19", "gpio21";
-					function = "gsbi5";
-					drive-strength = <10>;
-					bias-none;
-				};
-			};
 	nand_pins: nand_pins {
 		mux {
 			pins = "gpio34", "gpio35", "gpio36",
@@ -87,9 +108,14 @@
 	};
 };
 
-		gsbi@16300000 {
+&adm_dma {
+	status = "okay";
+};
+
+&gsbi4 {
 	qcom,mode = <GSBI_PROT_I2C_UART>;
 	status = "okay";
+
 	serial@16340000 {
 		status = "okay";
 	};
@@ -102,7 +128,7 @@
 	*/
 };
 
-		gsbi5: gsbi@1a200000 {
+&gsbi5 {
 	qcom,mode = <GSBI_PROT_SPI>;
 	status = "okay";
 
@@ -129,32 +155,24 @@
 	};
 };
 
-		sata-phy@1b400000 {
+&usb3_0 {
 	status = "okay";
 };
 
-		sata@29000000 {
+&usb3_1 {
 	status = "okay";
 };
 
-		usb3_0: usb3@110f8800 {
+&pcie0 {
 	status = "okay";
 };
 
-		usb3_1: usb3@100f8800 {
-			status = "okay";
-		};
-
-		pcie0: pci@1b500000 {
-			status = "okay";
-		};
-
-		pcie1: pci@1b700000 {
+&pcie1 {
 	status = "okay";
 	force_gen1 = <1>;
 };
 
-		nand@1ac00000 {
+&nand {
 	status = "okay";
 
 	pinctrl-0 = <&nand_pins>;
@@ -174,33 +192,7 @@
 	};
 };
 
-		mdio0: mdio {
-			compatible = "virtual,mdio-gpio";
-			#address-cells = <1>;
-			#size-cells = <0>;
-			gpios = <&qcom_pinmux 1 0 &qcom_pinmux 0 0>;
-			pinctrl-0 = <&mdio0_pins>;
-			pinctrl-names = "default";
-
-			phy0: ethernet-phy@0 {
-				reg = <0>;
-				qca,ar8327-initvals = <
-					0x00004 0x7600000   /* PAD0_MODE */
-					0x00008 0x1000000   /* PAD5_MODE */
-					0x0000c 0x80        /* PAD6_MODE */
-					0x000e4 0x6a545     /* MAC_POWER_SEL */
-					0x000e0 0xc74164de  /* SGMII_CTRL */
-					0x0007c 0x4e        /* PORT0_STATUS */
-					0x00094 0x4e        /* PORT6_STATUS */
-					>;
-			};
-
-			phy4: ethernet-phy@4 {
-				reg = <4>;
-			};
-		};
-
-		gmac1: ethernet@37200000 {
+&gmac1 {
 	status = "okay";
 	phy-mode = "rgmii";
 	qcom,id = <1>;
@@ -214,7 +206,7 @@
 	};
 };
 
-		gmac2: ethernet@37400000 {
+&gmac2 {
 	status = "okay";
 	phy-mode = "sgmii";
 	qcom,id = <2>;
@@ -224,9 +216,11 @@
 		full-duplex;
 	};
 };
-	};
+
+&sata_phy {
+	status = "okay";
 };
 
-&adm_dma {
+&sata {
 	status = "okay";
 };