Received-SPF: pass (google.com: domain of linux-kernel+bounces-154684-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
From: Heiko Stuebner <heiko@sntech.de>
To: heiko@sntech.de
Cc: michael.riesch@wolfvision.net,
	linux-arm-kernel@lists.infradead.org,
	linux-rockchip@lists.infradead.org,
	linux-kernel@vger.kernel.org,
	Arnd Bergmann <arnd@kernel.org>
Subject: [PATCH] arm64: dts: rockchip: fix nodename warning on wolfvision-pf5-display
Date: Tue, 23 Apr 2024 10:29:41 +0200
Message-Id: <20240423082941.2626102-1-heiko@sntech.de>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

The dtbs check throws a warning about node naming with the recently
added pf5-display-overlay:
rockchip/rk3568-wolfvision-pf5-display.dtsi:113.6-121.3: Warning (graph_port): /fragment@4/__overlay__: graph port node name should be 'port'

This comes from the overlay just referencing the vp2-port-node via
its phandle and then adding an endpoint beneath it.

While this is possible something to handle inside the dtbs check,
carrying around the warning is not pretty, so change the description
to go around it.

Starting from the vop_out phandle and then referencing the port
via its generic port@2 nodename will satisfy the port<->endpoint
naming dependency while keeping the same structure once the overlay
is applied.

Reported-by: Arnd Bergmann <arnd@kernel.org>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
 .../rockchip/rk3568-wolfvision-pf5-display.dtsi    | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3568-wolfvision-pf5-display.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-wolfvision-pf5-display.dtsi
index b22bb543ecbb..18c807c39e56 100644
--- a/arch/arm64/boot/dts/rockchip/rk3568-wolfvision-pf5-display.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3568-wolfvision-pf5-display.dtsi
@@ -110,12 +110,14 @@ &pwm10 {
 	status = "okay";
 };
 
-&vp2 {
-	#address-cells = <1>;
-	#size-cells = <0>;
+&vop_out {
+	port@2 {
+		#address-cells = <1>;
+		#size-cells = <0>;
 
-	vp2_out_rgb: endpoint@ROCKCHIP_VOP2_EP_RGB0 {
-		reg = <ROCKCHIP_VOP2_EP_RGB0>;
-		remote-endpoint = <&panel_in_vp2>;
+		vp2_out_rgb: endpoint@ROCKCHIP_VOP2_EP_RGB0 {
+			reg = <ROCKCHIP_VOP2_EP_RGB0>;
+			remote-endpoint = <&panel_in_vp2>;
+		};
 	};
 };
-- 
2.39.2