| From 52a52ae00188d0a19ab27e3752b308b73dab44bb Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 13 Sep 2018 13:12:42 -0500 |
| Subject: arm64: dts: broadcom: Fix I2C and SPI bus warnings |
| |
| From: Rob Herring <robh@kernel.org> |
| |
| [ Upstream commit 7cdbe45da1a189e744e6801aebb462ee47235580 ] |
| |
| dtc has new checks for I2C and SPI buses. Fix the warnings in node names |
| and unit-addresses. |
| |
| arch/arm64/boot/dts/broadcom/stingray/bcm958742k.dtb: Warning (i2c_bus_reg): /hsls/i2c@e0000/pcf8574@20: I2C bus unit address format error, expected "27" |
| arch/arm64/boot/dts/broadcom/stingray/bcm958742t.dtb: Warning (i2c_bus_reg): /hsls/i2c@e0000/pcf8574@20: I2C bus unit address format error, expected "27" |
| arch/arm64/boot/dts/broadcom/stingray/bcm958742k.dtb: Warning (spi_bus_bridge): /hsls/ssp@180000: node name for SPI buses should be 'spi' |
| arch/arm64/boot/dts/broadcom/stingray/bcm958742k.dtb: Warning (spi_bus_bridge): /hsls/ssp@190000: node name for SPI buses should be 'spi' |
| |
| Cc: Ray Jui <rjui@broadcom.com> |
| Cc: Scott Branden <sbranden@broadcom.com> |
| Cc: Jon Mason <jonmason@broadcom.com> |
| Cc: bcm-kernel-feedback-list@broadcom.com |
| Signed-off-by: Rob Herring <robh@kernel.org> |
| Acked-by: Scott Branden <sbranden@broadcom.com> |
| Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi | 4 ++-- |
| arch/arm64/boot/dts/broadcom/stingray/bcm958742-base.dtsi | 2 +- |
| arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi | 4 ++-- |
| 3 files changed, 5 insertions(+), 5 deletions(-) |
| |
| diff --git a/arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi b/arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi |
| index 1a406a76c86a2..ea854f689fda8 100644 |
| --- a/arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi |
| +++ b/arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi |
| @@ -639,7 +639,7 @@ |
| status = "disabled"; |
| }; |
| |
| - ssp0: ssp@66180000 { |
| + ssp0: spi@66180000 { |
| compatible = "arm,pl022", "arm,primecell"; |
| reg = <0x66180000 0x1000>; |
| interrupts = <GIC_SPI 404 IRQ_TYPE_LEVEL_HIGH>; |
| @@ -650,7 +650,7 @@ |
| status = "disabled"; |
| }; |
| |
| - ssp1: ssp@66190000 { |
| + ssp1: spi@66190000 { |
| compatible = "arm,pl022", "arm,primecell"; |
| reg = <0x66190000 0x1000>; |
| interrupts = <GIC_SPI 405 IRQ_TYPE_LEVEL_HIGH>; |
| diff --git a/arch/arm64/boot/dts/broadcom/stingray/bcm958742-base.dtsi b/arch/arm64/boot/dts/broadcom/stingray/bcm958742-base.dtsi |
| index bc299c3d90683..a9b92e52d50e8 100644 |
| --- a/arch/arm64/boot/dts/broadcom/stingray/bcm958742-base.dtsi |
| +++ b/arch/arm64/boot/dts/broadcom/stingray/bcm958742-base.dtsi |
| @@ -138,7 +138,7 @@ |
| &i2c1 { |
| status = "okay"; |
| |
| - pcf8574: pcf8574@20 { |
| + pcf8574: pcf8574@27 { |
| compatible = "nxp,pcf8574a"; |
| gpio-controller; |
| #gpio-cells = <2>; |
| diff --git a/arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi b/arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi |
| index 84101ea1fd2cb..ff714fcbac68d 100644 |
| --- a/arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi |
| +++ b/arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi |
| @@ -520,7 +520,7 @@ |
| status = "disabled"; |
| }; |
| |
| - ssp0: ssp@180000 { |
| + ssp0: spi@180000 { |
| compatible = "arm,pl022", "arm,primecell"; |
| reg = <0x00180000 0x1000>; |
| interrupts = <GIC_SPI 187 IRQ_TYPE_LEVEL_HIGH>; |
| @@ -532,7 +532,7 @@ |
| status = "disabled"; |
| }; |
| |
| - ssp1: ssp@190000 { |
| + ssp1: spi@190000 { |
| compatible = "arm,pl022", "arm,primecell"; |
| reg = <0x00190000 0x1000>; |
| interrupts = <GIC_SPI 188 IRQ_TYPE_LEVEL_HIGH>; |
| -- |
| 2.20.1 |
| |
