arm64: dts: renesas: Clean up sysinfo EEPROM DT description on R-Car Gen3

Most of the sysinfo EEPROM node eeprom@50 is now part of the core DTs,
remove duplicate DT properties from *-u-boot.dtsi . Adjust the phandle
reference to i2c-eeprom in sysinfo node using <&{i2c_*/eeprom@50}> to
avoid need for DT label. No functional change.

Signed-off-by: Marek Vasut <[email protected]>

9 files changed, 18 insertions, 46 deletions

diff --git a/arch/arm/dts/r8a77951-salvator-x-u-boot.dtsi b/arch/arm/dts/r8a77951-salvator-x-u-boot.dtsi
index 744f4aaaad9..d88e839a890 100644
--- a/arch/arm/dts/r8a77951-salvator-x-u-boot.dtsi
+++ b/arch/arm/dts/r8a77951-salvator-x-u-boot.dtsi
@@ -10,7 +10,7 @@
 / {
 	sysinfo {
 		compatible = "renesas,rcar-sysinfo";
-		i2c-eeprom = <&sysinfo_eeprom>;
+		i2c-eeprom = <&{i2c_dvfs/eeprom@50}>;
 		bootph-all;
 	};
 };
@@ -18,9 +18,8 @@
 &i2c_dvfs {
 	bootph-all;
 
-	sysinfo_eeprom: eeprom@50 {
+	eeprom@50 {
 		bootph-all;
-		status = "okay";
 	};
 };
 
diff --git a/arch/arm/dts/r8a77951-ulcb-u-boot.dtsi b/arch/arm/dts/r8a77951-ulcb-u-boot.dtsi
index 305c4861520..8269d967af9 100644
--- a/arch/arm/dts/r8a77951-ulcb-u-boot.dtsi
+++ b/arch/arm/dts/r8a77951-ulcb-u-boot.dtsi
@@ -19,7 +19,7 @@
 
 	sysinfo {
 		compatible = "renesas,rcar-sysinfo";
-		i2c-eeprom = <&sysinfo_eeprom>;
+		i2c-eeprom = <&{i2c_dvfs/eeprom@50}>;
 		bootph-all;
 	};
 };
