From 71e6d08400e6615fe6af967d47298d9aa56fdc8e Mon Sep 17 00:00:00 2001
From: Tao Huang <huangtao@rock-chips.com>
Date: Tue, 23 Jan 2024 11:31:48 +0800
Subject: [PATCH] Revert "arm64: dts: rockchip: rk3568-evb6: add rk628
 rgb2hdmi"

This reverts commit 8dcec60e5c084c71fa2b668207c02eac3882b5cd.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I8e840a3b194e49afb3ae9cad656b73e1ab3ea998
---
 arch/arm64/boot/dts/rockchip/Makefile         |  1 -
 .../rk3568-evb6-ddr3-v10-rk628-rgb2hdmi.dts   | 96 -------------------
 2 files changed, 97 deletions(-)
 delete mode 100644 arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10-rk628-rgb2hdmi.dts

diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile
index 5e5f589aa695..d918ce874212 100644
--- a/arch/arm64/boot/dts/rockchip/Makefile
+++ b/arch/arm64/boot/dts/rockchip/Makefile
@@ -170,7 +170,6 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-evb6-ddr3-v10.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-evb6-ddr3-v10-linux.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-evb6-ddr3-v10-rk628-bt1120-to-hdmi.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-evb6-ddr3-v10-rk628-rgb2dsi.dtb
-dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-evb6-ddr3-v10-rk628-rgb2hdmi.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-evb6-ddr3-v10-rk628-rgb2lvds.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-evb6-ddr3-v10-rk630-bt656-to-cvbs.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-evb7-ddr4-v10.dtb
diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10-rk628-rgb2hdmi.dts b/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10-rk628-rgb2hdmi.dts
deleted file mode 100644
index a4759f1ba85e..000000000000
--- a/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10-rk628-rgb2hdmi.dts
+++ /dev/null
@@ -1,96 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-/*
- * Copyright (c) 2020 Rockchip Electronics Co., Ltd.
- */
-
-#include "rk3568-evb6-ddr3-v10.dtsi"
-#include "rk3568-android.dtsi"
-
-&dsi0 {
-	status = "disabled";
-};
-
-&i2c3 {
-	clock-frequency = <400000>;
-	status = "okay";
-
-	rk628: rk628@50 {
-		reg = <0x50>;
-		interrupt-parent = <&gpio0>;
-		interrupts = <RK_PA0 IRQ_TYPE_LEVEL_HIGH>;
-		enable-gpios = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>;
-		reset-gpios = <&gpio0 RK_PB7 GPIO_ACTIVE_LOW>;
-		status = "okay";
-	};
-};
-
-#include <arm/rk628.dtsi>
-
-&rk628_hdmi {
-	status = "okay";
-
-	ports {
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		port@0 {
-			reg = <0>;
-
-			hdmi_in_post_process: endpoint {
-				remote-endpoint = <&post_process_out_hdmi>;
-			};
-		};
-	};
-};
-
-&rk628_post_process {
-	pinctrl-names = "default";
-	pinctrl-0 = <&rk628_vop_pins>;
-	status = "okay";
-
-	mode-sync-pol = <0>;
-	ports {
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		port@0 {
-			reg = <0>;
-
-			post_process_in_rgb: endpoint {
-				remote-endpoint = <&rgb_out_post_process>;
-			};
-		};
-
-		port@1 {
-			reg = <1>;
-
-			post_process_out_hdmi: endpoint {
-				remote-endpoint = <&hdmi_in_post_process>;
-			};
-		};
-	};
-};
-
-&rgb {
-	status = "okay";
-
-	ports {
-		port@1 {
-			reg = <1>;
-
-			rgb_out_post_process: endpoint {
-				remote-endpoint = <&post_process_in_rgb>;
-			};
-		};
-	};
-};
-
-&rgb_in_vp2 {
-	status = "okay";
-};
-
-&vcc3v3_lcd1_n {
-	status = "disabled";
-	gpio = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>;
-	enable-active-high;
-};