ARM: dts: aspeed: ibm: Use non-deprecated AT25 properties

The at25,* properties have been deprecated since 2012. These platforms
weren't upstream until 2020 and 2023, so it should be safe to switch
over to the "new" properties and just drop the deprecated ones.

Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
Signed-off-by: Andrew Jeffery <andrew@codeconstruct.com.au>

diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-everest.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-everest.dts
index 5a0975d52492c59e80e4503bf9d20883e872fc99..561633d31039d896c88d6d34c1610ce3b2674271 100644 (file)
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-everest.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-everest.dts
@@ -2806,13 +2806,13 @@
                                #size-cells = <0>;
 
                                eeprom@0 {
-                                       at25,byte-len = <0x80000>;
-                                       at25,addr-mode = <4>;
-                                       at25,page-size = <256>;
-
                                        compatible = "atmel,at25";
                                        reg = <0>;
                                        spi-max-frequency = <1000000>;
+
+                                       address-width = <24>;
+                                       pagesize = <256>;
+                                       size = <0x80000>;
                                };
                        };
 
@@ -2823,13 +2823,13 @@
                                #size-cells = <0>;
 
                                eeprom@0 {
-                                       at25,byte-len = <0x80000>;
-                                       at25,addr-mode = <4>;
-                                       at25,page-size = <256>;
-
                                        compatible = "atmel,at25";
                                        reg = <0>;
                                        spi-max-frequency = <1000000>;
+
+                                       address-width = <24>;
+                                       pagesize = <256>;
+                                       size = <0x80000>;
                                };
                        };
 
@@ -2840,13 +2840,13 @@
                                #size-cells = <0>;
 
                                eeprom@0 {
-                                       at25,byte-len = <0x80000>;
-                                       at25,addr-mode = <4>;
-                                       at25,page-size = <256>;
-
                                        compatible = "atmel,at25";
                                        reg = <0>;
                                        spi-max-frequency = <1000000>;
+
+                                       address-width = <24>;
+                                       pagesize = <256>;
+                                       size = <0x80000>;
                                };
                        };
 
@@ -2857,13 +2857,13 @@
                                #size-cells = <0>;
 
                                eeprom@0 {
-                                       at25,byte-len = <0x80000>;
-                                       at25,addr-mode = <4>;
-                                       at25,page-size = <256>;
-
                                        compatible = "atmel,at25";
                                        reg = <0>;
                                        spi-max-frequency = <1000000>;
+
+                                       address-width = <24>;
+                                       pagesize = <256>;
+                                       size = <0x80000>;
                                };
                        };
                };
@@ -3181,13 +3181,13 @@
                                #size-cells = <0>;
 
                                eeprom@0 {
-                                       at25,byte-len = <0x80000>;
-                                       at25,addr-mode = <4>;
-                                       at25,page-size = <256>;
-
                                        compatible = "atmel,at25";
                                        reg = <0>;
                                        spi-max-frequency = <1000000>;
+
+                                       address-width = <24>;
+                                       pagesize = <256>;
+                                       size = <0x80000>;
                                };
                        };
 
@@ -3198,13 +3198,13 @@
                                #size-cells = <0>;
 
                                eeprom@0 {
-                                       at25,byte-len = <0x80000>;
-                                       at25,addr-mode = <4>;
-                                       at25,page-size = <256>;
-
                                        compatible = "atmel,at25";
                                        reg = <0>;
                                        spi-max-frequency = <1000000>;
+
+                                       address-width = <24>;
+                                       pagesize = <256>;
+                                       size = <0x80000>;
                                };
                        };
 
@@ -3215,13 +3215,13 @@
                                #size-cells = <0>;
 
                                eeprom@0 {
-                                       at25,byte-len = <0x80000>;
-                                       at25,addr-mode = <4>;
-                                       at25,page-size = <256>;
-
                                        compatible = "atmel,at25";
                                        reg = <0>;
                                        spi-max-frequency = <1000000>;
+
+                                       address-width = <24>;
+                                       pagesize = <256>;
+                                       size = <0x80000>;
                                };
                        };
 
@@ -3232,13 +3232,13 @@
                                #size-cells = <0>;
 
                                eeprom@0 {
-                                       at25,byte-len = <0x80000>;
-                                       at25,addr-mode = <4>;
-                                       at25,page-size = <256>;
-
                                        compatible = "atmel,at25";
                                        reg = <0>;
                                        spi-max-frequency = <1000000>;
+
+                                       address-width = <24>;
+                                       pagesize = <256>;
+                                       size = <0x80000>;
                                };
                        };
                };
