From 1066a75c5f21c4f16b2b33b98fcd8497005459c7 Mon Sep 17 00:00:00 2001
From: Christoph Muellner <christoph.muellner@theobroma-systems.com>
Date: Wed, 26 Jun 2019 18:56:45 +0200
Subject: dts: puma-android: Cleanup DTS information.

This patch removes redundant information in the rk3399-puma-android.dts.

Signed-off-by: Christoph Muellner <christoph.muellner@theobroma-systems.com>
---
 .../boot/dts/rockchip/rk3399-puma-android.dts      | 66 ++++++----------------
 1 file changed, 18 insertions(+), 48 deletions(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-puma-android.dts b/arch/arm64/boot/dts/rockchip/rk3399-puma-android.dts
index e9ae441a3aea..9a217e9b1252 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-puma-android.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-puma-android.dts
@@ -228,10 +228,6 @@
 	cpu-supply = <&vdd_cpu_b>;
 };
 
-//&display_subsystem {
-//	status = "okay";
-//};
-
 &emmc_phy {
 	status = "okay";
 	drive-impedance-ohm = <33>;
@@ -253,21 +249,6 @@
 	status = "okay";
 };
 
-//XXX: ?
-&hdmi {
-	#address-cells = <1>;
-	#size-cells = <0>;
-	#sound-dai-cells = <0>;
-	status = "okay";
-};
-
-//XXX: ?
-&route_hdmi {
-	status = "okay";
-	// default in rk3399-linux.dtsi: connect = <&vopl_out_hdmi>;
-	connect = <&vopb_out_hdmi>;
-};
-
 &gpu {
 	status = "okay";
 	mali-supply = <&vdd_gpu>;
@@ -665,27 +646,6 @@
 	status = "okay";
 };
 
-//&rkvdec {
-//	status = "okay";
-//	/* 0 means ion, 1 means drm */
-//	//allocator = <0>;
-//};
-
-//&vopb {
-//	status = "okay";
-//};
-
-//&vopb_mmu {
-//	status = "okay";
-//};
-
-//&vpu {
-//	status = "okay";
-//	/* 0 means ion, 1 means drm */
-//	//allocator = <0>;
-//};
-
-
 &pinctrl {
 	// Pins that are not explicitely used by any devices
 	pinctrl-names = "default";
@@ -883,6 +843,17 @@
 
 
 
+&isp0_mmu {
+	status = "okay";
+};
+
+&isp1_mmu {
+	status = "okay";
+};
+
+&hdmi_in_vopl {
+	status = "okay";
+};
 
 &edp_in_vopl {
 	status = "disabled";
@@ -904,14 +875,6 @@
 	status = "disabled";
 };
 
-&isp0_mmu {
-	status = "okay";
-};
-
-&isp1_mmu {
-	status = "okay";
-};
-
 &vopb {
 	assigned-clocks = <&cru DCLK_VOP0_DIV>;
 	assigned-clock-parents = <&cru PLL_CPLL>;
@@ -924,11 +887,18 @@
 
 &route_hdmi {
 	status = "okay";
+	connect = <&vopl_out_hdmi>;
 };
 
 &firmware_android {
 	compatible = "android,firmware";
 	boot_devices = "fe330000.sdhci";
+/*
+	vbmeta {
+		compatible = "android,vbmeta";
+		parts = "vbmeta,boot,system,vendor,dtbo";
+	};
+*/
 	fstab {
 		compatible = "android,fstab";
 		vendor {
-- 
cgit v1.2.3