xilinx: Convert xlnx,eeprom property to nvmem alias

Convert all boards to use nvmem alias instead of xlnx,eeprom. The change is
done based on discussion in the link below.

Link: https://lore.kernel.org/r/CAL_JsqLMDqpkyg-Q7mUfw-XH67-v068Q6e9wTq2UOoN=0-_coQ@mail.gmail.com
Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/arch/arm/dts/avnet-ultrazedev-cc-v1.0-ultrazedev-som-v1.0.dts b/arch/arm/dts/avnet-ultrazedev-cc-v1.0-ultrazedev-som-v1.0.dts
index 85ab9e9e29ab8d39bcacc14d34625d020b4a7959..6d1448e8697a7b6c2ffe6c1d97f1167158f8ab3e 100644 (file)
--- a/arch/arm/dts/avnet-ultrazedev-cc-v1.0-ultrazedev-som-v1.0.dts
+++ b/arch/arm/dts/avnet-ultrazedev-cc-v1.0-ultrazedev-som-v1.0.dts
@@ -15,10 +15,10 @@
                     "xlnx,zynqmp";
        chosen {
                stdout-path = "serial0:115200n8";
-               xlnx,eeprom = &eeprom;
        };
        aliases {
                ethernet0 = &gem3;
+               nvmem0 = &eeprom;
                serial0 = &uart0;
        };
 };

diff --git a/arch/arm/dts/zynq-syzygy-hub.dts b/arch/arm/dts/zynq-syzygy-hub.dts
index 55f8e8a2da437470ae0e19a7ccc5d09442279585..cb878b0d0dc542ced71116bbc726d6fbb4600dfb 100644 (file)
--- a/arch/arm/dts/zynq-syzygy-hub.dts
+++ b/arch/arm/dts/zynq-syzygy-hub.dts
@@ -16,6 +16,7 @@
                ethernet0 = &gem0;
                serial0 = &uart0;
                mmc0 = &sdhci0;
+               nvmem0 = &eeprom;
                i2c0 = &i2c1;
        };
 
