| Message ID | 20220302173114.927476-3-clg@kaod.org (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | spi: spi-mem: Add driver for Aspeed SMC controllers | expand |
On Wed, 2 Mar 2022 at 17:32, Cédric Le Goater <clg@kaod.org> wrote: > > This is compatible with the current driver and addresses issues when > running 'make dt_binding_check'. Hey Rob, why does the checking rule complain about this style of reg property? > > Cc: Chin-Ting Kuo <chin-ting_kuo@aspeedtech.com> > Signed-off-by: Cédric Le Goater <clg@kaod.org> > --- > arch/arm/boot/dts/aspeed-g4.dtsi | 6 ++---- > arch/arm/boot/dts/aspeed-g5.dtsi | 9 +++------ > arch/arm/boot/dts/aspeed-g6.dtsi | 9 +++------ > 3 files changed, 8 insertions(+), 16 deletions(-) > > diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi > index f14dace34c5a..9ae67e83cf60 100644 > --- a/arch/arm/boot/dts/aspeed-g4.dtsi > +++ b/arch/arm/boot/dts/aspeed-g4.dtsi > @@ -54,8 +54,7 @@ ahb { > 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 @@ flash@4 { > }; > > 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 7495f93c5069..c3e0a8e13c8a 100644 > --- a/arch/arm/boot/dts/aspeed-g5.dtsi > +++ b/arch/arm/boot/dts/aspeed-g5.dtsi > @@ -55,8 +55,7 @@ ahb { > 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 @@ flash@2 { > }; > > 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 @@ flash@1 { > }; > > 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 c32e87fad4dc..1ad05dde19d2 100644 > --- a/arch/arm/boot/dts/aspeed-g6.dtsi > +++ b/arch/arm/boot/dts/aspeed-g6.dtsi > @@ -95,8 +95,7 @@ gic: interrupt-controller@40461000 { > }; > > 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 @@ flash@2 { > }; > > 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 @@ flash@1 { > }; > > spi2: spi@1e631000 { > - reg = < 0x1e631000 0xc4 > - 0x50000000 0x10000000 >; > + reg = <0x1e631000 0xc4>, <0x50000000 0x10000000>; > #address-cells = <1>; > #size-cells = <0>; > compatible = "aspeed,ast2600-spi"; > -- > 2.34.1 >
diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi index f14dace34c5a..9ae67e83cf60 100644 --- a/arch/arm/boot/dts/aspeed-g4.dtsi +++ b/arch/arm/boot/dts/aspeed-g4.dtsi @@ -54,8 +54,7 @@ ahb { 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 @@ flash@4 { }; 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 7495f93c5069..c3e0a8e13c8a 100644 --- a/arch/arm/boot/dts/aspeed-g5.dtsi +++ b/arch/arm/boot/dts/aspeed-g5.dtsi @@ -55,8 +55,7 @@ ahb { 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 @@ flash@2 { }; 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 @@ flash@1 { }; 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 c32e87fad4dc..1ad05dde19d2 100644 --- a/arch/arm/boot/dts/aspeed-g6.dtsi +++ b/arch/arm/boot/dts/aspeed-g6.dtsi @@ -95,8 +95,7 @@ gic: interrupt-controller@40461000 { }; 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 @@ flash@2 { }; 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 @@ flash@1 { }; spi2: spi@1e631000 { - reg = < 0x1e631000 0xc4 - 0x50000000 0x10000000 >; + reg = <0x1e631000 0xc4>, <0x50000000 0x10000000>; #address-cells = <1>; #size-cells = <0>; compatible = "aspeed,ast2600-spi";
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> Signed-off-by: Cédric Le Goater <clg@kaod.org> --- arch/arm/boot/dts/aspeed-g4.dtsi | 6 ++---- arch/arm/boot/dts/aspeed-g5.dtsi | 9 +++------ arch/arm/boot/dts/aspeed-g6.dtsi | 9 +++------ 3 files changed, 8 insertions(+), 16 deletions(-)