summaryrefslogtreecommitdiff
path: root/arch/arm64
diff options
context:
space:
mode:
authorTao Huang <huangtao@rock-chips.com>2019-03-05 14:46:25 +0800
committerTao Huang <huangtao@rock-chips.com>2019-03-05 14:48:00 +0800
commit43dbf7220cd9755a05e8cd5191a2db464847d9b2 (patch)
treee05fe338fb84a4f355f086b11513795c98da9774 /arch/arm64
parent55a2b35ff5fac104d7ae0e348edb437ed4043375 (diff)
arm64: dts: rockchip: disable uart2 for rk3399 board
Change-Id: I0934141d4a943f9bd21f74652c78a4e2eefc1e57 Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com> Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Diffstat (limited to 'arch/arm64')
-rw-r--r--arch/arm64/boot/dts/rockchip/rk3399-android-6.0.dtsi4
-rw-r--r--arch/arm64/boot/dts/rockchip/rk3399-box-808-android-6.0.dts4
-rw-r--r--arch/arm64/boot/dts/rockchip/rk3399-box-android-6.0.dtsi4
-rw-r--r--arch/arm64/boot/dts/rockchip/rk3399-box.dtsi4
-rw-r--r--arch/arm64/boot/dts/rockchip/rk3399-disvr-android.dts4
-rw-r--r--arch/arm64/boot/dts/rockchip/rk3399-firefly-android.dts4
-rw-r--r--arch/arm64/boot/dts/rockchip/rk3399-firefly-linux.dts4
-rw-r--r--arch/arm64/boot/dts/rockchip/rk3399-mid-818-android-6.0.dts4
-rw-r--r--arch/arm64/boot/dts/rockchip/rk3399-mid-818-android.dts4
-rw-r--r--arch/arm64/boot/dts/rockchip/rk3399-rv1-android.dts4
-rw-r--r--arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux-for-rk1808-cascade.dts4
-rw-r--r--arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux.dts4
-rw-r--r--arch/arm64/boot/dts/rockchip/rk3399-tve1030g.dtsi4
-rw-r--r--arch/arm64/boot/dts/rockchip/rk3399-tve1205g.dts4
-rw-r--r--arch/arm64/boot/dts/rockchip/rk3399-videostrong-linux.dts4
-rw-r--r--arch/arm64/boot/dts/rockchip/rk3399-vr-android.dts4
16 files changed, 16 insertions, 48 deletions
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-android-6.0.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-android-6.0.dtsi
index 54b7cabf201b..b4bc44104444 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-android-6.0.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-android-6.0.dtsi
@@ -473,6 +473,10 @@
};
};
+&uart2 {
+ status = "disabled";
+};
+
&vpu {
status = "okay";
/delete-property/ iommus;
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-box-808-android-6.0.dts b/arch/arm64/boot/dts/rockchip/rk3399-box-808-android-6.0.dts
index 6fb4a4f2a416..eed6f3ddb19a 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-box-808-android-6.0.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-box-808-android-6.0.dts
@@ -573,10 +573,6 @@
status = "okay";
};
-&uart2 {
- status = "okay";
-};
-
&usb_host0_ehci {
status = "okay";
};
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-box-android-6.0.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-box-android-6.0.dtsi
index 7caf7a730b39..738a0c67dffa 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-box-android-6.0.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-box-android-6.0.dtsi
@@ -595,10 +595,6 @@
status = "okay";
};
-&uart2 {
- status = "okay";
-};
-
&usb_host0_ehci {
status = "okay";
};
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-box.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-box.dtsi
index bd4066dd43a6..638ee131492b 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-box.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-box.dtsi
@@ -605,10 +605,6 @@
status = "okay";
};
-&uart2 {
- status = "okay";
-};
-
&usb_host0_ehci {
status = "okay";
};
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-disvr-android.dts b/arch/arm64/boot/dts/rockchip/rk3399-disvr-android.dts
index 3d6e9e9215c0..d7f884391f3d 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-disvr-android.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-disvr-android.dts
@@ -680,10 +680,6 @@
status = "okay";
};
-&uart2 {
- status = "okay";
-};
-
&usb_host0_ehci {
status = "okay";
};
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-firefly-android.dts b/arch/arm64/boot/dts/rockchip/rk3399-firefly-android.dts
index d453bac6fe5c..d2cf639c5b2a 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-firefly-android.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-firefly-android.dts
@@ -1051,10 +1051,6 @@
status = "okay";
};
-&uart2 {
- status = "okay";
-};
-
&usbdrd3_0 {
status = "okay";
extcon = <&fusb0>;
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-firefly-linux.dts b/arch/arm64/boot/dts/rockchip/rk3399-firefly-linux.dts
index 82bb2a63fe73..a2c13ca55b91 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-firefly-linux.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-firefly-linux.dts
@@ -1022,10 +1022,6 @@
status = "okay";
};
-&uart2 {
- status = "okay";
-};
-
&usbdrd3_0 {
status = "okay";
extcon = <&fusb0>;
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android-6.0.dts b/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android-6.0.dts
index 8e174cb73394..4b8877e69e5d 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android-6.0.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android-6.0.dts
@@ -842,10 +842,6 @@
status = "okay";
};
-&uart2 {
- status = "okay";
-};
-
&usb_host0_ehci {
status = "okay";
};
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android.dts b/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android.dts
index 139b1b31fa81..4f510ac6baf0 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android.dts
@@ -892,10 +892,6 @@
status = "okay";
};
-&uart2 {
- status = "okay";
-};
-
&usb_host0_ehci {
status = "okay";
};
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rv1-android.dts b/arch/arm64/boot/dts/rockchip/rk3399-rv1-android.dts
index 5763c4931835..252ee51c3b83 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-rv1-android.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rv1-android.dts
@@ -577,10 +577,6 @@
status = "okay";
};
-&uart2 {
- status = "okay";
-};
-
&usbdrd3_0 {
extcon = <&fusb0>;
status = "okay";
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux-for-rk1808-cascade.dts b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux-for-rk1808-cascade.dts
index 9a2a67364418..d482f2d64b78 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux-for-rk1808-cascade.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux-for-rk1808-cascade.dts
@@ -462,6 +462,10 @@
};
};
+&uart2 {
+ status = "disabled";
+};
+
&vopb {
status = "okay";
};
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux.dts b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux.dts
index c366aaeb0c24..03b216c0fb0c 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux.dts
@@ -420,6 +420,10 @@
status = "okay";
};
+&uart2 {
+ status = "disabled";
+};
+
&vopb {
status = "okay";
};
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-tve1030g.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-tve1030g.dtsi
index 7005f22f7edf..662372f12fc5 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-tve1030g.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-tve1030g.dtsi
@@ -942,10 +942,6 @@
status = "okay";
};
-&uart2 {
- status = "okay";
-};
-
&usb_host0_ehci {
status = "okay";
};
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-tve1205g.dts b/arch/arm64/boot/dts/rockchip/rk3399-tve1205g.dts
index 9239bc4f2aac..a1d9721fc34b 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-tve1205g.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-tve1205g.dts
@@ -1005,10 +1005,6 @@
status = "okay";
};
-&uart2 {
- status = "okay";
-};
-
&usb_host0_ehci {
status = "okay";
};
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-videostrong-linux.dts b/arch/arm64/boot/dts/rockchip/rk3399-videostrong-linux.dts
index 0d0bad8561cf..2d3ee2fb78db 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-videostrong-linux.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-videostrong-linux.dts
@@ -254,6 +254,10 @@
status = "okay";
};
+&uart2 {
+ status = "disabled";
+};
+
&vpu {
status = "okay";
/* 0 means ion, 1 means drm */
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-vr-android.dts b/arch/arm64/boot/dts/rockchip/rk3399-vr-android.dts
index 6a84991d1e34..acc3e94af588 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-vr-android.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-vr-android.dts
@@ -763,10 +763,6 @@
status = "okay";
};
-&uart2 {
- status = "okay";
-};
-
&usb_host0_ehci {
status = "okay";
};