| From 4769132ac322d3e50e6c9b52348a97b9aab03ed2 Mon Sep 17 00:00:00 2001 |
| From: Geert Uytterhoeven <geert+renesas@linux-m68k.org> |
| Date: Tue, 25 Feb 2014 11:30:13 +0100 |
| Subject: ARM: shmobile: r8a7790/lager dts: Rename label spi to qspi, add spi0 |
| alias |
| |
| Prepare for the advent of MSIOF SPI, which will be spi1 to spi4. |
| |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org> |
| Acked-by: Magnus Damm <damm@opensource.se> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit fad6d45cdf8269d6d1c6784792c74c53e2304b32) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/boot/dts/r8a7790-lager.dts | 4 ++-- |
| arch/arm/boot/dts/r8a7790.dtsi | 3 ++- |
| 2 files changed, 4 insertions(+), 3 deletions(-) |
| |
| diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts |
| index d01048ab3e77..46c263c80438 100644 |
| --- a/arch/arm/boot/dts/r8a7790-lager.dts |
| +++ b/arch/arm/boot/dts/r8a7790-lager.dts |
| @@ -155,7 +155,7 @@ |
| renesas,function = "mmc1"; |
| }; |
| |
| - qspi_pins: spi { |
| + qspi_pins: spi0 { |
| renesas,groups = "qspi_ctrl", "qspi_data4"; |
| renesas,function = "qspi"; |
| }; |
| @@ -190,7 +190,7 @@ |
| status = "okay"; |
| }; |
| |
| -&spi { |
| +&qspi { |
| pinctrl-0 = <&qspi_pins>; |
| pinctrl-names = "default"; |
| |
| diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi |
| index 10b326bdf831..dc72302ab6a4 100644 |
| --- a/arch/arm/boot/dts/r8a7790.dtsi |
| +++ b/arch/arm/boot/dts/r8a7790.dtsi |
| @@ -24,6 +24,7 @@ |
| i2c1 = &i2c1; |
| i2c2 = &i2c2; |
| i2c3 = &i2c3; |
| + spi0 = &qspi; |
| }; |
| |
| cpus { |
| @@ -765,7 +766,7 @@ |
| }; |
| }; |
| |
| - spi: spi@e6b10000 { |
| + qspi: spi@e6b10000 { |
| compatible = "renesas,qspi-r8a7790", "renesas,qspi"; |
| reg = <0 0xe6b10000 0 0x2c>; |
| interrupts = <0 184 IRQ_TYPE_LEVEL_HIGH>; |
| -- |
| 2.1.2 |
| |