From 1d5b6faacf5d82104a5977b77cc086d6b0531b6e Mon Sep 17 00:00:00 2001 From: QiuSimons <45143996+QiuSimons@users.noreply.github.com> Date: Mon, 22 Aug 2022 15:15:09 +0800 Subject: [PATCH] cleanup: Remove upstreamed patch (#9982) --- ...ip-enable-vop2-and-hdmi-tx-on-rock-3.patch | 93 ------------------- 1 file changed, 93 deletions(-) delete mode 100644 target/linux/rockchip/patches-5.19/0011-arm64-dts-rockchip-enable-vop2-and-hdmi-tx-on-rock-3.patch diff --git a/target/linux/rockchip/patches-5.19/0011-arm64-dts-rockchip-enable-vop2-and-hdmi-tx-on-rock-3.patch b/target/linux/rockchip/patches-5.19/0011-arm64-dts-rockchip-enable-vop2-and-hdmi-tx-on-rock-3.patch deleted file mode 100644 index 2b7a68090..000000000 --- a/target/linux/rockchip/patches-5.19/0011-arm64-dts-rockchip-enable-vop2-and-hdmi-tx-on-rock-3.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 284f0150efd541d60156bcfea1d575b24d320cc3 Mon Sep 17 00:00:00 2001 -From: Michael Riesch -Date: Fri, 22 Apr 2022 09:28:37 +0200 -Subject: [PATCH 11/51] arm64: dts: rockchip: enable vop2 and hdmi tx on - rock-3a - -Enable the RK356x Video Output Processor (VOP) 2 on the Radxa -ROCK3 Model A. - -Signed-off-by: Michael Riesch -Reported-by: kernel test robot -Link: https://lore.kernel.org/r/20220310210352.451136-4-michael.riesch@wolfvision.net -Signed-off-by: Sascha Hauer -Link: https://lore.kernel.org/r/20220422072841.2206452-21-s.hauer@pengutronix.de -Signed-off-by: Heiko Stuebner ---- - .../boot/dts/rockchip/rk3568-rock-3a.dts | 47 +++++++++++++++++++ - 1 file changed, 47 insertions(+) - ---- a/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts -+++ b/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts -@@ -4,6 +4,7 @@ - #include - #include - #include -+#include - #include "rk3568.dtsi" - - / { -@@ -20,6 +21,17 @@ - stdout-path = "serial2:1500000n8"; - }; - -+ hdmi-con { -+ compatible = "hdmi-connector"; -+ type = "a"; -+ -+ port { -+ hdmi_con_in: endpoint { -+ remote-endpoint = <&hdmi_out_con>; -+ }; -+ }; -+ }; -+ - leds { - compatible = "gpio-leds"; - -@@ -166,6 +178,24 @@ - status = "okay"; - }; - -+&hdmi { -+ avdd-0v9-supply = <&vdda0v9_image>; -+ avdd-1v8-supply = <&vcca1v8_image>; -+ status = "okay"; -+}; -+ -+&hdmi_in { -+ hdmi_in_vp0: endpoint { -+ remote-endpoint = <&vp0_out_hdmi>; -+ }; -+}; -+ -+&hdmi_out { -+ hdmi_out_con: endpoint { -+ remote-endpoint = <&hdmi_con_in>; -+ }; -+}; -+ - &i2c0 { - status = "okay"; - -@@ -560,3 +590,20 @@ - phy-supply = <&vcc5v0_usb_host>; - status = "okay"; - }; -+ -+&vop { -+ assigned-clocks = <&cru DCLK_VOP0>, <&cru DCLK_VOP1>; -+ assigned-clock-parents = <&pmucru PLL_HPLL>, <&cru PLL_VPLL>; -+ status = "okay"; -+}; -+ -+&vop_mmu { -+ status = "okay"; -+}; -+ -+&vp0 { -+ vp0_out_hdmi: endpoint@ROCKCHIP_VOP2_EP_HDMI0 { -+ reg = ; -+ remote-endpoint = <&hdmi_in_vp0>; -+ }; -+};