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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.14 (GNU/Linux)
 
 iQIcBAABAgAGBQJS/HC9AAoJENfPZGlqN0++5rAP/17tzdUFJyM05zBrbOZgDbPu
 OXx2CHEghktc7MMX3LSBBDxWr3vW00e+fc7ETm6YtCLMB6+HTEsFg28K0LPmYpxb
 JUh77ikVzulPWEv6fQCYZne1ZxXIVoqok66ird4LEpdLsigQm9N5zPFIkVYzbY4Z
 z+ep4GYupZj252DKX4E5a9oNHY6qkJtZhXJVL6mpMI73/Z5hjE/p8hDix+R9GXRL
 FTN64sQ2Wk92MzvorY6xDNoZVpOWPR/cEaHgYARZuzGe/0ditXKMNec9o8fA3sMH
 9CnWuvczqaZgWdaQC47iqU5HFUM+qea9s+OYuZi2/C5jFvRvzj9ZoajMZO+WyXdn
 WI4I6b7rzgLrSPqL3btp0uumotKE+kg74AlRZ5x3STb+fOkcHkMrOwHdPenPCl8i
 TUeSJpFt8kL1eS+nUPV78ArFddojKGyX2Y8x802TWoJu7t/r3pStvW0qHcKndc8T
 5AqJU80cZQOW927M9583wS+DU434hwqYwekKWkBUp70kPtUoPM662SjboUcF7vvW
 pjuSusawnjzSC5SjCUxaO4G3LRoYPEf8CXwgl3aUr9DOjaoG5nqkw8ftudN6ML13
 VCwe2g96l+rgQ7Cwx9ki+yG7wLZNlXn2Q/B2jchkftG4UNNXWvpP42Iad6ByXx+h
 oc36svawVyGgYOzpSAib
 =xMwi
 -----END PGP SIGNATURE-----

Merge tag 'renesas-dt2-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt

Merge "Second Round of Renesas ARM Based SoC DT Updates for v3.15" from Simon
Horman:

r8a7791 (R-Car M2) based Koelsch board
- Add QSPI nodes

r7s72100 (RZ/A1H) SoC
- Add RSPI nodes

* tag 'renesas-dt2-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: koelsch dts: Add QSPI nodes
  ARM: shmobile: r8a7791 dtsi: Add QSPI node
  ARM: shmobile: r7s72100 dtsi: Add RSPI nodes

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2014-02-20 01:28:27 -08:00
commit ab658f898e
4 changed files with 124 additions and 1 deletions

View File

@ -9,7 +9,7 @@
*/
/dts-v1/;
/include/ "r7s72100.dtsi"
#include "r7s72100.dtsi"
/ {
model = "Genmai";

View File

@ -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@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@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@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@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@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";
};
};

View File

@ -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@0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "spansion,s25fl512s";
reg = <0>;
spi-max-frequency = <30000000>;
m25p,fast-read;
partition@0 {
label = "loader";
reg = <0x00000000 0x00080000>;
read-only;
};
partition@80000 {
label = "bootenv";
reg = <0x00080000 0x00080000>;
read-only;
};
partition@100000 {
label = "data";
reg = <0x00100000 0x03f00000>;
};
};
};

View File

@ -710,4 +710,16 @@
clock-output-names = "scifa3", "scifa4", "scifa5";
};
};
spi: spi@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";
};
};