diff options
| author | Geert Uytterhoeven <geert+renesas@glider.be> | 2014-08-28 04:10:19 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-08-28 10:33:17 -0400 |
| commit | 6089af775a4b4ea5237648de650dda548cb841c2 (patch) | |
| tree | 3870dabe191be3d1b1c4b30e8a885ea3f09eec12 | |
| parent | e825b8dd2b363e9134006fb141825518a11b2bf4 (diff) | |
spi: rspi: Add support for new R-Car Gen2 SoCs
Add support for QSPI in:
- r8a7792 (R-Car V2H)
- r8a7793 (R-Car M2-N)
- r8a7794 (R-Car E2)
r8a7791 is now called "R-Car M2-W".
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Mark Brown <broonie@linaro.org>
| -rw-r--r-- | Documentation/devicetree/bindings/spi/spi-rspi.txt | 5 | ||||
| -rw-r--r-- | drivers/spi/spi-rspi.c | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/spi/spi-rspi.txt b/Documentation/devicetree/bindings/spi/spi-rspi.txt index f9929aceeacc..8f4169f63936 100644 --- a/Documentation/devicetree/bindings/spi/spi-rspi.txt +++ b/Documentation/devicetree/bindings/spi/spi-rspi.txt | |||
| @@ -11,7 +11,10 @@ Required properties: | |||
| 11 | - "renesas,rspi-sh7757" (SH) | 11 | - "renesas,rspi-sh7757" (SH) |
| 12 | - "renesas,rspi-r7s72100" (RZ/A1H) | 12 | - "renesas,rspi-r7s72100" (RZ/A1H) |
| 13 | - "renesas,qspi-r8a7790" (R-Car H2) | 13 | - "renesas,qspi-r8a7790" (R-Car H2) |
| 14 | - "renesas,qspi-r8a7791" (R-Car M2) | 14 | - "renesas,qspi-r8a7791" (R-Car M2-W) |
| 15 | - "renesas,qspi-r8a7792" (R-Car V2H) | ||
| 16 | - "renesas,qspi-r8a7793" (R-Car M2-N) | ||
| 17 | - "renesas,qspi-r8a7794" (R-Car E2) | ||
| 15 | - reg : Address start and address range size of the device | 18 | - reg : Address start and address range size of the device |
| 16 | - interrupts : A list of interrupt-specifiers, one for each entry in | 19 | - interrupts : A list of interrupt-specifiers, one for each entry in |
| 17 | interrupt-names. | 20 | interrupt-names. |
diff --git a/drivers/spi/spi-rspi.c b/drivers/spi/spi-rspi.c index 1da609e4491d..54bb0faec155 100644 --- a/drivers/spi/spi-rspi.c +++ b/drivers/spi/spi-rspi.c | |||
| @@ -87,7 +87,7 @@ | |||
| 87 | /* RSPI on SH only */ | 87 | /* RSPI on SH only */ |
| 88 | #define SPCR_TXMD 0x02 /* TX Only Mode (vs. Full Duplex) */ | 88 | #define SPCR_TXMD 0x02 /* TX Only Mode (vs. Full Duplex) */ |
| 89 | #define SPCR_SPMS 0x01 /* 3-wire Mode (vs. 4-wire) */ | 89 | #define SPCR_SPMS 0x01 /* 3-wire Mode (vs. 4-wire) */ |
| 90 | /* QSPI on R-Car M2 only */ | 90 | /* QSPI on R-Car Gen2 only */ |
| 91 | #define SPCR_WSWAP 0x02 /* Word Swap of read-data for DMAC */ | 91 | #define SPCR_WSWAP 0x02 /* Word Swap of read-data for DMAC */ |
| 92 | #define SPCR_BSWAP 0x01 /* Byte Swap of read-data for DMAC */ | 92 | #define SPCR_BSWAP 0x01 /* Byte Swap of read-data for DMAC */ |
| 93 | 93 | ||
