diff options
| author | Mark Brown <broonie@kernel.org> | 2017-01-17 18:48:13 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-01-17 18:48:13 +0000 |
| commit | 52cc720c568efd8fd454053b98fe4b4fd94688fe (patch) | |
| tree | 899eada88a0bc2ce494d827eaca0f8c576fa4003 /drivers/spi | |
| parent | 3f95ba38e44b27a5c2e8c416c460a961c2bed9ec (diff) | |
| parent | 264c3e8de4fbda1d1342213c78fb3788a43cfd41 (diff) | |
| download | talos-obmc-linux-52cc720c568efd8fd454053b98fe4b4fd94688fe.tar.gz talos-obmc-linux-52cc720c568efd8fd454053b98fe4b4fd94688fe.zip | |
Merge remote-tracking branch 'spi/fix/sh-msiof' into spi-linus
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi-sh-msiof.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c index 0012ad02e569..1f00eeb0b5a3 100644 --- a/drivers/spi/spi-sh-msiof.c +++ b/drivers/spi/spi-sh-msiof.c @@ -973,14 +973,16 @@ static const struct sh_msiof_chipdata r8a779x_data = { }; static const struct of_device_id sh_msiof_match[] = { - { .compatible = "renesas,sh-msiof", .data = &sh_data }, { .compatible = "renesas,sh-mobile-msiof", .data = &sh_data }, { .compatible = "renesas,msiof-r8a7790", .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 }, + { .compatible = "renesas,rcar-gen2-msiof", .data = &r8a779x_data }, { .compatible = "renesas,msiof-r8a7796", .data = &r8a779x_data }, + { .compatible = "renesas,rcar-gen3-msiof", .data = &r8a779x_data }, + { .compatible = "renesas,sh-msiof", .data = &sh_data }, /* Deprecated */ {}, }; MODULE_DEVICE_TABLE(of, sh_msiof_match); |
