From fa74eb67804c5e75a2c1171489d589253c70ad01 Mon Sep 17 00:00:00 2001 From: Tao Huang Date: Wed, 2 Mar 2022 18:59:38 +0800 Subject: [PATCH] Revert "ARM: dts: rockchip: add venc_grf node for rv1106" This reverts commit 48c78936e0656fae21e383096fa7194c23372ebc. The next patch, grf will include venc_grf. Signed-off-by: Tao Huang Change-Id: Iaaf2f1067adbaa21fcfc3d0cfd59cd10390a5daf --- arch/arm/boot/dts/rv1106.dtsi | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/arch/arm/boot/dts/rv1106.dtsi b/arch/arm/boot/dts/rv1106.dtsi index 4dba24aa567a..0edd478b5050 100644 --- a/arch/arm/boot/dts/rv1106.dtsi +++ b/arch/arm/boot/dts/rv1106.dtsi @@ -97,13 +97,8 @@ }; peri_grf: syscon@ff000000 { - compatible = "rockchip,rv1106-peri-grf", "syscon"; + compatible = "rockchip,rv1106-peri-grf", "syscon", "simple-mfd"; reg = <0xff000000 0x1000>; - }; - - venc_grf: syscon@ff010000 { - compatible = "rockchip,rv1106-venc-grf", "syscon", "simple-mfd"; - reg = <0xff010000 0x1000>; rgb: rgb { compatible = "rockchip,rv1106-rgb";