dts: pinenote: remove rk_rga node

2024-10-09 22:59:08 +08:00 · 2024-10-09 22:59:08 +08:00 · 43775c97dd
commit 43775c97dd
parent fd0d75b067
1 changed files with 0 additions and 1 deletions
--- a/arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi
@ -322,7 +322,6 @@
 	cpu-supply = <&vdd_cpu>;
 };

-<<<<<<< HEAD
 &ebc {
 	io-channels = <&ebc_pmic 0>;
 	panel-supply = <&v3p3>;