| From 5997a197243322be6b5db3a2cb9320f42c024cad Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 13 Sep 2018 13:12:34 -0500 |
| Subject: ARM: dts: ste: Fix SPI controller node names |
| |
| From: Rob Herring <robh@kernel.org> |
| |
| [ Upstream commit 2f967f9e9fa076affb711da1a8389b5d33814fc6 ] |
| |
| SPI controller nodes should be named 'spi' rather than 'ssp'. Fixing the |
| name enables dtc SPI bus checks. |
| |
| Signed-off-by: Rob Herring <robh@kernel.org> |
| Signed-off-by: Linus Walleij <linus.walleij@linaro.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| arch/arm/boot/dts/ste-dbx5x0.dtsi | 4 ++-- |
| arch/arm/boot/dts/ste-hrefprev60.dtsi | 2 +- |
| arch/arm/boot/dts/ste-snowball.dts | 2 +- |
| arch/arm/boot/dts/ste-u300.dts | 2 +- |
| 4 files changed, 5 insertions(+), 5 deletions(-) |
| |
| diff --git a/arch/arm/boot/dts/ste-dbx5x0.dtsi b/arch/arm/boot/dts/ste-dbx5x0.dtsi |
| index 3dc0028e108b3..986767735e249 100644 |
| --- a/arch/arm/boot/dts/ste-dbx5x0.dtsi |
| +++ b/arch/arm/boot/dts/ste-dbx5x0.dtsi |
| @@ -878,7 +878,7 @@ |
| power-domains = <&pm_domains DOMAIN_VAPE>; |
| }; |
| |
| - ssp@80002000 { |
| + spi@80002000 { |
| compatible = "arm,pl022", "arm,primecell"; |
| reg = <0x80002000 0x1000>; |
| interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>; |
| @@ -892,7 +892,7 @@ |
| power-domains = <&pm_domains DOMAIN_VAPE>; |
| }; |
| |
| - ssp@80003000 { |
| + spi@80003000 { |
| compatible = "arm,pl022", "arm,primecell"; |
| reg = <0x80003000 0x1000>; |
| interrupts = <GIC_SPI 52 IRQ_TYPE_LEVEL_HIGH>; |
| diff --git a/arch/arm/boot/dts/ste-hrefprev60.dtsi b/arch/arm/boot/dts/ste-hrefprev60.dtsi |
| index 3f14b4df69b4e..94eeb7f1c9478 100644 |
| --- a/arch/arm/boot/dts/ste-hrefprev60.dtsi |
| +++ b/arch/arm/boot/dts/ste-hrefprev60.dtsi |
| @@ -57,7 +57,7 @@ |
| }; |
| }; |
| |
| - ssp@80002000 { |
| + spi@80002000 { |
| /* |
| * On the first generation boards, this SSP/SPI port was connected |
| * to the AB8500. |
| diff --git a/arch/arm/boot/dts/ste-snowball.dts b/arch/arm/boot/dts/ste-snowball.dts |
| index b0b94d0530985..603890461ae0f 100644 |
| --- a/arch/arm/boot/dts/ste-snowball.dts |
| +++ b/arch/arm/boot/dts/ste-snowball.dts |
| @@ -376,7 +376,7 @@ |
| pinctrl-1 = <&i2c3_sleep_mode>; |
| }; |
| |
| - ssp@80002000 { |
| + spi@80002000 { |
| pinctrl-names = "default"; |
| pinctrl-0 = <&ssp0_snowball_mode>; |
| }; |
| diff --git a/arch/arm/boot/dts/ste-u300.dts b/arch/arm/boot/dts/ste-u300.dts |
| index 62ecb6a2fa39e..1bd1aba3322f1 100644 |
| --- a/arch/arm/boot/dts/ste-u300.dts |
| +++ b/arch/arm/boot/dts/ste-u300.dts |
| @@ -442,7 +442,7 @@ |
| dma-names = "rx"; |
| }; |
| |
| - spi: ssp@c0006000 { |
| + spi: spi@c0006000 { |
| compatible = "arm,pl022", "arm,primecell"; |
| reg = <0xc0006000 0x1000>; |
| interrupt-parent = <&vica>; |
| -- |
| 2.20.1 |
| |