| From bdc8eaf2871b31028e84fec072976b603da2ea86 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 13 Sep 2018 13:12:41 -0500 |
| Subject: arm64: dts: meson: Fix erroneous SPI bus warnings |
| |
| From: Rob Herring <robh@kernel.org> |
| |
| [ Upstream commit 68ecb5c1920c5b98b1e717fd2349fba2ee5d4031 ] |
| |
| dtc has new checks for SPI buses. The meson dts files have 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/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dtb: Warning (spi_bus_bridge): /soc/periphs@c8834000/pinctrl@4b0/spi: incorrect #address-cells for SPI bus |
| |
| Cc: Carlo Caione <carlo@caione.org> |
| Cc: Kevin Hilman <khilman@baylibre.com> |
| Cc: linux-amlogic@lists.infradead.org |
| Signed-off-by: Rob Herring <robh@kernel.org> |
| Signed-off-by: Kevin Hilman <khilman@baylibre.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 2 +- |
| arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 2 +- |
| 2 files changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi |
| index 98cbba6809caa..1ade7e486828c 100644 |
| --- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi |
| +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi |
| @@ -390,7 +390,7 @@ |
| }; |
| }; |
| |
| - spi_pins: spi { |
| + spi_pins: spi-pins { |
| mux { |
| groups = "spi_miso", |
| "spi_mosi", |
| diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi |
| index c87a80e9bcc6a..8f0bb3c44bd6d 100644 |
| --- a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi |
| +++ b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi |
| @@ -337,7 +337,7 @@ |
| }; |
| }; |
| |
| - spi_pins: spi { |
| + spi_pins: spi-pins { |
| mux { |
| groups = "spi_miso", |
| "spi_mosi", |
| -- |
| 2.20.1 |
| |