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 <marek.vasut+renesas@mailbox.org>

diff --git a/arch/arm/dts/r8a77951-salvator-x-u-boot.dtsi b/arch/arm/dts/r8a77951-salvator-x-u-boot.dtsi
index 744f4aaaad9e6ebf1735fce949f1a070ba390bd7..d88e839a890862c9569dbc50d84e24abaff26bf6 100644 (file)
--- 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 305c48615208592738b86a6bf65e76d246d0dc48..8269d967af9e9c0277525c13488ae188782b2b81 100644 (file)
--- 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 84a28bf885cb56a46bbd47041acfa92edc327b01..0a1602cdd2364bd74c4db5db55b967f6baf451b0 100644 (file)
--- 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 6372f953956f40e5c67e7a573227e0f0196211c3..d2a0406be17b4d2ba2b4ef60c386d0b32a411f94 100644 (file)
--- 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 d9a28fe9bab55a65062acd389f9e728e620e30fb..518466aca358d90e15e91c321d75f97acd39f5be 100644 (file)
--- 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 aa5de3d04650f70b426bcb55df7c5f58fb1f57e0..3905bf4e4f7ccb6f421a8d50648b409f709af1bd 100644 (file)
--- 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 34a735ae5b2e05e00eb32552bd8de409d0f96866..382bfe8cacd698ff274900db07aac9b0e69a711c 100644 (file)
--- 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 b6b7b8f36096d75052746d56fb9bfc2d8bb01c66..a52c5de4ddf4771c4245b094c37d9c8bf2222c28 100644 (file)
--- 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 1922c40a438aa879be992faeaf3397d1213f7d5e..19d19542efd687f61c1ab1b1892e9d08e0774e75 100644 (file)
--- 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;
        };
 };