Browse Source

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>
Geert Uytterhoeven 11 years ago
parent
commit
e221cc99be
2 changed files with 11 additions and 1 deletions
  1. 5 1
      Documentation/devicetree/bindings/spi/sh-msiof.txt
  2. 6 0
      drivers/spi/spi-sh-msiof.c

+ 5 - 1
Documentation/devicetree/bindings/spi/sh-msiof.txt

@@ -6,6 +6,10 @@ Required properties:
 			 "renesas,sh-mobile-msiof" for SH Mobile series.
 			 "renesas,sh-mobile-msiof" for SH Mobile series.
 			 Examples with soctypes are:
 			 Examples with soctypes are:
 			 "renesas,msiof-r8a7790" (R-Car H2)
 			 "renesas,msiof-r8a7790" (R-Car H2)
+			 "renesas,msiof-r8a7791" (R-Car M2-W)
+			 "renesas,msiof-r8a7792" (R-Car V2H)
+			 "renesas,msiof-r8a7793" (R-Car M2-N)
+			 "renesas,msiof-r8a7794" (R-Car E2)
 - reg                  : A list of offsets and lengths of the register sets for
 - reg                  : A list of offsets and lengths of the register sets for
 			 the device.
 			 the device.
 			 If only one register set is present, it is to be used
 			 If only one register set is present, it is to be used
@@ -31,7 +35,7 @@ Optional properties, deprecated for soctype-specific bindings:
 - renesas,tx-fifo-size : Overrides the default tx fifo size given in words
 - renesas,tx-fifo-size : Overrides the default tx fifo size given in words
 			 (default is 64)
 			 (default is 64)
 - renesas,rx-fifo-size : Overrides the default rx fifo size given in words
 - renesas,rx-fifo-size : Overrides the default rx fifo size given in words
-			 (default is 64, or 256 on R-Car H2 and M2)
+			 (default is 64, or 256 on R-Car Gen2)
 
 
 Pinctrl properties might be needed, too.  See
 Pinctrl properties might be needed, too.  See
 Documentation/devicetree/bindings/pinctrl/renesas,*.
 Documentation/devicetree/bindings/pinctrl/renesas,*.

+ 6 - 0
drivers/spi/spi-sh-msiof.c

@@ -928,6 +928,9 @@ static const struct of_device_id sh_msiof_match[] = {
 	{ .compatible = "renesas,sh-mobile-msiof", .data = &sh_data },
 	{ .compatible = "renesas,sh-mobile-msiof", .data = &sh_data },
 	{ .compatible = "renesas,msiof-r8a7790",   .data = &r8a779x_data },
 	{ .compatible = "renesas,msiof-r8a7790",   .data = &r8a779x_data },
 	{ .compatible = "renesas,msiof-r8a7791",   .data = &r8a779x_data },
 	{ .compatible = "renesas,msiof-r8a7791",   .data = &r8a779x_data },
+	{ .compatible = "renesas,msiof-r8a7792",   .data = &r8a779x_data },
+	{ .compatible = "renesas,msiof-r8a7793",   .data = &r8a779x_data },
+	{ .compatible = "renesas,msiof-r8a7794",   .data = &r8a779x_data },
 	{},
 	{},
 };
 };
 MODULE_DEVICE_TABLE(of, sh_msiof_match);
 MODULE_DEVICE_TABLE(of, sh_msiof_match);
@@ -1219,6 +1222,9 @@ static struct platform_device_id spi_driver_ids[] = {
 	{ "spi_sh_msiof",	(kernel_ulong_t)&sh_data },
 	{ "spi_sh_msiof",	(kernel_ulong_t)&sh_data },
 	{ "spi_r8a7790_msiof",	(kernel_ulong_t)&r8a779x_data },
 	{ "spi_r8a7790_msiof",	(kernel_ulong_t)&r8a779x_data },
 	{ "spi_r8a7791_msiof",	(kernel_ulong_t)&r8a779x_data },
 	{ "spi_r8a7791_msiof",	(kernel_ulong_t)&r8a779x_data },
+	{ "spi_r8a7792_msiof",	(kernel_ulong_t)&r8a779x_data },
+	{ "spi_r8a7793_msiof",	(kernel_ulong_t)&r8a779x_data },
+	{ "spi_r8a7794_msiof",	(kernel_ulong_t)&r8a779x_data },
 	{},
 	{},
 };
 };
 MODULE_DEVICE_TABLE(platform, spi_driver_ids);
 MODULE_DEVICE_TABLE(platform, spi_driver_ids);