diff options
author | Geert Uytterhoeven <geert+renesas@glider.be> | 2014-08-28 04:11:03 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-08-28 14:17:46 -0400 |
commit | e221cc99bee4494a99aa8d8525cd7776092ced05 (patch) | |
tree | 318f01fbf5e95cf6bd1396e0574ac1e8a51279d8 | |
parent | 7a9f957b395fc08edc47620c01e8bb5b798caddb (diff) |
spi: sh-msiof: Add support for new R-Car Gen2 SoCs
Add support for MSIOF 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/sh-msiof.txt | 6 | ||||
-rw-r--r-- | drivers/spi/spi-sh-msiof.c | 6 |
2 files changed, 11 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/spi/sh-msiof.txt b/Documentation/devicetree/bindings/spi/sh-msiof.txt index 98e07f1c3dab..d11c3721e7cd 100644 --- a/Documentation/devicetree/bindings/spi/sh-msiof.txt +++ b/Documentation/devicetree/bindings/spi/sh-msiof.txt | |||
@@ -6,6 +6,10 @@ Required properties: | |||
6 | "renesas,sh-mobile-msiof" for SH Mobile series. | 6 | "renesas,sh-mobile-msiof" for SH Mobile series. |
7 | Examples with soctypes are: | 7 | Examples with soctypes are: |
8 | "renesas,msiof-r8a7790" (R-Car H2) | 8 | "renesas,msiof-r8a7790" (R-Car H2) |
9 | "renesas,msiof-r8a7791" (R-Car M2-W) | ||
10 | "renesas,msiof-r8a7792" (R-Car V2H) | ||
11 | "renesas,msiof-r8a7793" (R-Car M2-N) | ||
12 | "renesas,msiof-r8a7794" (R-Car E2) | ||
9 | - reg : A list of offsets and lengths of the register sets for | 13 | - reg : A list of offsets and lengths of the register sets for |
10 | the device. | 14 | the device. |
11 | If only one register set is present, it is to be used | 15 | If only one register set is present, it is to be used |
@@ -31,7 +35,7 @@ Optional properties, deprecated for soctype-specific bindings: | |||
31 | - renesas,tx-fifo-size : Overrides the default tx fifo size given in words | 35 | - renesas,tx-fifo-size : Overrides the default tx fifo size given in words |
32 | (default is 64) | 36 | (default is 64) |
33 | - renesas,rx-fifo-size : Overrides the default rx fifo size given in words | 37 | - renesas,rx-fifo-size : Overrides the default rx fifo size given in words |
34 | (default is 64, or 256 on R-Car H2 and M2) | 38 | (default is 64, or 256 on R-Car Gen2) |
35 | 39 | ||
36 | Pinctrl properties might be needed, too. See | 40 | Pinctrl properties might be needed, too. See |
37 | Documentation/devicetree/bindings/pinctrl/renesas,*. | 41 | Documentation/devicetree/bindings/pinctrl/renesas,*. |
diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c index 1165d418340f..3f365402fcc0 100644 --- a/drivers/spi/spi-sh-msiof.c +++ b/drivers/spi/spi-sh-msiof.c | |||
@@ -928,6 +928,9 @@ static const struct of_device_id sh_msiof_match[] = { | |||
928 | { .compatible = "renesas,sh-mobile-msiof", .data = &sh_data }, | 928 | { .compatible = "renesas,sh-mobile-msiof", .data = &sh_data }, |
929 | { .compatible = "renesas,msiof-r8a7790", .data = &r8a779x_data }, | 929 | { .compatible = "renesas,msiof-r8a7790", .data = &r8a779x_data }, |
930 | { .compatible = "renesas,msiof-r8a7791", .data = &r8a779x_data }, | 930 | { .compatible = "renesas,msiof-r8a7791", .data = &r8a779x_data }, |
931 | { .compatible = "renesas,msiof-r8a7792", .data = &r8a779x_data }, | ||
932 | { .compatible = "renesas,msiof-r8a7793", .data = &r8a779x_data }, | ||
933 | { .compatible = "renesas,msiof-r8a7794", .data = &r8a779x_data }, | ||
931 | {}, | 934 | {}, |
932 | }; | 935 | }; |
933 | MODULE_DEVICE_TABLE(of, sh_msiof_match); | 936 | MODULE_DEVICE_TABLE(of, sh_msiof_match); |
@@ -1219,6 +1222,9 @@ static struct platform_device_id spi_driver_ids[] = { | |||
1219 | { "spi_sh_msiof", (kernel_ulong_t)&sh_data }, | 1222 | { "spi_sh_msiof", (kernel_ulong_t)&sh_data }, |
1220 | { "spi_r8a7790_msiof", (kernel_ulong_t)&r8a779x_data }, | 1223 | { "spi_r8a7790_msiof", (kernel_ulong_t)&r8a779x_data }, |
1221 | { "spi_r8a7791_msiof", (kernel_ulong_t)&r8a779x_data }, | 1224 | { "spi_r8a7791_msiof", (kernel_ulong_t)&r8a779x_data }, |
1225 | { "spi_r8a7792_msiof", (kernel_ulong_t)&r8a779x_data }, | ||
1226 | { "spi_r8a7793_msiof", (kernel_ulong_t)&r8a779x_data }, | ||
1227 | { "spi_r8a7794_msiof", (kernel_ulong_t)&r8a779x_data }, | ||
1222 | {}, | 1228 | {}, |
1223 | }; | 1229 | }; |
1224 | MODULE_DEVICE_TABLE(platform, spi_driver_ids); | 1230 | MODULE_DEVICE_TABLE(platform, spi_driver_ids); |