From ddc9d56cc73dafead8cbbb4b4ee153c1da24ef6d Mon Sep 17 00:00:00 2001
From: Caesar Wang <wxt@rock-chips.com>
Date: Thu, 21 Jul 2022 11:16:21 +0800
Subject: [PATCH] arm64: dts: rockchip: update rk3399-evb-ind-lpddr4-linux.dts

1) add hub_reset signal for V14 boards

As the previous version boards, USB3.0 hub has stability problems.
In order to solve this issue, The reset pin of USB3.0 hub is controlled
by GPIO and reset USB3.0 hub through software on v14 board.

2) fix the order for hdmi_sound

3) enable i2s1

The i2s1 is used by rk809 codec.

Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Change-Id: I2a1ccba30705f83884b8284d418dd0cb6cb481fc
---
 .../rockchip/rk3399-evb-ind-lpddr4-linux.dts  | 45 ++++++++++++++++---
 1 file changed, 40 insertions(+), 5 deletions(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-linux.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-linux.dts
index 5b6b7131fdd1..6589bb6853f2 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-linux.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-linux.dts
@@ -17,6 +17,17 @@
 		reg = <0x0 0xff8d0000 0x0 0x20000>;
 	};
 
+	hub_reset: hub-reset {
+		compatible = "regulator-fixed";
+		enable-active-high;
+		gpio = <&gpio4 18 GPIO_ACTIVE_HIGH>;
+		regulator-name = "hub_reset";
+		regulator-always-on;
+		regulator-boot-on;
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+	};
+
 	vcc_lcd: vcc-lcd {
 		compatible = "regulator-fixed";
 		regulator-name = "vcc_lcd";
@@ -117,6 +128,10 @@
 	status = "disabled";
 };
 
+&hdmi_sound {
+	status = "okay";
+};
+
 &i2c1 {
 	status = "okay";
 
@@ -163,7 +178,7 @@
 
 &i2s1 {
 	#sound-dai-cells = <0>;
-	status = "disabled";
+	status = "okay";
 };
 
 &i2s2 {
@@ -171,10 +186,6 @@
 	status = "okay";
 };
 
-&hdmi_sound {
-	status = "okay";
-};
-
 &mipi_dphy_rx0 {
 	status = "okay";
 
@@ -291,6 +302,30 @@
 	status = "disabled";
 };
 
+&vcca_0v9 {
+	regulator-always-on;
+	regulator-boot-on;
+	regulator-min-microvolt = <900000>;
+	regulator-max-microvolt = <900000>;
+	regulator-name = "vcca_0v9";
+	regulator-state-mem {
+		regulator-on-in-suspend;
+		regulator-suspend-microvolt = <900000>;
+	};
+};
+
+&vcc0v9_soc {
+	regulator-always-on;
+	regulator-boot-on;
+	regulator-min-microvolt = <900000>;
+	regulator-max-microvolt = <900000>;
+
+	regulator-name = "vcc0v9_soc";
+	regulator-state-mem {
+		regulator-off-in-suspend;
+	};
+};
+
 &vopb {
 	status = "okay";
 };