* [GIT PULL 0/3] Second Round of Renesas ARM Based SoC DT Updates for v3.15
@ 2014-02-13 8:04 Simon Horman
2014-02-13 8:04 ` [PATCH 1/3] ARM: shmobile: r7s72100 dtsi: Add RSPI nodes Simon Horman
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Simon Horman @ 2014-02-13 8:04 UTC (permalink / raw)
To: linux-arm-kernel
Hi Olof, Hi Kevin, Hi Arnd,
please consider this second round of Renesas ARM based SoC DT updates for
v3.15.
This pull request is based on the first round of such updates, tagged as
renesas-dt-for-v3.15, which I have previously sent a pull-request for.
The following changes since commit 1f4c745b2c5a083c49dc11d2f0827d9a381f1ee1:
ARM: shmobile: r8a7790: Replace IRQ type numerical values with macros (2014-02-04 10:17:00 +0900)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-dt2-for-v3.15
for you to fetch changes up to e02ee513eed4bb780848a5cedbd4b39afb395d3e:
ARM: shmobile: koelsch dts: Add QSPI nodes (2014-02-06 20:36:12 +0900)
----------------------------------------------------------------
Second Round of Renesas ARM Based SoC DT Updates for v3.15
r8a7791 (R-Car M2) based Koelsch board
- Add QSPI nodes
r7s72100 (RZ/A1H) SoC
- Add RSPI nodes
----------------------------------------------------------------
Geert Uytterhoeven (3):
ARM: shmobile: r7s72100 dtsi: Add RSPI nodes
ARM: shmobile: r8a7791 dtsi: Add QSPI node
ARM: shmobile: koelsch dts: Add QSPI nodes
arch/arm/boot/dts/r7s72100-genmai-reference.dts | 2 +-
arch/arm/boot/dts/r7s72100.dtsi | 75 +++++++++++++++++++++++++
arch/arm/boot/dts/r8a7791-koelsch.dts | 36 ++++++++++++
arch/arm/boot/dts/r8a7791.dtsi | 12 ++++
4 files changed, 124 insertions(+), 1 deletion(-)
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/3] ARM: shmobile: r7s72100 dtsi: Add RSPI nodes
2014-02-13 8:04 [GIT PULL 0/3] Second Round of Renesas ARM Based SoC DT Updates for v3.15 Simon Horman
@ 2014-02-13 8:04 ` Simon Horman
2014-02-13 8:04 ` [PATCH 2/3] ARM: shmobile: r8a7791 dtsi: Add QSPI node Simon Horman
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Simon Horman @ 2014-02-13 8:04 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@linux-m68k.org>
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>
---
arch/arm/boot/dts/r7s72100-genmai-reference.dts | 2 +-
arch/arm/boot/dts/r7s72100.dtsi | 75 +++++++++++++++++++++++++
2 files changed, 76 insertions(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/r7s72100-genmai-reference.dts b/arch/arm/boot/dts/r7s72100-genmai-reference.dts
index da19c70..0849017 100644
--- a/arch/arm/boot/dts/r7s72100-genmai-reference.dts
+++ b/arch/arm/boot/dts/r7s72100-genmai-reference.dts
@@ -9,7 +9,7 @@
*/
/dts-v1/;
-/include/ "r7s72100.dtsi"
+#include "r7s72100.dtsi"
/ {
model = "Genmai";
diff --git a/arch/arm/boot/dts/r7s72100.dtsi b/arch/arm/boot/dts/r7s72100.dtsi
index 46b82aa..9be67a1 100644
--- a/arch/arm/boot/dts/r7s72100.dtsi
+++ b/arch/arm/boot/dts/r7s72100.dtsi
@@ -8,12 +8,22 @@
* kind, whether express or implied.
*/
+#include <dt-bindings/interrupt-controller/irq.h>
+
/ {
compatible = "renesas,r7s72100";
interrupt-parent = <&gic>;
#address-cells = <1>;
#size-cells = <1>;
+ aliases {
+ spi0 = &spi0;
+ spi1 = &spi1;
+ spi2 = &spi2;
+ spi3 = &spi3;
+ spi4 = &spi4;
+ };
+
cpus {
#address-cells = <1>;
#size-cells = <0>;
@@ -33,4 +43,69 @@
reg = <0xe8201000 0x1000>,
<0xe8202000 0x1000>;
};
+
+ spi0: spi at e800c800 {
+ compatible = "renesas,rspi-r7s72100", "renesas,rspi-rz";
+ reg = <0xe800c800 0x24>;
+ interrupts = <0 238 IRQ_TYPE_LEVEL_HIGH>,
+ <0 239 IRQ_TYPE_LEVEL_HIGH>,
+ <0 240 IRQ_TYPE_LEVEL_HIGH>;
+ interrupt-names = "error", "rx", "tx";
+ num-cs = <1>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ status = "disabled";
+ };
+
+ spi1: spi at e800d000 {
+ compatible = "renesas,rspi-r7s72100", "renesas,rspi-rz";
+ reg = <0xe800d000 0x24>;
+ interrupts = <0 241 IRQ_TYPE_LEVEL_HIGH>,
+ <0 242 IRQ_TYPE_LEVEL_HIGH>,
+ <0 243 IRQ_TYPE_LEVEL_HIGH>;
+ interrupt-names = "error", "rx", "tx";
+ num-cs = <1>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ status = "disabled";
+ };
+
+ spi2: spi at e800d800 {
+ compatible = "renesas,rspi-r7s72100", "renesas,rspi-rz";
+ reg = <0xe800d800 0x24>;
+ interrupts = <0 244 IRQ_TYPE_LEVEL_HIGH>,
+ <0 245 IRQ_TYPE_LEVEL_HIGH>,
+ <0 246 IRQ_TYPE_LEVEL_HIGH>;
+ interrupt-names = "error", "rx", "tx";
+ num-cs = <1>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ status = "disabled";
+ };
+
+ spi3: spi at e800e000 {
+ compatible = "renesas,rspi-r7s72100", "renesas,rspi-rz";
+ reg = <0xe800e000 0x24>;
+ interrupts = <0 247 IRQ_TYPE_LEVEL_HIGH>,
+ <0 248 IRQ_TYPE_LEVEL_HIGH>,
+ <0 249 IRQ_TYPE_LEVEL_HIGH>;
+ interrupt-names = "error", "rx", "tx";
+ num-cs = <1>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ status = "disabled";
+ };
+
+ spi4: spi at e800e800 {
+ compatible = "renesas,rspi-r7s72100", "renesas,rspi-rz";
+ reg = <0xe800e800 0x24>;
+ interrupts = <0 250 IRQ_TYPE_LEVEL_HIGH>,
+ <0 251 IRQ_TYPE_LEVEL_HIGH>,
+ <0 252 IRQ_TYPE_LEVEL_HIGH>;
+ interrupt-names = "error", "rx", "tx";
+ num-cs = <1>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ status = "disabled";
+ };
};
--
1.8.5.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/3] ARM: shmobile: r8a7791 dtsi: Add QSPI node
2014-02-13 8:04 [GIT PULL 0/3] Second Round of Renesas ARM Based SoC DT Updates for v3.15 Simon Horman
2014-02-13 8:04 ` [PATCH 1/3] ARM: shmobile: r7s72100 dtsi: Add RSPI nodes Simon Horman
@ 2014-02-13 8:04 ` Simon Horman
2014-02-13 8:04 ` [PATCH 3/3] ARM: shmobile: koelsch dts: Add QSPI nodes Simon Horman
2014-02-20 9:28 ` [GIT PULL 0/3] Second Round of Renesas ARM Based SoC DT Updates for v3.15 Olof Johansson
3 siblings, 0 replies; 5+ messages in thread
From: Simon Horman @ 2014-02-13 8:04 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@linux-m68k.org>
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>
---
arch/arm/boot/dts/r8a7791.dtsi | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
index d5cc362..240c4ec 100644
--- a/arch/arm/boot/dts/r8a7791.dtsi
+++ b/arch/arm/boot/dts/r8a7791.dtsi
@@ -710,4 +710,16 @@
clock-output-names = "scifa3", "scifa4", "scifa5";
};
};
+
+ spi: spi at e6b10000 {
+ compatible = "renesas,qspi-r8a7791", "renesas,qspi";
+ reg = <0 0xe6b10000 0 0x2c>;
+ interrupt-parent = <&gic>;
+ interrupts = <0 184 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp9_clks R8A7791_CLK_QSPI_MOD>;
+ num-cs = <1>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ status = "disabled";
+ };
};
--
1.8.5.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 3/3] ARM: shmobile: koelsch dts: Add QSPI nodes
2014-02-13 8:04 [GIT PULL 0/3] Second Round of Renesas ARM Based SoC DT Updates for v3.15 Simon Horman
2014-02-13 8:04 ` [PATCH 1/3] ARM: shmobile: r7s72100 dtsi: Add RSPI nodes Simon Horman
2014-02-13 8:04 ` [PATCH 2/3] ARM: shmobile: r8a7791 dtsi: Add QSPI node Simon Horman
@ 2014-02-13 8:04 ` Simon Horman
2014-02-20 9:28 ` [GIT PULL 0/3] Second Round of Renesas ARM Based SoC DT Updates for v3.15 Olof Johansson
3 siblings, 0 replies; 5+ messages in thread
From: Simon Horman @ 2014-02-13 8:04 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@linux-m68k.org>
Add pinctrl and SPI devices for QSPI on Koelsch.
Add Spansion s25fl512s SPI FLASH and MTD partitions.
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>
---
arch/arm/boot/dts/r8a7791-koelsch.dts | 36 +++++++++++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7791-koelsch.dts b/arch/arm/boot/dts/r8a7791-koelsch.dts
index 74f0985..d4b9bba 100644
--- a/arch/arm/boot/dts/r8a7791-koelsch.dts
+++ b/arch/arm/boot/dts/r8a7791-koelsch.dts
@@ -121,8 +121,44 @@
renesas,groups = "scif1_data_d";
renesas,function = "scif1";
};
+
+ qspi_pins: spi {
+ renesas,groups = "qspi_ctrl", "qspi_data4";
+ renesas,function = "qspi";
+ };
};
&sata0 {
status = "okay";
};
+
+&spi {
+ pinctrl-0 = <&qspi_pins>;
+ pinctrl-names = "default";
+
+ status = "okay";
+
+ flash: flash at 0 {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ compatible = "spansion,s25fl512s";
+ reg = <0>;
+ spi-max-frequency = <30000000>;
+ m25p,fast-read;
+
+ partition at 0 {
+ label = "loader";
+ reg = <0x00000000 0x00080000>;
+ read-only;
+ };
+ partition at 80000 {
+ label = "bootenv";
+ reg = <0x00080000 0x00080000>;
+ read-only;
+ };
+ partition at 100000 {
+ label = "data";
+ reg = <0x00100000 0x03f00000>;
+ };
+ };
+};
--
1.8.5.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [GIT PULL 0/3] Second Round of Renesas ARM Based SoC DT Updates for v3.15
2014-02-13 8:04 [GIT PULL 0/3] Second Round of Renesas ARM Based SoC DT Updates for v3.15 Simon Horman
` (2 preceding siblings ...)
2014-02-13 8:04 ` [PATCH 3/3] ARM: shmobile: koelsch dts: Add QSPI nodes Simon Horman
@ 2014-02-20 9:28 ` Olof Johansson
3 siblings, 0 replies; 5+ messages in thread
From: Olof Johansson @ 2014-02-20 9:28 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Feb 13, 2014 at 05:04:46PM +0900, Simon Horman wrote:
> Hi Olof, Hi Kevin, Hi Arnd,
>
> please consider this second round of Renesas ARM based SoC DT updates for
> v3.15.
>
> This pull request is based on the first round of such updates, tagged as
> renesas-dt-for-v3.15, which I have previously sent a pull-request for.
>
>
> The following changes since commit 1f4c745b2c5a083c49dc11d2f0827d9a381f1ee1:
>
> ARM: shmobile: r8a7790: Replace IRQ type numerical values with macros (2014-02-04 10:17:00 +0900)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-dt2-for-v3.15
Pulled, thanks.
-Olof
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-02-20 9:28 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-02-13 8:04 [GIT PULL 0/3] Second Round of Renesas ARM Based SoC DT Updates for v3.15 Simon Horman
2014-02-13 8:04 ` [PATCH 1/3] ARM: shmobile: r7s72100 dtsi: Add RSPI nodes Simon Horman
2014-02-13 8:04 ` [PATCH 2/3] ARM: shmobile: r8a7791 dtsi: Add QSPI node Simon Horman
2014-02-13 8:04 ` [PATCH 3/3] ARM: shmobile: koelsch dts: Add QSPI nodes Simon Horman
2014-02-20 9:28 ` [GIT PULL 0/3] Second Round of Renesas ARM Based SoC DT Updates for v3.15 Olof Johansson
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).