Merge pull request #2451 from armbian/rockchip64-cleaning

[ rockchip64 ] Clean up patchset

patch/kernel/rockchip64-current/board-rockpi4-0001-arm64-dts-audio-over-hdmi.patch

@@ -10,13 +10,13 @@ Fixes: 1b5715c602fda ("arm64: dts: rockchip: add ROCK Pi 4 DTS support")
 Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
 Signed-off-by: Heiko Stuebner <heiko@sntech.de>
 ---
- arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts | 4 ++++
+ arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi | 4 ++++
  1 file changed, 4 insertions(+)
 
-diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts
+diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
 index 55e74f4d5cd0f..1ae1ebd4efdd0 100644
---- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts
-+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts
+--- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
++++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
 @@ -178,6 +178,10 @@
  	status = "okay";
  };

patch/kernel/rockchip64-current/board-rockpi4-0002-arm64-dts-leds.patch

@@ -6,10 +6,10 @@ It could possibly be made controllable by its gpio with the help
 of soldering iron, steady hands, patience (SMD0402) and additional overlay
 to enable the led and its gpio pin in device tree.
 
-diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts
+diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
 index e03062715..a97e02bc0 100644
---- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts
-+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts
+--- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
++++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
 @@ -111,6 +111,25 @@
  		regulator-max-microvolt = <1400000>;
  		vin-supply = <&vcc5v0_sys>;

patch/kernel/rockchip64-current/board-rockpi4-0003-arm64-dts-pcie.patch

@@ -1,7 +1,7 @@
-diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts
+diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
 index 1ae1ebd4e..2f84397d5 100644
---- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts
-+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts
+--- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
++++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
 @@ -62,6 +62,8 @@
  		regulator-name = "vcc3v3_pcie";
  		regulator-always-on;

patch/kernel/rockchip64-current/board-rockpi4-0004-arm64-dts-upper-port-host.patch

@@ -0,0 +1,12 @@
+--- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi	2019-12-28 20:11:18.831388678 +0200
++++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi	2019-12-28 20:11:33.335365912 +0200
+@@ -735,7 +735,7 @@
+ 
+ &usbdrd_dwc3_0 {
+ 	status = "okay";
+-	dr_mode = "otg";
++	dr_mode = "host";
+ };
+ 
+ &usbdrd3_1 {
+

patch/kernel/rockchip64-current/board-rockpi4-0005-arm64-dts-enable-es8316-audio.patch

@@ -1,5 +1,5 @@
---- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts	2020-04-08 11:27:04.486670792 +0000
-+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts	2020-04-10 19:59:01.945704455 +0000
+--- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi	2020-04-08 11:27:04.486670792 +0000
++++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi	2020-04-10 19:59:01.945704455 +0000
 @@ -34,6 +34,12 @@
  		reset-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_LOW>;
  	};

patch/kernel/rockchip64-current/rockpi4-0004-arm64-dts-upper-port-host.patch

@@ -1,12 +0,0 @@
---- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts	2019-12-28 20:11:18.831388678 +0200
-+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts	2019-12-28 20:11:33.335365912 +0200
-@@ -735,7 +735,7 @@
- 
- &usbdrd_dwc3_0 {
- 	status = "okay";
--	dr_mode = "otg";
-+	dr_mode = "host";
- };
- 
- &usbdrd3_1 {
-