diff mbox series

[v2,1/1] ARM: dts: mmp2-olpc-xo-1-75: clear the warnings when make dtbs

Message ID 20201207084752.1665-2-thunder.leizhen@huawei.com
State Accepted
Commit 387270cb0b4035491c4812effd8b5af0e385a66c
Headers show
Series ARM: dts: mmp2-olpc-xo-1-75: clear the warnings when make dtbs | expand

Commit Message

Zhen Lei Dec. 7, 2020, 8:47 a.m. UTC
The check_spi_bus_bridge() in scripts/dtc/checks.c requires that the node
have "spi-slave" property must with "#address-cells = <0>" and
"#size-cells = <0>". But currently both "#address-cells" and "#size-cells"
properties are deleted, the corresponding default values are 2 and 1. As a
result, the check fails and below warnings is displayed.

arch/arm/boot/dts/mmp2.dtsi:472.23-480.6: Warning (spi_bus_bridge): \
/soc/apb@d4000000/spi@d4037000: incorrect #address-cells for SPI bus
  also defined at arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts:225.7-237.3
arch/arm/boot/dts/mmp2.dtsi:472.23-480.6: Warning (spi_bus_bridge): \
/soc/apb@d4000000/spi@d4037000: incorrect #size-cells for SPI bus
  also defined at arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts:225.7-237.3
arch/arm/boot/dts/mmp2-olpc-xo-1-75.dtb: Warning (spi_bus_reg): \
Failed prerequisite 'spi_bus_bridge'

Because the value of "#size-cells" is already defined as zero in the node
"ssp3: spi@d4037000" in arch/arm/boot/dts/mmp2.dtsi. So we only need to
explicitly add "#address-cells = <0>" and keep "#size-cells" no change.

Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>

---
 arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
1.8.3

Comments

Arnd Bergmann Dec. 8, 2020, 1:58 p.m. UTC | #1
On Mon, Dec 7, 2020 at 9:47 AM Zhen Lei <thunder.leizhen@huawei.com> wrote:
>

> The check_spi_bus_bridge() in scripts/dtc/checks.c requires that the node

> have "spi-slave" property must with "#address-cells = <0>" and

> "#size-cells = <0>". But currently both "#address-cells" and "#size-cells"

> properties are deleted, the corresponding default values are 2 and 1. As a

> result, the check fails and below warnings is displayed.

>

> arch/arm/boot/dts/mmp2.dtsi:472.23-480.6: Warning (spi_bus_bridge): \

> /soc/apb@d4000000/spi@d4037000: incorrect #address-cells for SPI bus

>   also defined at arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts:225.7-237.3

> arch/arm/boot/dts/mmp2.dtsi:472.23-480.6: Warning (spi_bus_bridge): \

> /soc/apb@d4000000/spi@d4037000: incorrect #size-cells for SPI bus

>   also defined at arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts:225.7-237.3

> arch/arm/boot/dts/mmp2-olpc-xo-1-75.dtb: Warning (spi_bus_reg): \

> Failed prerequisite 'spi_bus_bridge'

>

> Because the value of "#size-cells" is already defined as zero in the node

> "ssp3: spi@d4037000" in arch/arm/boot/dts/mmp2.dtsi. So we only need to

> explicitly add "#address-cells = <0>" and keep "#size-cells" no change.

>

> Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>


Right, I already sent the same patch earlier.

Lubomir, can I apply this to the fixes branch?

>  arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts | 2 +-

>  1 file changed, 1 insertion(+), 1 deletion(-)

>

> diff --git a/arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts b/arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts

> index adde62d6fce73b9..82da44dacba7172 100644

> --- a/arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts

> +++ b/arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts

> @@ -224,7 +224,7 @@

>

>  &ssp3 {

>         /delete-property/ #address-cells;

> -       /delete-property/ #size-cells;

> +       #address-cells = <0>;

>         spi-slave;

>         status = "okay";

>         ready-gpios = <&gpio 125 GPIO_ACTIVE_HIGH>;

> --

> 1.8.3

>

>
Zhen Lei Dec. 9, 2020, 7:02 a.m. UTC | #2
On 2020/12/8 21:58, Arnd Bergmann wrote:
> On Mon, Dec 7, 2020 at 9:47 AM Zhen Lei <thunder.leizhen@huawei.com> wrote:

>>

>> The check_spi_bus_bridge() in scripts/dtc/checks.c requires that the node

>> have "spi-slave" property must with "#address-cells = <0>" and

>> "#size-cells = <0>". But currently both "#address-cells" and "#size-cells"

>> properties are deleted, the corresponding default values are 2 and 1. As a

>> result, the check fails and below warnings is displayed.

>>

>> arch/arm/boot/dts/mmp2.dtsi:472.23-480.6: Warning (spi_bus_bridge): \

>> /soc/apb@d4000000/spi@d4037000: incorrect #address-cells for SPI bus

>>   also defined at arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts:225.7-237.3

>> arch/arm/boot/dts/mmp2.dtsi:472.23-480.6: Warning (spi_bus_bridge): \

>> /soc/apb@d4000000/spi@d4037000: incorrect #size-cells for SPI bus

>>   also defined at arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts:225.7-237.3

>> arch/arm/boot/dts/mmp2-olpc-xo-1-75.dtb: Warning (spi_bus_reg): \

>> Failed prerequisite 'spi_bus_bridge'

>>

>> Because the value of "#size-cells" is already defined as zero in the node

>> "ssp3: spi@d4037000" in arch/arm/boot/dts/mmp2.dtsi. So we only need to

>> explicitly add "#address-cells = <0>" and keep "#size-cells" no change.

>>

>> Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>

> 

> Right, I already sent the same patch earlier.


Oh, sorry, I don't known it. If you send it earlier, please apply your patch!

> 

> Lubomir, can I apply this to the fixes branch?


This fix is really should be considered to merge into v5.10.

> 

>>  arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts | 2 +-

>>  1 file changed, 1 insertion(+), 1 deletion(-)

>>

>> diff --git a/arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts b/arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts

>> index adde62d6fce73b9..82da44dacba7172 100644

>> --- a/arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts

>> +++ b/arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts

>> @@ -224,7 +224,7 @@

>>

>>  &ssp3 {

>>         /delete-property/ #address-cells;

>> -       /delete-property/ #size-cells;

>> +       #address-cells = <0>;

>>         spi-slave;

>>         status = "okay";

>>         ready-gpios = <&gpio 125 GPIO_ACTIVE_HIGH>;

>> --

>> 1.8.3

>>

>>

> 

> .

>
diff mbox series

Patch

diff --git a/arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts b/arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts
index adde62d6fce73b9..82da44dacba7172 100644
--- a/arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts
+++ b/arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts
@@ -224,7 +224,7 @@ 
 
 &ssp3 {
 	/delete-property/ #address-cells;
-	/delete-property/ #size-cells;
+	#address-cells = <0>;
 	spi-slave;
 	status = "okay";
 	ready-gpios = <&gpio 125 GPIO_ACTIVE_HIGH>;