diff options
| author | Mark Brown <broonie@kernel.org> | 2016-12-12 18:54:04 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-12-12 18:54:04 +0300 |
| commit | 9b12be63021a20fc3b76a7b6194e23ef66c903c9 (patch) | |
| tree | c0c5dff2155a48f8de6abcf2a65733328a8ce30c | |
| parent | cc939939d81e787fd6a5e86cf81b2ad1cd600bd4 (diff) | |
| parent | eb51cffa743de5c78cfbf44f576b0f1eccc784f4 (diff) | |
| download | linux-9b12be63021a20fc3b76a7b6194e23ef66c903c9.tar.xz | |
Merge remote-tracking branch 'spi/topic/rcar' into spi-next
| -rw-r--r-- | Documentation/devicetree/bindings/spi/sh-msiof.txt | 1 | ||||
| -rw-r--r-- | drivers/spi/spi-sh-msiof.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/spi/sh-msiof.txt b/Documentation/devicetree/bindings/spi/sh-msiof.txt index aa005c1d10d9..da6614c63796 100644 --- a/Documentation/devicetree/bindings/spi/sh-msiof.txt +++ b/Documentation/devicetree/bindings/spi/sh-msiof.txt @@ -10,6 +10,7 @@ Required properties: "renesas,msiof-r8a7792" (R-Car V2H) "renesas,msiof-r8a7793" (R-Car M2-N) "renesas,msiof-r8a7794" (R-Car E2) + "renesas,msiof-r8a7796" (R-Car M3-W) "renesas,msiof-sh73a0" (SH-Mobile AG5) - reg : A list of offsets and lengths of the register sets for the device. diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c index 1de3a772eb7d..0012ad02e569 100644 --- a/drivers/spi/spi-sh-msiof.c +++ b/drivers/spi/spi-sh-msiof.c @@ -980,6 +980,7 @@ static const struct of_device_id sh_msiof_match[] = { { .compatible = "renesas,msiof-r8a7792", .data = &r8a779x_data }, { .compatible = "renesas,msiof-r8a7793", .data = &r8a779x_data }, { .compatible = "renesas,msiof-r8a7794", .data = &r8a779x_data }, + { .compatible = "renesas,msiof-r8a7796", .data = &r8a779x_data }, {}, }; MODULE_DEVICE_TABLE(of, sh_msiof_match); |