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 85ab9e9..6d1448e 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 55f8e8a..cb878b0 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 27a9c60..89c3a28 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 7bcdbdf..65ab67a 100644 (file)
--- a/arch/arm/dts/zynqmp-e-a2197-00-revA.dts
+++ b/arch/arm/dts/zynqmp-e-a2197-00-revA.dts
@@ -24,6 +24,7 @@
                i2c0 = &i2c0;
                i2c1 = &i2c1;
                mmc0 = &sdhci1;
+               nvmem0 = &eeprom;
                rtc0 = &rtc;
                serial0 = &uart0;
                serial1 = &dcc;
@@ -32,7 +33,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 69a3901..26eca13 100644 (file)
--- a/arch/arm/dts/zynqmp-g-a2197-00-revA.dts
+++ b/arch/arm/dts/zynqmp-g-a2197-00-revA.dts
@@ -22,6 +22,7 @@
                gpio0 = &gpio;
                i2c0 = &i2c0;
                mmc0 = &sdhci0;
+               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-m-a2197-01-revA.dts b/arch/arm/dts/zynqmp-m-a2197-01-revA.dts
index a5db599..157c301 100644 (file)
--- a/arch/arm/dts/zynqmp-m-a2197-01-revA.dts
+++ b/arch/arm/dts/zynqmp-m-a2197-01-revA.dts
@@ -24,6 +24,7 @@
                i2c1 = &i2c1;
                mmc0 = &sdhci0;
                mmc1 = &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-m-a2197-02-revA.dts b/arch/arm/dts/zynqmp-m-a2197-02-revA.dts
index 58df328..cbdd69c 100644 (file)
--- a/arch/arm/dts/zynqmp-m-a2197-02-revA.dts
+++ b/arch/arm/dts/zynqmp-m-a2197-02-revA.dts
@@ -24,6 +24,7 @@
                i2c1 = &i2c1;
                mmc0 = &sdhci0;
                mmc1 = &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-m-a2197-03-revA.dts b/arch/arm/dts/zynqmp-m-a2197-03-revA.dts
index 25d8753..e4f9223 100644 (file)
--- a/arch/arm/dts/zynqmp-m-a2197-03-revA.dts
+++ b/arch/arm/dts/zynqmp-m-a2197-03-revA.dts
@@ -24,6 +24,7 @@
                i2c1 = &i2c1;
                mmc0 = &sdhci0;
                mmc1 = &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-p-a2197-00-revA.dts b/arch/arm/dts/zynqmp-p-a2197-00-revA.dts
index 82d5ef8..fe75933 100644 (file)
--- a/arch/arm/dts/zynqmp-p-a2197-00-revA.dts
+++ b/arch/arm/dts/zynqmp-p-a2197-00-revA.dts
@@ -25,6 +25,7 @@
                i2c1 = &i2c1;
                mmc0 = &sdhci0;
                mmc1 = &sdhci1;
+               nvmem0 = &eeprom;
                rtc0 = &rtc;
                serial0 = &uart0;
                serial1 = &uart1;
@@ -36,8 +37,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 e4cf382..7b8a8f8 100644 (file)
--- a/arch/arm/dts/zynqmp-sm-k26-revA.dts
+++ b/arch/arm/dts/zynqmp-sm-k26-revA.dts
@@ -27,6 +27,8 @@
                i2c1 = &i2c1;
                mmc0 = &sdhci0;
                mmc1 = &sdhci1;
+               nvmem0 = &eeprom;
+               nvmem1 = &eeprom_cc;
                rtc0 = &rtc;
                serial0 = &uart0;
                serial1 = &uart1;
@@ -36,8 +38,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 7190e87..1b08ac0 100644 (file)
--- a/arch/arm/dts/zynqmp-zcu102-revA.dts
+++ b/arch/arm/dts/zynqmp-zcu102-revA.dts
@@ -26,6 +26,7 @@
                i2c0 = &i2c0;
                i2c1 = &i2c1;
                mmc0 = &sdhci1;
+               nvmem0 = &eeprom;
                rtc0 = &rtc;
                serial0 = &uart0;
                serial1 = &uart1;
@@ -37,7 +38,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 76c635f..f368309 100644 (file)
--- a/arch/arm/dts/zynqmp-zcu104-revA.dts
+++ b/arch/arm/dts/zynqmp-zcu104-revA.dts
@@ -24,6 +24,7 @@
                gpio0 = &gpio;
                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 f9eb4ca..9b81647 100644 (file)
--- a/arch/arm/dts/zynqmp-zcu104-revC.dts
+++ b/arch/arm/dts/zynqmp-zcu104-revC.dts
@@ -24,6 +24,7 @@
                gpio0 = &gpio;
                i2c0 = &i2c1;
                mmc0 = &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-zcu106-revA.dts b/arch/arm/dts/zynqmp-zcu106-revA.dts
index 2b1255d..25076f4 100644 (file)
--- a/arch/arm/dts/zynqmp-zcu106-revA.dts
+++ b/arch/arm/dts/zynqmp-zcu106-revA.dts
@@ -26,6 +26,7 @@
                i2c0 = &i2c0;
                i2c1 = &i2c1;
                mmc0 = &sdhci1;
+               nvmem0 = &eeprom;
                rtc0 = &rtc;
                serial0 = &uart0;
                serial1 = &uart1;
@@ -37,7 +38,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 223bb8a..9848824 100644 (file)
--- a/arch/arm/dts/zynqmp-zcu111-revA.dts
+++ b/arch/arm/dts/zynqmp-zcu111-revA.dts
@@ -26,6 +26,7 @@
                i2c0 = &i2c0;
                i2c1 = &i2c1;
                mmc0 = &sdhci1;
+               nvmem0 = &eeprom;
                rtc0 = &rtc;
                serial0 = &uart0;
                serial1 = &dcc;
@@ -36,7 +37,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 7607098..82dc1dc 100644 (file)
--- a/arch/arm/dts/zynqmp-zcu208-revA.dts
+++ b/arch/arm/dts/zynqmp-zcu208-revA.dts
@@ -26,6 +26,7 @@
                i2c0 = &i2c0;
                i2c1 = &i2c1;
                mmc0 = &sdhci1;
+               nvmem0 = &eeprom;
                rtc0 = &rtc;
                serial0 = &uart0;
                serial1 = &dcc;
@@ -36,7 +37,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 7ba60da..bc54fea 100644 (file)
--- a/arch/arm/dts/zynqmp-zcu216-revA.dts
+++ b/arch/arm/dts/zynqmp-zcu216-revA.dts
@@ -26,6 +26,7 @@
                i2c0 = &i2c0;
                i2c1 = &i2c1;
                mmc0 = &sdhci1;
+               nvmem0 = &eeprom;
                rtc0 = &rtc;
                serial0 = &uart0;
                serial1 = &dcc;
@@ -36,7 +37,6 @@
        chosen {
                bootargs = "earlycon";
                stdout-path = "serial0:115200n8";
-               xlnx,eeprom = <&eeprom>;
        };
 
        memory@0 {