diff options
| author | Mark Brown <broonie@kernel.org> | 2022-08-29 18:49:33 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2022-08-29 18:49:33 +0200 |
| commit | 7bb5b8268ef36ecad2f3e2a8e39be61a44816117 (patch) | |
| tree | 1855b065f55b6d8c36f24b67d7d0bf8a1ee6887c | |
| parent | spi: stm32-qspi: Fix pm_runtime management in stm32_qspi_transfer_one_message() (diff) | |
| parent | spi: renesas,sh-msiof: R-Car V3U is R-Car Gen4 (diff) | |
| download | linux-7bb5b8268ef36ecad2f3e2a8e39be61a44816117.tar.xz linux-7bb5b8268ef36ecad2f3e2a8e39be61a44816117.zip | |
spi: add generic R-Car Gen4 and specific r8a779f0 support
Merge series from Wolfram Sang <wsa+renesas@sang-engineering.com>:
Here are the patches to enable MSIOF on R-Car S4-8. They also introduce
generic Gen4 support and move V3U to Gen4 (which it really is).
| -rw-r--r-- | Documentation/devicetree/bindings/spi/renesas,sh-msiof.yaml | 7 | ||||
| -rw-r--r-- | drivers/spi/spi-sh-msiof.c | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/spi/renesas,sh-msiof.yaml b/Documentation/devicetree/bindings/spi/renesas,sh-msiof.yaml index 5de710adfa63..64faa8d3580a 100644 --- a/Documentation/devicetree/bindings/spi/renesas,sh-msiof.yaml +++ b/Documentation/devicetree/bindings/spi/renesas,sh-msiof.yaml @@ -47,10 +47,15 @@ properties: - renesas,msiof-r8a77980 # R-Car V3H - renesas,msiof-r8a77990 # R-Car E3 - renesas,msiof-r8a77995 # R-Car D3 - - renesas,msiof-r8a779a0 # R-Car V3U - const: renesas,rcar-gen3-msiof # generic R-Car Gen3 and RZ/G2 # compatible device - items: + - enum: + - renesas,msiof-r8a779a0 # R-Car V3U + - renesas,msiof-r8a779f0 # R-Car S4-8 + - const: renesas,rcar-gen4-msiof # generic R-Car Gen4 + # compatible device + - items: - const: renesas,sh-msiof # deprecated reg: diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c index d0012b30410c..9bca3d076f05 100644 --- a/drivers/spi/spi-sh-msiof.c +++ b/drivers/spi/spi-sh-msiof.c @@ -1085,6 +1085,7 @@ static const struct of_device_id sh_msiof_match[] = { { .compatible = "renesas,rcar-gen2-msiof", .data = &rcar_gen2_data }, { .compatible = "renesas,msiof-r8a7796", .data = &rcar_gen3_data }, { .compatible = "renesas,rcar-gen3-msiof", .data = &rcar_gen3_data }, + { .compatible = "renesas,rcar-gen4-msiof", .data = &rcar_gen3_data }, { .compatible = "renesas,sh-msiof", .data = &sh_data }, /* Deprecated */ {}, }; |