From 2f7fe7a5cc82debae55edc88c5f4bda0f22d986c Mon Sep 17 00:00:00 2001
From: Damon Ding <damon.ding@rock-chips.com>
Date: Wed, 25 Sep 2024 11:33:17 +0800
Subject: [PATCH] ARM: dts: rockchip: rk3506g-evb1: enable
 rockchip,vbus-always-on for bt1120/bt656/mcu/rgb display board

The GPIO1_C5 is multiplexed by VO_LCDC_D6, which needed by
bt1120/bt656/mcu/rgb, and USB20_OTG0_VBUSDET.

Enabling rockchip,vbus-always-on can make ADB work well without
the vbus detection pin.

Change-Id: I7fa705436cf8a1e41f0f61f4941c24f3d9f433b0
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
---
 arch/arm/boot/dts/rk3506g-evb1-v10-mcu-k350c4516t.dts         | 4 ++++
 arch/arm/boot/dts/rk3506g-evb1-v10-rgb-Q7050ITH2641AA1T.dts   | 4 ++++
 arch/arm/boot/dts/rk3506g-evb1-v10-sii9022-bt1120-to-hdmi.dts | 4 ++++
 arch/arm/boot/dts/rk3506g-evb1-v10-sii9022-rgb2hdmi.dts       | 4 ++++
 4 files changed, 16 insertions(+)

diff --git a/arch/arm/boot/dts/rk3506g-evb1-v10-mcu-k350c4516t.dts b/arch/arm/boot/dts/rk3506g-evb1-v10-mcu-k350c4516t.dts
index a2812db1820a..13b444b640b5 100644
--- a/arch/arm/boot/dts/rk3506g-evb1-v10-mcu-k350c4516t.dts
+++ b/arch/arm/boot/dts/rk3506g-evb1-v10-mcu-k350c4516t.dts
@@ -218,6 +218,10 @@
 	status = "okay";
 };
 
+&u2phy_otg0 {
+	rockchip,vbus-always-on;
+};
+
 &vop {
 	mcu-timing {
 		mcu-pix-total = <6>;
diff --git a/arch/arm/boot/dts/rk3506g-evb1-v10-rgb-Q7050ITH2641AA1T.dts b/arch/arm/boot/dts/rk3506g-evb1-v10-rgb-Q7050ITH2641AA1T.dts
index cc845d6ed39f..8a98e6a8ef5f 100644
--- a/arch/arm/boot/dts/rk3506g-evb1-v10-rgb-Q7050ITH2641AA1T.dts
+++ b/arch/arm/boot/dts/rk3506g-evb1-v10-rgb-Q7050ITH2641AA1T.dts
@@ -82,3 +82,7 @@
 &route_rgb {
 	status = "okay";
 };
+
+&u2phy_otg0 {
+	rockchip,vbus-always-on;
+};
diff --git a/arch/arm/boot/dts/rk3506g-evb1-v10-sii9022-bt1120-to-hdmi.dts b/arch/arm/boot/dts/rk3506g-evb1-v10-sii9022-bt1120-to-hdmi.dts
index 4a30d24c21c9..d0a2ac0a27e6 100644
--- a/arch/arm/boot/dts/rk3506g-evb1-v10-sii9022-bt1120-to-hdmi.dts
+++ b/arch/arm/boot/dts/rk3506g-evb1-v10-sii9022-bt1120-to-hdmi.dts
@@ -93,3 +93,7 @@
 &route_rgb {
 	status = "okay";
 };
+
+&u2phy_otg0 {
+	rockchip,vbus-always-on;
+};
diff --git a/arch/arm/boot/dts/rk3506g-evb1-v10-sii9022-rgb2hdmi.dts b/arch/arm/boot/dts/rk3506g-evb1-v10-sii9022-rgb2hdmi.dts
index f78f90ea7c89..b2969c1987e5 100644
--- a/arch/arm/boot/dts/rk3506g-evb1-v10-sii9022-rgb2hdmi.dts
+++ b/arch/arm/boot/dts/rk3506g-evb1-v10-sii9022-rgb2hdmi.dts
@@ -84,3 +84,7 @@
 &route_rgb {
 	status = "okay";
 };
+
+&u2phy_otg0 {
+	rockchip,vbus-always-on;
+};