ARM: dts: aspeed: Adjust "reg" property of FMC/SPI controllers

This is compatible with the current driver and addresses issues when
running 'make dt_binding_check'.

Cc: Chin-Ting Kuo <chin-ting_kuo@aspeedtech.com>
Tested-by: Joel Stanley <joel@jms.id.au>
Tested-by: Tao Ren <rentao.bupt@gmail.com>
Tested-by: Jae Hyun Yoo <quic_jaehyoo@quicinc.com>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Link: https://lore.kernel.org/r/20220509175616.1089346-2-clg@kaod.org
Signed-off-by: Joel Stanley <joel@jms.id.au>

diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi
index fa8b581c3d6c1f1f1c3e9bd1b7bef6ad506783b0..3b7b98e787e77da44934d8128f4740d60ef26e82 100644 (file)
--- a/arch/arm/boot/dts/aspeed-g4.dtsi
+++ b/arch/arm/boot/dts/aspeed-g4.dtsi
@@ -54,8 +54,7 @@
                ranges;
 
                fmc: spi@1e620000 {
-                       reg = < 0x1e620000 0x94
-                               0x20000000 0x10000000 >;
+                       reg = <0x1e620000 0x94>, <0x20000000 0x10000000>;
                        #address-cells = <1>;
                        #size-cells = <0>;
                        compatible = "aspeed,ast2400-fmc";
@@ -91,8 +90,7 @@
                };
 
                spi: spi@1e630000 {
-                       reg = < 0x1e630000 0x18
-                               0x30000000 0x10000000 >;
+                       reg = <0x1e630000 0x18>, <0x30000000 0x10000000>;
                        #address-cells = <1>;
                        #size-cells = <0>;
                        compatible = "aspeed,ast2400-spi";

diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi
index 4147b397c88309e7d93df3d861dc58f6d926c26f..1e727cbaab143c58e2cdff56d08680c15d1cd0af 100644 (file)
--- a/arch/arm/boot/dts/aspeed-g5.dtsi
+++ b/arch/arm/boot/dts/aspeed-g5.dtsi
@@ -55,8 +55,7 @@
                ranges;
 
                fmc: spi@1e620000 {
-                       reg = < 0x1e620000 0xc4
-                               0x20000000 0x10000000 >;
+                       reg = <0x1e620000 0xc4>, <0x20000000 0x10000000>;
                        #address-cells = <1>;
                        #size-cells = <0>;
                        compatible = "aspeed,ast2500-fmc";
@@ -84,8 +83,7 @@
                };
 
                spi1: spi@1e630000 {
-                       reg = < 0x1e630000 0xc4
-                               0x30000000 0x08000000 >;
+                       reg = <0x1e630000 0xc4>, <0x30000000 0x08000000>;
                        #address-cells = <1>;
                        #size-cells = <0>;
                        compatible = "aspeed,ast2500-spi";
@@ -106,8 +104,7 @@
                };
 
                spi2: spi@1e631000 {
-                       reg = < 0x1e631000 0xc4
-                               0x38000000 0x08000000 >;
+                       reg = <0x1e631000 0xc4>, <0x38000000 0x08000000>;
                        #address-cells = <1>;
                        #size-cells = <0>;
                        compatible = "aspeed,ast2500-spi";

diff --git a/arch/arm/boot/dts/aspeed-g6.dtsi b/arch/arm/boot/dts/aspeed-g6.dtsi
index 9d2a0ce4ca061d7ffd47e501ba11623a43101f71..ff76c29965e11b82f7b6d23f8ab1d416d3612f4b 100644 (file)
--- a/arch/arm/boot/dts/aspeed-g6.dtsi
+++ b/arch/arm/boot/dts/aspeed-g6.dtsi
@@ -95,8 +95,7 @@
                        };
 
                fmc: spi@1e620000 {
-                       reg = < 0x1e620000 0xc4
-                               0x20000000 0x10000000 >;
+                       reg = <0x1e620000 0xc4>, <0x20000000 0x10000000>;
                        #address-cells = <1>;
                        #size-cells = <0>;
                        compatible = "aspeed,ast2600-fmc";
@@ -124,8 +123,7 @@
                };
 
                spi1: spi@1e630000 {
-                       reg = < 0x1e630000 0xc4
-                               0x30000000 0x10000000 >;
+                       reg = <0x1e630000 0xc4>, <0x30000000 0x10000000>;
                        #address-cells = <1>;
                        #size-cells = <0>;
                        compatible = "aspeed,ast2600-spi";
@@ -146,8 +144,7 @@
                };
 
                spi2: spi@1e631000 {
-                       reg = < 0x1e631000 0xc4
-                               0x50000000 0x10000000 >;
+                       reg = <0x1e631000 0xc4>, <0x50000000 0x10000000>;
                        #address-cells = <1>;
                        #size-cells = <0>;
                        compatible = "aspeed,ast2600-spi";