From 05d69b12d1bec3c2a35181a380e5b100cbd53254 Mon Sep 17 00:00:00 2001
From: Dmitry Osipenko <dmitry.osipenko@collabora.com>
Date: Sun, 11 Feb 2024 21:51:13 +0300
Subject: [PATCH] rk3588-rock-5b.dts cleanup

---
 arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
index 6241273084fb0..c03b0abe98bfa 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
@@ -52,18 +52,17 @@ led_rgb_b {
 		};
 	};
 
-	/* If hdmirx node is disabled, delete the reserved-memory node here. */
 	reserved-memory {
 		#address-cells = <2>;
 		#size-cells = <2>;
 		ranges;
 
-		/* Reserve 256MB memory for hdmirx-controller@fdee0000 */
-		cma {
+		/* 4k HDMI capture controller */
+		hdmirx_cma: hdmirx,cma {
 			compatible = "shared-dma-pool";
-			reusable;
-			reg = <0x0 (256 * 0x100000) 0x0 (256 * 0x100000)>;
-			linux,cma-default;
+			alloc-ranges = <0x0 0x0 0x0 0xffffffff>;
+			size = <0x0 (160 * 0x100000)>; /* 160MiB */
+			no-map;
 		};
 	};
 
@@ -233,6 +232,7 @@ &hdmirx_ctrler {
 	hdmirx-5v-detection-gpios = <&gpio1 RK_PC6 GPIO_ACTIVE_LOW>;
 	pinctrl-0 = <&hdmim1_rx_cec &hdmim1_rx_hpdin &hdmim1_rx_scl &hdmim1_rx_sda &hdmirx_5v_detection>;
 	pinctrl-names = "default";
+	memory-region = <&hdmirx_cma>;
 };
 
 &i2c0 {
-- 
GitLab