From 52a3c97e1d489df9405a0ba56c3cf3d55373a274 Mon Sep 17 00:00:00 2001
From: Zhou weixin <zwx@rock-chips.com>
Date: Mon, 5 Feb 2018 16:03:21 +0800
Subject: [PATCH] arm64: dts: rockchip: remove duplicate and reorder nodes for
 px30

Change-Id: I36bd28ad6859f19a59de627f8b81acf5dc3fd27c
Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
---
 .../boot/dts/rockchip/px30-evb-ddr4-v10.dts   | 88 ++++++++-----------
 1 file changed, 36 insertions(+), 52 deletions(-)

diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr4-v10.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ddr4-v10.dts
index f156d5b0c86c..73521b1ed7cf 100644
--- a/arch/arm64/boot/dts/rockchip/px30-evb-ddr4-v10.dts
+++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr4-v10.dts
@@ -235,6 +235,34 @@
 	};
 };
 
+&dsi_in_vopl {
+	status = "disabled";
+};
+
+&emmc {
+	bus-width = <8>;
+	cap-mmc-highspeed;
+	mmc-hs200-1_8v;
+	supports-emmc;
+	disable-wp;
+	non-removable;
+	num-slots = <1>;
+	status = "okay";
+};
+
+&gmac {
+	phy-supply = <&vcc_phy>;
+	clock_in_out = "output";
+	snps,reset-gpio = <&gpio2 13 GPIO_ACTIVE_LOW>;
+	snps,reset-active-low;
+	snps,reset-delays-us = <0 50000 50000>;
+	status = "okay";
+};
+
+&gpu {
+	status = "okay";
+};
+
 &i2c0 {
 	rk809: pmic@20 {
 		compatible = "rockchip,rk809";
@@ -499,6 +527,14 @@
 		reprobe_en = <1>;
 	};
 
+	ts@40 {
+		status = "okay";
+		compatible = "GT1X";
+		reg = <0x14>;
+		irq_gpio_number = <&gpio0 RK_PA5 IRQ_TYPE_LEVEL_LOW>;
+		rst_gpio_number = <&gpio0 RK_PB4 GPIO_ACTIVE_HIGH>;
+	};
+
 	sensor@4c {
 		status = "okay";
 		compatible = "gs_mma7660";
@@ -521,58 +557,6 @@
 	vccio5-supply = <&vcc_3v0>;
 };
 
-&dsi_in_vopl {
-	status = "disabled";
-};
-
-&emmc {
-	bus-width = <8>;
-	cap-mmc-highspeed;
-	mmc-hs200-1_8v;
-	supports-emmc;
-	disable-wp;
-	non-removable;
-	num-slots = <1>;
-	status = "okay";
-};
-
-&gmac {
-	phy-supply = <&vcc_phy>;
-	clock_in_out = "output";
-	snps,reset-gpio = <&gpio2 13 GPIO_ACTIVE_LOW>;
-	snps,reset-active-low;
-	snps,reset-delays-us = <0 50000 50000>;
-	status = "okay";
-};
-
-&gpu {
-	status = "okay";
-};
-
-&i2c1 {
-	status = "okay";
-
-	ts@40 {
-		status = "okay";
-		compatible = "GT1X";
-		reg = <0x14>;
-		irq_gpio_number = <&gpio0 RK_PA5 IRQ_TYPE_LEVEL_LOW>;
-		rst_gpio_number = <&gpio0 RK_PB4 GPIO_ACTIVE_HIGH>;
-	};
-
-	sensor@4c {
-		status = "okay";
-		compatible = "gs_mma7660";
-		reg = <0x4c>;
-		type = <SENSOR_TYPE_ACCEL>;
-		irq-gpio = <&gpio0 RK_PB5 IRQ_TYPE_LEVEL_LOW>;
-		irq_enable = <0>;
-		poll_delay_ms = <30>;
-		layout = <6>;
-		reprobe_en = <1>;
-	};
-};
-
 &mipi_dphy {
 	status = "okay";
 };