linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: geert@linux-m68k.org (Geert Uytterhoeven)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 06/11] ARM: shmobile: r8a7791/koelsch dts: Rename label spi to qspi, add spi0 alias
Date: Tue, 25 Feb 2014 11:30:14 +0100	[thread overview]
Message-ID: <1393324219-3317-7-git-send-email-geert@linux-m68k.org> (raw)
In-Reply-To: <1393324219-3317-1-git-send-email-geert@linux-m68k.org>

From: Geert Uytterhoeven <geert+renesas@linux-m68k.org>

Prepare for the advent of MSIOF SPI, which will be spi1 to spi3.

Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org>
Cc: devicetree at vger.kernel.org
---
v2:
  - No changes

 arch/arm/boot/dts/r8a7791-koelsch.dts |    4 ++--
 arch/arm/boot/dts/r8a7791.dtsi        |    3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/arch/arm/boot/dts/r8a7791-koelsch.dts b/arch/arm/boot/dts/r8a7791-koelsch.dts
index 603af8caae5b..03508cc73e8b 100644
--- a/arch/arm/boot/dts/r8a7791-koelsch.dts
+++ b/arch/arm/boot/dts/r8a7791-koelsch.dts
@@ -157,7 +157,7 @@
 		renesas,function = "intc";
 	};
 
-	qspi_pins: spi {
+	qspi_pins: spi0 {
 		renesas,groups = "qspi_ctrl", "qspi_data4";
 		renesas,function = "qspi";
 	};
@@ -182,7 +182,7 @@
 	status = "okay";
 };
 
-&spi {
+&qspi {
 	pinctrl-0 = <&qspi_pins>;
 	pinctrl-names = "default";
 
diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
index cde7bc486f22..3bc4546fa9c5 100644
--- a/arch/arm/boot/dts/r8a7791.dtsi
+++ b/arch/arm/boot/dts/r8a7791.dtsi
@@ -27,6 +27,7 @@
 		i2c3 = &i2c3;
 		i2c4 = &i2c4;
 		i2c5 = &i2c5;
+		spi0 = &qspi;
 	};
 
 	cpus {
@@ -762,7 +763,7 @@
 		};
 	};
 
-	spi: spi at e6b10000 {
+	qspi: spi at e6b10000 {
 		compatible = "renesas,qspi-r8a7791", "renesas,qspi";
 		reg = <0 0xe6b10000 0 0x2c>;
 		interrupts = <0 184 IRQ_TYPE_LEVEL_HIGH>;
-- 
1.7.9.5

  parent reply	other threads:[~2014-02-25 10:30 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-02-25 10:30 [PATCH v2 00/11] ARM: shmobile: MSIOF integration on r8a7790/lager and r8a7791/koelsch Geert Uytterhoeven
2014-02-25 10:30 ` [PATCH v2 01/11] ARM: shmobile: r8a7790: Add MSIOF clocks Geert Uytterhoeven
2014-02-25 10:30 ` [PATCH v2 02/11] ARM: shmobile: r8a7791: " Geert Uytterhoeven
2014-02-25 10:30 ` [PATCH v2 03/11] ARM: shmobile: lager legacy: Add MSIOF support Geert Uytterhoeven
2014-02-25 10:30 ` [PATCH v2 04/11] ARM: shmobile: koelsch " Geert Uytterhoeven
2014-02-25 10:30 ` [PATCH v2 05/11] ARM: shmobile: r8a7790/lager dts: Rename label spi to qspi, add spi0 alias Geert Uytterhoeven
2014-02-25 10:30 ` Geert Uytterhoeven [this message]
2014-02-25 10:30 ` [PATCH v2 07/11] ARM: shmobile: r8a7790 dtsi: Add MSIOF nodes and aliases Geert Uytterhoeven
2014-02-25 10:30 ` [PATCH v2 08/11] ARM: shmobile: r8a7791 " Geert Uytterhoeven
2014-02-25 10:30 ` [PATCH v2 09/11] ARM: shmobile: lager dts: Add MSIOF nodes Geert Uytterhoeven
2014-02-25 10:30 ` [PATCH v2 10/11] ARM: shmobile: koelsch " Geert Uytterhoeven
2014-02-25 10:30 ` [PATCH v2 11/11] ARM: shmobile: koelsch/lager/multi defconfig: Enable MSIOF Geert Uytterhoeven
2014-03-07  0:24   ` Simon Horman
2014-03-05  8:31 ` [PATCH v2 00/11] ARM: shmobile: MSIOF integration on r8a7790/lager and r8a7791/koelsch Magnus Damm
2014-03-06  1:38   ` Simon Horman
2014-03-06  2:25     ` Magnus Damm
2014-03-06 15:28       ` Geert Uytterhoeven
2014-03-07  0:24         ` Simon Horman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1393324219-3317-7-git-send-email-geert@linux-m68k.org \
    --to=geert@linux-m68k.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).