| Message ID | 20200718205019.184927-3-lkundrak@v3.sk (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | f45200b67ea381d784dca8088dc31cbf06bd17cc |
| Headers | show |
| Series | MMP DTS updates for 5.9 | expand |
On 7/18/2020 1:50 PM, Lubomir Rintel wrote: > On the XO-1.75, this node represents a bus interface that operates in slave > mode and thus is only able to accommodate a single subnode; no address > cells are necessary. > > The Documentation/devicetree/bindings/spi/spi-controller.yaml binding > prefers that we drop the property instead of setting it to zero. > > This fixes a DT validation error: > > arch/arm/boot/dts/mmp2-olpc-xo-1-75.dt.yaml: spi@d4037000: > { ... } is valid under each of {'required': ['spi-slave']}, > {'required': ['#address-cells']} > > We also need to drop #size-cells: > > arch/arm/boot/dts/mmp2-olpc-xo-1-75.dt.yaml: spi@d4037000: > '#address-cells' is a dependency of '#size-cells' > > Signed-off-by: Lubomir Rintel <lkundrak@v3.sk> This patch causes the following warning to be issued when validating the mmp2 DTS files against specific bindings: 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.dt.yaml: Warning (spi_bus_reg): Failed prerequisite 'spi_bus_bridge' Is there a fix that we can apply to silence this warning? Thanks!
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 02f4005a654b9..392f546f7915b 100644 --- a/arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts +++ b/arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts @@ -221,7 +221,8 @@ accelerometer@1d { }; &ssp3 { - #address-cells = <0>; + /delete-property/ #address-cells; + /delete-property/ #size-cells; spi-slave; status = "okay"; ready-gpio = <&gpio 125 GPIO_ACTIVE_HIGH>;
On the XO-1.75, this node represents a bus interface that operates in slave mode and thus is only able to accommodate a single subnode; no address cells are necessary. The Documentation/devicetree/bindings/spi/spi-controller.yaml binding prefers that we drop the property instead of setting it to zero. This fixes a DT validation error: arch/arm/boot/dts/mmp2-olpc-xo-1-75.dt.yaml: spi@d4037000: { ... } is valid under each of {'required': ['spi-slave']}, {'required': ['#address-cells']} We also need to drop #size-cells: arch/arm/boot/dts/mmp2-olpc-xo-1-75.dt.yaml: spi@d4037000: '#address-cells' is a dependency of '#size-cells' Signed-off-by: Lubomir Rintel <lkundrak@v3.sk> --- arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)