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 27a9c60949a79ee3829bf0a94324d4271c90bc61..89c3a281d0d9571dd4f1b7238239168836ed3374 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 7bcdbdfdbb065b770f1718d4093c23cb465ee9c0..65ab67a32c0ecdad92c061ea4cacdfabf4a2808e 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 69a3901ccf6c6a282f92b1930b38c49c7d581a88..26eca135e1b6f58f99dd30e9a211bff7185457a1 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 a5db599c949731fa942f0cbfa9b4ec92cb4757eb..157c301951e37ca5863c977803cfac475ff0c712 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 58df328c987fbc76cc3d2d0638e88531b1752a46..cbdd69c24890f921ec84e7e68c397f5be830a861 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 25d87532be770e196cbf7ed44f92aaa8a36c70ac..e4f92233340c30c8bba8044af58f00685a07183e 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 82d5ef83f7641896b0387c9abc332a7016a0e182..fe75933152820e92f79e3fb8704b4df0c323685b 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 e4cf382a497503cf250b64a8b20cdadafb699ecc..7b8a8f83c4925bd75870584c22f10d452b8a2f69 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 7190e876d8ddcf8084df28d2684f7e87d8c5ec19..1b08ac02afaf1dad7c33917f0f5569f98bee8fa2 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 76c635f0d4604153d8cbde644066b0263c04ed28..f368309d68f7a99aab8fe4d258e27e7b15360120 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 f9eb4caaf8c014657c271ddd8e522a8c65522c43..9b816476a94b3745018d128788e9f1811c94f0ee 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 2b1255dc5f327b99027f92df22de3ee768eaa6bc..25076f4e78e5edbfd92f404fb2e313e8e3ccb7df 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 223bb8a6146283b71959d4a7dc2e964a77fcfc6d..98488245fa26c5ebcd675f5caade9e94b456ac8f 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 7607098ac077a8bc2ebb838461e6d017d70964c5..82dc1dce68ce3ce92181fe6c7c4a04da06055c55 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 7ba60da131f10065eaf3cec4ae0ed8a6666e546c..bc54feadd5445db6fcf9b49ca5153a957c9ec9eb 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 {