@@ -3556,13 +3556,13 @@
                                #size-cells = <0>;
 
                                eeprom@0 {
-                                       at25,byte-len = <0x80000>;
-                                       at25,addr-mode = <4>;
-                                       at25,page-size = <256>;
-
                                        compatible = "atmel,at25";
                                        reg = <0>;
                                        spi-max-frequency = <1000000>;
+
+                                       address-width = <24>;
+                                       pagesize = <256>;
+                                       size = <0x80000>;
                                };
                        };
 
@@ -3573,13 +3573,13 @@
                                #size-cells = <0>;
 
                                eeprom@0 {
-                                       at25,byte-len = <0x80000>;
-                                       at25,addr-mode = <4>;
-                                       at25,page-size = <256>;
-
                                        compatible = "atmel,at25";
                                        reg = <0>;
                                        spi-max-frequency = <1000000>;
+
+                                       address-width = <24>;
+                                       pagesize = <256>;
+                                       size = <0x80000>;
                                };
                        };
 
@@ -3590,13 +3590,13 @@
                                #size-cells = <0>;
 
                                eeprom@0 {
-                                       at25,byte-len = <0x80000>;
-                                       at25,addr-mode = <4>;
-                                       at25,page-size = <256>;
-
                                        compatible = "atmel,at25";
                                        reg = <0>;
                                        spi-max-frequency = <1000000>;
+
+                                       address-width = <24>;
+                                       pagesize = <256>;
+                                       size = <0x80000>;
                                };
                        };
 
@@ -3607,13 +3607,13 @@
                                #size-cells = <0>;
 
                                eeprom@0 {
-                                       at25,byte-len = <0x80000>;
-                                       at25,addr-mode = <4>;
-                                       at25,page-size = <256>;
-
                                        compatible = "atmel,at25";
                                        reg = <0>;
                                        spi-max-frequency = <1000000>;
+
+                                       address-width = <24>;
+                                       pagesize = <256>;
+                                       size = <0x80000>;
                                };
                        };
                };
@@ -3931,13 +3931,13 @@
                                #size-cells = <0>;
 
                                eeprom@0 {
-                                       at25,byte-len = <0x80000>;
-                                       at25,addr-mode = <4>;
-                                       at25,page-size = <256>;
-
                                        compatible = "atmel,at25";
                                        reg = <0>;
                                        spi-max-frequency = <1000000>;
+
+                                       address-width = <24>;
+                                       pagesize = <256>;
+                                       size = <0x80000>;
                                };
                        };
 
@@ -3948,13 +3948,13 @@
                                #size-cells = <0>;
 
                                eeprom@0 {
-                                       at25,byte-len = <0x80000>;
-                                       at25,addr-mode = <4>;
-                                       at25,page-size = <256>;
-
                                        compatible = "atmel,at25";
                                        reg = <0>;
                                        spi-max-frequency = <1000000>;
+
+                                       address-width = <24>;
+                                       pagesize = <256>;
+                                       size = <0x80000>;
                                };
                        };
 
@@ -3965,13 +3965,13 @@
                                #size-cells = <0>;
 
                                eeprom@0 {
-                                       at25,byte-len = <0x80000>;
-                                       at25,addr-mode = <4>;
-                                       at25,page-size = <256>;
-
                                        compatible = "atmel,at25";
                                        reg = <0>;
                                        spi-max-frequency = <1000000>;
+
+                                       address-width = <24>;
+                                       pagesize = <256>;
+                                       size = <0x80000>;
                                };
                        };
 
@@ -3982,13 +3982,13 @@
                                #size-cells = <0>;
 
                                eeprom@0 {
-                                       at25,byte-len = <0x80000>;
-                                       at25,addr-mode = <4>;
-                                       at25,page-size = <256>;
-
                                        compatible = "atmel,at25";
                                        reg = <0>;
                                        spi-max-frequency = <1000000>;
+
+                                       address-width = <24>;
+                                       pagesize = <256>;
+                                       size = <0x80000>;
                                };
                        };
                };

