| From 7bb1cd8458705c00e36557801f6eb3c5209a78dd Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 13 Sep 2018 13:12:36 -0500 |
| Subject: ARM: dts: rockchip: Fix erroneous SPI bus dtc warnings on rk3036 |
| |
| From: Rob Herring <robh@kernel.org> |
| |
| [ Upstream commit 131c3eb428ccd5f0c784b9edb4f72ec296a045d2 ] |
| |
| dtc has new checks for SPI buses. The rk3036 dts file has a node named |
| spi' which causes false positive warnings. As the node is a pinctrl child |
| node, change the node name to be 'spi-pins' to fix the warnings. |
| |
| arch/arm/boot/dts/rk3036-evb.dtb: Warning (spi_bus_bridge): /pinctrl/spi: incorrect #address-cells for SPI bus |
| arch/arm/boot/dts/rk3036-kylin.dtb: Warning (spi_bus_bridge): /pinctrl/spi: incorrect #address-cells for SPI bus |
| arch/arm/boot/dts/rk3036-evb.dtb: Warning (spi_bus_bridge): /pinctrl/spi: incorrect #size-cells for SPI bus |
| arch/arm/boot/dts/rk3036-kylin.dtb: Warning (spi_bus_bridge): /pinctrl/spi: incorrect #size-cells for SPI bus |
| |
| Cc: Heiko Stuebner <heiko@sntech.de> |
| Cc: linux-rockchip@lists.infradead.org |
| Signed-off-by: Rob Herring <robh@kernel.org> |
| Signed-off-by: Heiko Stuebner <heiko@sntech.de> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| arch/arm/boot/dts/rk3036.dtsi | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi |
| index 67f57200d9a06..d560fc4051c5f 100644 |
| --- a/arch/arm/boot/dts/rk3036.dtsi |
| +++ b/arch/arm/boot/dts/rk3036.dtsi |
| @@ -733,7 +733,7 @@ |
| /* no rts / cts for uart2 */ |
| }; |
| |
| - spi { |
| + spi-pins { |
| spi_txd:spi-txd { |
| rockchip,pins = <1 29 RK_FUNC_3 &pcfg_pull_default>; |
| }; |
| -- |
| 2.20.1 |
| |
