From 2bfd356c6dca7835d3c8caf471cf6716a77475c4 Mon Sep 17 00:00:00 2001
From: Laxman Dewangan <ldewangan@nvidia.com>
Date: Fri, 4 Aug 2023 05:30:03 +0000
Subject: [PATCH] tegra234: Avoid new label of node which is already labeled

The i2s4 endpoint node is already labeled as i2s4_dap

bus@0->aconnect@2900000->ahub@2900800->i2s@2901300->ports->port@1->endpoint.
So avoid relabeling again of same node, use the existing label.

This will help matching the file with kernel 6.5.rc2

Bug 4037899

Change-Id: I7206510f6556406bb4fb5b311a5832b79118aa0f
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/device/hardware/nvidia/t23x-public-dts/+/2948445
Reviewed-by: Sameer Pujar <spujar@nvidia.com>
Reviewed-by: Sheetal . <sheetal@nvidia.com>
Reviewed-by: Mohan Kumar D <mkumard@nvidia.com>
GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
---
 tegra234-p3740-0002.dtsi | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tegra234-p3740-0002.dtsi b/tegra234-p3740-0002.dtsi
index 5bb34ab..1fd89d3 100644
--- a/tegra234-p3740-0002.dtsi
+++ b/tegra234-p3740-0002.dtsi
@@ -1,4 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0
+
 #include <dt-bindings/sound/rt5640.h>
 
 / {
@@ -10,7 +11,7 @@
 				i2s@2901300 {
 					ports {
 						port@1 {
-							i2s4_dap_ep: endpoint {
+							endpoint {
 								dai-format = "i2s";
 								remote-endpoint = <&rt5640_ep>;
 							};
@@ -22,8 +23,8 @@
 					ports {
 						port@1 {
 							endpoint {
-							       bitclock-master;
-							       frame-master;
+								bitclock-master;
+								frame-master;
 							};
 						};
 					};
@@ -54,7 +55,7 @@
 
 				port {
 					rt5640_ep: endpoint {
-						remote-endpoint = <&i2s4_dap_ep>;
+						remote-endpoint = <&i2s4_dap>;
 						mclk-fs = <256>;
 					};
 				};
@@ -72,7 +73,6 @@
 				size = <256>;
 				read-only;
 			};
-
 		};
 
 		padctl@3520000 {