diff --git a/arch/arm/boot/dts/aspeed/ibm-power10-dual.dtsi b/arch/arm/boot/dts/aspeed/ibm-power10-dual.dtsi
index 06fac236773f2c5936e1d29c2559f79a8f9b1c4f..79eaf442c5bf83ece61986f558e704c629cec5c6 100644 (file)
--- a/arch/arm/boot/dts/aspeed/ibm-power10-dual.dtsi
+++ b/arch/arm/boot/dts/aspeed/ibm-power10-dual.dtsi
@@ -88,13 +88,13 @@
                                #size-cells = <0>;
 
                                eeprom@0 {
-                                       at25,byte-len = <0x80000>;
-                                       at25,addr-mode = <4>;
-                                       at25,page-size = <256>;
-
                                        compatible = "atmel,at25";
                                        reg = <0>;
                                        spi-max-frequency = <1000000>;
+
+                                       address-width = <24>;
+                                       pagesize = <256>;
+                                       size = <0x80000>;
                                };
                        };
 
@@ -105,13 +105,13 @@
                                #size-cells = <0>;
 
                                eeprom@0 {
-                                       at25,byte-len = <0x80000>;
-                                       at25,addr-mode = <4>;
-                                       at25,page-size = <256>;
-
                                        compatible = "atmel,at25";
                                        reg = <0>;
                                        spi-max-frequency = <1000000>;
+
+                                       address-width = <24>;
+                                       pagesize = <256>;
+                                       size = <0x80000>;
                                };
                        };
 
@@ -122,13 +122,13 @@
                                #size-cells = <0>;
 
                                eeprom@0 {
-                                       at25,byte-len = <0x80000>;
-                                       at25,addr-mode = <4>;
-                                       at25,page-size = <256>;
-
                                        compatible = "atmel,at25";
                                        reg = <0>;
                                        spi-max-frequency = <1000000>;
+
+                                       address-width = <24>;
+                                       pagesize = <256>;
+                                       size = <0x80000>;
                                };
                        };
 
@@ -139,13 +139,13 @@
                                #size-cells = <0>;
 
                                eeprom@0 {
-                                       at25,byte-len = <0x80000>;
-                                       at25,addr-mode = <4>;
-                                       at25,page-size = <256>;
-
                                        compatible = "atmel,at25";
                                        reg = <0>;
                                        spi-max-frequency = <1000000>;
+
+                                       address-width = <24>;
+                                       pagesize = <256>;
+                                       size = <0x80000>;
                                };
                        };
                };
@@ -257,13 +257,13 @@
                                #size-cells = <0>;
 
                                eeprom@0 {
-                                       at25,byte-len = <0x80000>;
-                                       at25,addr-mode = <4>;
-                                       at25,page-size = <256>;
-
                                        compatible = "atmel,at25";
                                        reg = <0>;
                                        spi-max-frequency = <1000000>;
+
+                                       address-width = <24>;
+                                       pagesize = <256>;
+                                       size = <0x80000>;
                                };
                        };
 
@@ -274,13 +274,13 @@
                                #size-cells = <0>;
 
                                eeprom@0 {
-                                       at25,byte-len = <0x80000>;
-                                       at25,addr-mode = <4>;
-                                       at25,page-size = <256>;
-
                                        compatible = "atmel,at25";
                                        reg = <0>;
                                        spi-max-frequency = <1000000>;
+
+                                       address-width = <24>;
+                                       pagesize = <256>;
+                                       size = <0x80000>;
                                };
                        };
 
@@ -291,13 +291,13 @@
                                #size-cells = <0>;
 
                                eeprom@0 {
-                                       at25,byte-len = <0x80000>;
-                                       at25,addr-mode = <4>;
-                                       at25,page-size = <256>;
-
                                        compatible = "atmel,at25";
                                        reg = <0>;
                                        spi-max-frequency = <1000000>;
+
+                                       address-width = <24>;
+                                       pagesize = <256>;
+                                       size = <0x80000>;
                                };
                        };
 
@@ -308,13 +308,13 @@
                                #size-cells = <0>;
 
                                eeprom@0 {
-                                       at25,byte-len = <0x80000>;
-                                       at25,addr-mode = <4>;
-                                       at25,page-size = <256>;
-
                                        compatible = "atmel,at25";
                                        reg = <0>;
                                        spi-max-frequency = <1000000>;
+
+                                       address-width = <24>;
+                                       pagesize = <256>;
+                                       size = <0x80000>;
                                };
                        };
                };