@@ -27,12 +27,8 @@
 &i2c_dvfs {
 	bootph-all;
 
-	sysinfo_eeprom: eeprom@50 {
-		compatible = "rohm,br24t01", "atmel,24c01";
-		reg = <0x50>;
-		pagesize = <8>;
+	eeprom@50 {
 		bootph-all;
-		status = "okay";
 	};
 };
 
diff --git a/arch/arm/dts/r8a77960-salvator-x-u-boot.dtsi b/arch/arm/dts/r8a77960-salvator-x-u-boot.dtsi
index 84a28bf885c..0a1602cdd23 100644
--- a/arch/arm/dts/r8a77960-salvator-x-u-boot.dtsi
+++ b/arch/arm/dts/r8a77960-salvator-x-u-boot.dtsi
@@ -10,7 +10,7 @@
 / {
 	sysinfo {
 		compatible = "renesas,rcar-sysinfo";
-		i2c-eeprom = <&sysinfo_eeprom>;
+		i2c-eeprom = <&{i2c_dvfs/eeprom@50}>;
 		bootph-all;
 	};
 };
@@ -18,9 +18,8 @@
 &i2c_dvfs {
 	bootph-all;
 
-	sysinfo_eeprom: eeprom@50 {
+	eeprom@50 {
 		bootph-all;
-		status = "okay";
 	};
 };
 
diff --git a/arch/arm/dts/r8a77960-ulcb-u-boot.dtsi b/arch/arm/dts/r8a77960-ulcb-u-boot.dtsi
index 6372f953956..d2a0406be17 100644
--- a/arch/arm/dts/r8a77960-ulcb-u-boot.dtsi
+++ b/arch/arm/dts/r8a77960-ulcb-u-boot.dtsi
@@ -19,7 +19,7 @@
 
 	sysinfo {
 		compatible = "renesas,rcar-sysinfo";
-		i2c-eeprom = <&sysinfo_eeprom>;
+		i2c-eeprom = <&{i2c_dvfs/eeprom@50}>;
 		bootph-all;
 	};
 };
@@ -27,12 +27,8 @@
 &i2c_dvfs {
 	bootph-all;
 
-	sysinfo_eeprom: eeprom@50 {
-		compatible = "rohm,br24t01", "atmel,24c01";
-		reg = <0x50>;
-		pagesize = <8>;
+	eeprom@50 {
 		bootph-all;
-		status = "okay";
 	};
 };
 
diff --git a/arch/arm/dts/r8a77965-salvator-x-u-boot.dtsi b/arch/arm/dts/r8a77965-salvator-x-u-boot.dtsi
index d9a28fe9bab..518466aca35 100644
--- a/arch/arm/dts/r8a77965-salvator-x-u-boot.dtsi
+++ b/arch/arm/dts/r8a77965-salvator-x-u-boot.dtsi
@@ -10,7 +10,7 @@
 / {
 	sysinfo {
 		compatible = "renesas,rcar-sysinfo";
-		i2c-eeprom = <&sysinfo_eeprom>;
+		i2c-eeprom = <&{i2c_dvfs/eeprom@50}>;
 		bootph-all;
 	};
 };
@@ -18,9 +18,8 @@
 &i2c_dvfs {
 	bootph-all;
 
-	sysinfo_eeprom: eeprom@50 {
+	eeprom@50 {
 		bootph-all;
-		status = "okay";
 	};
 };
 
diff --git a/arch/arm/dts/r8a77965-ulcb-u-boot.dtsi b/arch/arm/dts/r8a77965-ulcb-u-boot.dtsi
index aa5de3d0465..3905bf4e4f7 100644
--- a/arch/arm/dts/r8a77965-ulcb-u-boot.dtsi
+++ b/arch/arm/dts/r8a77965-ulcb-u-boot.dtsi
@@ -19,7 +19,7 @@
 
 	sysinfo {
 		compatible = "renesas,rcar-sysinfo";
-		i2c-eeprom = <&sysinfo_eeprom>;
+		i2c-eeprom = <&{i2c_dvfs/eeprom@50}>;
 		bootph-all;
 	};
 };
@@ -27,12 +27,8 @@
 &i2c_dvfs {
 	bootph-all;
 
-	sysinfo_eeprom: eeprom@50 {
-		compatible = "rohm,br24t01", "atmel,24c01";
-		reg = <0x50>;
-		pagesize = <8>;
+	eeprom@50 {
 		bootph-all;
-		status = "okay";
 	};
 };
 
diff --git a/arch/arm/dts/r8a77980-condor-u-boot.dtsi b/arch/arm/dts/r8a77980-condor-u-boot.dtsi
index 34a735ae5b2..382bfe8cacd 100644
--- a/arch/arm/dts/r8a77980-condor-u-boot.dtsi
+++ b/arch/arm/dts/r8a77980-condor-u-boot.dtsi
@@ -14,7 +14,7 @@
 
 	sysinfo {
 		compatible = "renesas,rcar-sysinfo";
-		i2c-eeprom = <&sysinfo_eeprom>;
+		i2c-eeprom = <&{i2c0/eeprom@50}>;
 		bootph-all;
 	};
 };
@@ -22,10 +22,7 @@
 &i2c0 {
 	bootph-all;
 
-	sysinfo_eeprom: eeprom@50 {
-		compatible = "rohm,br24t01", "atmel,24c01";
-		reg = <0x50>;
-		pagesize = <8>;
+	eeprom@50 {
 		bootph-all;
 	};
 };
diff --git a/arch/arm/dts/r8a77990-ebisu-u-boot.dtsi b/arch/arm/dts/r8a77990-ebisu-u-boot.dtsi
index b6b7b8f3609..a52c5de4ddf 100644
--- a/arch/arm/dts/r8a77990-ebisu-u-boot.dtsi
+++ b/arch/arm/dts/r8a77990-ebisu-u-boot.dtsi
@@ -10,23 +10,16 @@
 / {
 	sysinfo {
 		compatible = "renesas,rcar-sysinfo";
-		i2c-eeprom = <&sysinfo_eeprom>;
+		i2c-eeprom = <&{i2c_dvfs/eeprom@50}>;
 		bootph-all;
 	};
 };
 
 &i2c_dvfs {
-	compatible = "renesas,iic-r8a77990",
-		     "renesas,rcar-gen3-iic",
-		     "renesas,rmobile-iic";
 	bootph-all;
 
-	sysinfo_eeprom: eeprom@50 {
-		compatible = "rohm,br24t01", "atmel,24c01";
-		reg = <0x50>;
-		pagesize = <8>;
+	eeprom@50 {
 		bootph-all;
-		status = "okay";
 	};
 };
 
diff --git a/arch/arm/dts/r8a77995-draak-u-boot.dtsi b/arch/arm/dts/r8a77995-draak-u-boot.dtsi
index 1922c40a438..19d19542efd 100644
--- a/arch/arm/dts/r8a77995-draak-u-boot.dtsi
+++ b/arch/arm/dts/r8a77995-draak-u-boot.dtsi
@@ -10,7 +10,7 @@
 / {
 	sysinfo {
 		compatible = "renesas,rcar-sysinfo";
-		i2c-eeprom = <&sysinfo_eeprom>;
+		i2c-eeprom = <&{i2c0/eeprom@50}>;
 		bootph-all;
 	};
 };
@@ -18,10 +18,7 @@
 &i2c0 {
 	bootph-all;
 
-	sysinfo_eeprom: eeprom@50 {
-		compatible = "rohm,br24t01", "atmel,24c01";
-		reg = <0x50>;
-		pagesize = <8>;
+	eeprom@50 {
 		bootph-all;
 	};
 };