@@ -27,7 +28,6 @@
        chosen {
                bootargs = "";
                stdout-path = "serial0:115200n8";
-               xlnx,eeprom = &eeprom;
        };
 
        usb_phy0: phy0 {

diff --git a/arch/arm/dts/zynqmp-a2197-revA.dts b/arch/arm/dts/zynqmp-a2197-revA.dts
index 315313854254db43a266e5f048060e94f4f71196..0d3b32b732d3456900da06324a4f2495889836fb 100644 (file)
--- a/arch/arm/dts/zynqmp-a2197-revA.dts
+++ b/arch/arm/dts/zynqmp-a2197-revA.dts
@@ -18,13 +18,14 @@
 
        aliases {
                i2c0 = &i2c0;
+               nvmem0 = &eeprom1;
+               nvmem1 = &eeprom0;
                serial0 = &uart0;
        };
 
        chosen {
                bootargs = "earlycon";
                stdout-path = "serial0:115200n8";
-               xlnx,eeprom = <&eeprom1 &eeprom0 &eeprom0>;
        };
 
        memory@0 {

diff --git a/arch/arm/dts/zynqmp-e-a2197-00-revA.dts b/arch/arm/dts/zynqmp-e-a2197-00-revA.dts
index 147df8dd3e6a59a930165b8a058a8e6fb0305a95..7b9e91214e4062aae9e36b1969ec9b1712a43c40 100644 (file)
--- a/arch/arm/dts/zynqmp-e-a2197-00-revA.dts
+++ b/arch/arm/dts/zynqmp-e-a2197-00-revA.dts
@@ -23,6 +23,7 @@
                i2c0 = &i2c0;
                i2c1 = &i2c1;
                mmc0 = &sdhci1;
+               nvmem0 = &eeprom;
                rtc0 = &rtc;
                serial0 = &uart0;
                serial1 = &dcc;
@@ -31,7 +32,6 @@
        chosen {
                bootargs = "earlycon";
                stdout-path = "serial0:115200n8";
-               xlnx,eeprom = <&eeprom>;
        };
 
        memory@0 {

diff --git a/arch/arm/dts/zynqmp-g-a2197-00-revA.dts b/arch/arm/dts/zynqmp-g-a2197-00-revA.dts
index c04d5ed7ae39376bc3e79f8a25a68b573a5d898b..ef2e1cd47b1846f8f452d69ff05d3b6d023739a8 100644 (file)
--- a/arch/arm/dts/zynqmp-g-a2197-00-revA.dts
+++ b/arch/arm/dts/zynqmp-g-a2197-00-revA.dts
@@ -21,6 +21,7 @@
                ethernet0 = &gem0;
                i2c0 = &i2c0;
                mmc0 = &sdhci0;
+               nvmem0 = &eeprom;
                rtc0 = &rtc;
                serial0 = &uart0;
                serial1 = &dcc;
@@ -30,7 +31,6 @@
        chosen {
                bootargs = "earlycon";
                stdout-path = "serial0:115200n8";
-               xlnx,eeprom = <&eeprom>;
        };
 
        memory@0 {

diff --git a/arch/arm/dts/zynqmp-m-a2197-01-revA.dts b/arch/arm/dts/zynqmp-m-a2197-01-revA.dts
index 73ea4dc49b961bb9f9440262d916d4d772e51306..442c330a4d4b525ab578738e95f07ae4fa2d6c0b 100644 (file)
--- a/arch/arm/dts/zynqmp-m-a2197-01-revA.dts
+++ b/arch/arm/dts/zynqmp-m-a2197-01-revA.dts
@@ -23,6 +23,7 @@
                i2c1 = &i2c1;
                mmc0 = &sdhci0;
                mmc1 = &sdhci1;
+               nvmem0 = &eeprom;
                rtc0 = &rtc;
                serial0 = &uart0;
                serial1 = &uart1;
@@ -35,7 +36,6 @@
        chosen {
                bootargs = "earlycon";
                stdout-path = "serial0:115200n8";
-               xlnx,eeprom = <&eeprom>;
        };
 
        memory@0 {

diff --git a/arch/arm/dts/zynqmp-m-a2197-02-revA.dts b/arch/arm/dts/zynqmp-m-a2197-02-revA.dts
index fbe23182365a2d2d4b2ae1fd85f08a69f17afc72..d125f0ed559154481e1d6a989a77c4b7b3104335 100644 (file)
--- a/arch/arm/dts/zynqmp-m-a2197-02-revA.dts
+++ b/arch/arm/dts/zynqmp-m-a2197-02-revA.dts
@@ -23,6 +23,7 @@
                i2c1 = &i2c1;
                mmc0 = &sdhci0;
                mmc1 = &sdhci1;
+               nvmem0 = &eeprom;
                rtc0 = &rtc;
                serial0 = &uart0;
                serial1 = &uart1;
@@ -35,7 +36,6 @@
        chosen {
                bootargs = "earlycon";
                stdout-path = "serial0:115200n8";
-               xlnx,eeprom = <&eeprom>;
        };
 
        memory@0 {

diff --git a/arch/arm/dts/zynqmp-m-a2197-03-revA.dts b/arch/arm/dts/zynqmp-m-a2197-03-revA.dts
index e0d7769b12ddbaccf9ef98c79f5d5be8ba7944fb..e05f502212057fd5472cd5f8deba901fa9260518 100644 (file)
--- a/arch/arm/dts/zynqmp-m-a2197-03-revA.dts
+++ b/arch/arm/dts/zynqmp-m-a2197-03-revA.dts
@@ -23,6 +23,7 @@
                i2c1 = &i2c1;
                mmc0 = &sdhci0;
                mmc1 = &sdhci1;
+               nvmem0 = &eeprom;
                rtc0 = &rtc;
                serial0 = &uart0;
                serial1 = &uart1;
@@ -35,7 +36,6 @@
        chosen {
                bootargs = "earlycon";
                stdout-path = "serial0:115200n8";
-               xlnx,eeprom = <&eeprom>;
        };
 
        memory@0 {

diff --git a/arch/arm/dts/zynqmp-p-a2197-00-revA.dts b/arch/arm/dts/zynqmp-p-a2197-00-revA.dts
index 2cc16190262e22a3f62d1963a732b68516ece587..a7984c1ac8cdaba9cfc9a82e22837c6385a809e4 100644 (file)
--- a/arch/arm/dts/zynqmp-p-a2197-00-revA.dts
+++ b/arch/arm/dts/zynqmp-p-a2197-00-revA.dts
@@ -24,6 +24,7 @@
                i2c1 = &i2c1;
                mmc0 = &sdhci0;
                mmc1 = &sdhci1;
+               nvmem0 = &eeprom;
                rtc0 = &rtc;
                serial0 = &uart0;
                serial1 = &uart1;
@@ -35,8 +36,6 @@
        chosen {
                bootargs = "earlycon";
                stdout-path = "serial0:115200n8";
-               xlnx,eeprom = <&eeprom>;
-               /* xlnx,fmc-eeprom = FIXME */
        };
 
        memory@0 {

diff --git a/arch/arm/dts/zynqmp-sm-k26-revA.dts b/arch/arm/dts/zynqmp-sm-k26-revA.dts
index ec0569452acfad6e9169b07eb72dad10205b8418..b8a2249be4265aed758d41659988db4666e3b352 100644 (file)
--- a/arch/arm/dts/zynqmp-sm-k26-revA.dts
+++ b/arch/arm/dts/zynqmp-sm-k26-revA.dts
@@ -26,6 +26,8 @@
                i2c1 = &i2c1;
                mmc0 = &sdhci0;
                mmc1 = &sdhci1;
+               nvmem0 = &eeprom;
+               nvmem1 = &eeprom_cc;
                rtc0 = &rtc;
                serial0 = &uart0;
                serial1 = &uart1;
@@ -35,8 +37,6 @@
                spi2 = &spi1;
                usb0 = &usb0;
                usb1 = &usb1;
-               nvmem0 = &eeprom;
-               nvmem1 = &eeprom_cc;
        };
 
        chosen {

diff --git a/arch/arm/dts/zynqmp-zcu102-revA.dts b/arch/arm/dts/zynqmp-zcu102-revA.dts
index b7ceb702e57a5221cece550c3b1101ddb159b8b4..dbd03ad46f827e3ea2a51164eb530333616cdce6 100644 (file)
--- a/arch/arm/dts/zynqmp-zcu102-revA.dts
+++ b/arch/arm/dts/zynqmp-zcu102-revA.dts
@@ -25,6 +25,7 @@
                i2c0 = &i2c0;
                i2c1 = &i2c1;
                mmc0 = &sdhci1;
+               nvmem0 = &eeprom;
                rtc0 = &rtc;
                serial0 = &uart0;
                serial1 = &uart1;
@@ -36,7 +37,6 @@
        chosen {
                bootargs = "earlycon";
                stdout-path = "serial0:115200n8";
-               xlnx,eeprom = &eeprom;
        };
 
        memory@0 {

diff --git a/arch/arm/dts/zynqmp-zcu104-revA.dts b/arch/arm/dts/zynqmp-zcu104-revA.dts
index 80e24b5a1eea59192e10383731d5513ce318db44..15205bf5c22baebb71f5ae1df03d74f92f0edcb4 100644 (file)
--- a/arch/arm/dts/zynqmp-zcu104-revA.dts
+++ b/arch/arm/dts/zynqmp-zcu104-revA.dts
@@ -23,6 +23,7 @@
                ethernet0 = &gem3;
                i2c0 = &i2c1;
                mmc0 = &sdhci1;
+               nvmem0 = &eeprom;
                rtc0 = &rtc;
                serial0 = &uart0;
                serial1 = &uart1;

diff --git a/arch/arm/dts/zynqmp-zcu104-revC.dts b/arch/arm/dts/zynqmp-zcu104-revC.dts
index 1eb4deb6d8faf83c89aa5e0b222ec4080a3575b2..83fb7dc842f6a2c86e8924aa6af1dc72c9080d45 100644 (file)
--- a/arch/arm/dts/zynqmp-zcu104-revC.dts
+++ b/arch/arm/dts/zynqmp-zcu104-revC.dts
@@ -23,6 +23,7 @@
                ethernet0 = &gem3;
                i2c0 = &i2c1;
                mmc0 = &sdhci1;
+               nvmem0 = &eeprom;
                rtc0 = &rtc;
                serial0 = &uart0;
                serial1 = &uart1;
@@ -34,7 +35,6 @@
        chosen {
                bootargs = "earlycon";
                stdout-path = "serial0:115200n8";
-               xlnx,eeprom = &eeprom;
        };
 
        memory@0 {

diff --git a/arch/arm/dts/zynqmp-zcu106-revA.dts b/arch/arm/dts/zynqmp-zcu106-revA.dts
index 2dc8e0d2c12529868c01ac7167ecf0c7ca1c413a..8335d86ba9be1d7cceeb47d608c7c6a130d9be54 100644 (file)
--- a/arch/arm/dts/zynqmp-zcu106-revA.dts
+++ b/arch/arm/dts/zynqmp-zcu106-revA.dts
@@ -25,6 +25,7 @@
                i2c0 = &i2c0;
                i2c1 = &i2c1;
                mmc0 = &sdhci1;
+               nvmem0 = &eeprom;
                rtc0 = &rtc;
                serial0 = &uart0;
                serial1 = &uart1;
@@ -36,7 +37,6 @@
        chosen {
                bootargs = "earlycon";
                stdout-path = "serial0:115200n8";
-               xlnx,eeprom = &eeprom;
        };
 
        memory@0 {

diff --git a/arch/arm/dts/zynqmp-zcu111-revA.dts b/arch/arm/dts/zynqmp-zcu111-revA.dts
index a2b1c11201bd8e28fe53eb45df441318ac3856d5..4f2cf8ee36f5142b327ccffcf261c20cfada3c53 100644 (file)
--- a/arch/arm/dts/zynqmp-zcu111-revA.dts
+++ b/arch/arm/dts/zynqmp-zcu111-revA.dts
@@ -25,6 +25,7 @@
                i2c0 = &i2c0;
                i2c1 = &i2c1;
                mmc0 = &sdhci1;
+               nvmem0 = &eeprom;
                rtc0 = &rtc;
                serial0 = &uart0;
                serial1 = &dcc;
@@ -35,7 +36,6 @@
        chosen {
                bootargs = "earlycon";
                stdout-path = "serial0:115200n8";
-               xlnx,eeprom = &eeprom;
        };
 
        memory@0 {

diff --git a/arch/arm/dts/zynqmp-zcu208-revA.dts b/arch/arm/dts/zynqmp-zcu208-revA.dts
index 7e74c3e4494af2cb0eaba41f0d8706e51764d721..b885785a868fb127ecbefe56f8d5b9bba18627e5 100644 (file)
--- a/arch/arm/dts/zynqmp-zcu208-revA.dts
+++ b/arch/arm/dts/zynqmp-zcu208-revA.dts
@@ -25,6 +25,7 @@
                i2c0 = &i2c0;
                i2c1 = &i2c1;
                mmc0 = &sdhci1;
+               nvmem0 = &eeprom;
                rtc0 = &rtc;
                serial0 = &uart0;
                serial1 = &dcc;
@@ -35,7 +36,6 @@
        chosen {
                bootargs = "earlycon";
                stdout-path = "serial0:115200n8";
-               xlnx,eeprom = &eeprom;
        };
 
        memory@0 {

diff --git a/arch/arm/dts/zynqmp-zcu216-revA.dts b/arch/arm/dts/zynqmp-zcu216-revA.dts
index 81edc413a7d20a29933cbb702c60916ab4a99fff..5bd4857b8b19b7083c558dec9b9e7ee5af35c6e3 100644 (file)
--- a/arch/arm/dts/zynqmp-zcu216-revA.dts
+++ b/arch/arm/dts/zynqmp-zcu216-revA.dts
@@ -25,6 +25,7 @@
                i2c0 = &i2c0;
                i2c1 = &i2c1;
                mmc0 = &sdhci1;
+               nvmem0 = &eeprom;
                rtc0 = &rtc;
                serial0 = &uart0;
                serial1 = &dcc;
@@ -35,7 +36,6 @@
        chosen {
                bootargs = "earlycon";
                stdout-path = "serial0:115200n8";
-               xlnx,eeprom = <&eeprom>;
        };
 
        memory@0 {

diff --git a/arch/arm/dts/zynqmp-zcu670-revA.dts b/arch/arm/dts/zynqmp-zcu670-revA.dts
index d45df373ae9a0d99a4b87ef13bda0352c1005774..e59a1f1795ce28c284fd9079d99ff547bdf8f024 100644 (file)
--- a/arch/arm/dts/zynqmp-zcu670-revA.dts
+++ b/arch/arm/dts/zynqmp-zcu670-revA.dts
@@ -27,6 +27,7 @@
                i2c0 = &i2c0;
                i2c1 = &i2c1;
                mmc0 = &sdhci1;
+               nvmem0 = &eeprom;
                rtc0 = &rtc;
                serial0 = &uart0;
                serial1 = &dcc;
@@ -37,7 +38,6 @@
        chosen {
                bootargs = "earlycon";
                stdout-path = "serial0:115200n8";
-               xlnx,eeprom = &eeprom;
        };
 
        memory@0 {