diff --git a/arch/arm/boot/dts/aspeed/ibm-power10-quad.dtsi b/arch/arm/boot/dts/aspeed/ibm-power10-quad.dtsi
index 9501f66d0030fbad0ac7f9a6114cea68b527d9cf..a54be7d0af0b45e12e34ebbdfac68af3e89ceaf8 100644 (file)
--- a/arch/arm/boot/dts/aspeed/ibm-power10-quad.dtsi
+++ b/arch/arm/boot/dts/aspeed/ibm-power10-quad.dtsi
@@ -739,13 +739,13 @@
                                #size-cells = <0>;
 
                                eeprom@0 {
-                                       at25,byte-len = <0x80000>;
-                                       at25,addr-mode = <4>;
-                                       at25,page-size = <256>;
-
                                        compatible = "atmel,at25";
                                        reg = <0>;
                                        spi-max-frequency = <1000000>;
+
+                                       address-width = <24>;
+                                       pagesize = <256>;
+                                       size = <0x80000>;
                                };
                        };
 
@@ -756,13 +756,13 @@
                                #size-cells = <0>;
 
                                eeprom@0 {
-                                       at25,byte-len = <0x80000>;
-                                       at25,addr-mode = <4>;
-                                       at25,page-size = <256>;
-
                                        compatible = "atmel,at25";
                                        reg = <0>;
                                        spi-max-frequency = <1000000>;
+
+                                       address-width = <24>;
+                                       pagesize = <256>;
+                                       size = <0x80000>;
                                };
                        };
 
@@ -773,13 +773,13 @@
                                #size-cells = <0>;
 
                                eeprom@0 {
-                                       at25,byte-len = <0x80000>;
-                                       at25,addr-mode = <4>;
-                                       at25,page-size = <256>;
-
                                        compatible = "atmel,at25";
                                        reg = <0>;
                                        spi-max-frequency = <1000000>;
+
+                                       address-width = <24>;
+                                       pagesize = <256>;
+                                       size = <0x80000>;
                                };
                        };
 
@@ -790,13 +790,13 @@
                                #size-cells = <0>;
 
                                eeprom@0 {
-                                       at25,byte-len = <0x80000>;
-                                       at25,addr-mode = <4>;
-                                       at25,page-size = <256>;
-
                                        compatible = "atmel,at25";
                                        reg = <0>;
                                        spi-max-frequency = <1000000>;
+
+                                       address-width = <24>;
+                                       pagesize = <256>;
+                                       size = <0x80000>;
                                };
                        };
                };
@@ -1114,13 +1114,13 @@
                                #size-cells = <0>;
 
                                eeprom@0 {
-                                       at25,byte-len = <0x80000>;
-                                       at25,addr-mode = <4>;
-                                       at25,page-size = <256>;
-
                                        compatible = "atmel,at25";
                                        reg = <0>;
                                        spi-max-frequency = <1000000>;
+
+                                       address-width = <24>;
+                                       pagesize = <256>;
+                                       size = <0x80000>;
                                };
                        };
 
@@ -1131,13 +1131,13 @@
                                #size-cells = <0>;
 
                                eeprom@0 {
-                                       at25,byte-len = <0x80000>;
-                                       at25,addr-mode = <4>;
-                                       at25,page-size = <256>;
-
                                        compatible = "atmel,at25";
                                        reg = <0>;
                                        spi-max-frequency = <1000000>;
+
+                                       address-width = <24>;
+                                       pagesize = <256>;
+                                       size = <0x80000>;
                                };
                        };
 
@@ -1148,13 +1148,13 @@
                                #size-cells = <0>;
 
                                eeprom@0 {
-                                       at25,byte-len = <0x80000>;
-                                       at25,addr-mode = <4>;
-                                       at25,page-size = <256>;
-
                                        compatible = "atmel,at25";
                                        reg = <0>;
                                        spi-max-frequency = <1000000>;
+
+                                       address-width = <24>;
+                                       pagesize = <256>;
+                                       size = <0x80000>;
                                };
                        };
 
@@ -1165,13 +1165,13 @@
                                #size-cells = <0>;
 
                                eeprom@0 {
-                                       at25,byte-len = <0x80000>;
-                                       at25,addr-mode = <4>;
-                                       at25,page-size = <256>;
-
                                        compatible = "atmel,at25";
                                        reg = <0>;
                                        spi-max-frequency = <1000000>;
+
+                                       address-width = <24>;
+                                       pagesize = <256>;
+                                       size = <0x80000>;
                                };
                        };
                };