diff options
| author | Olof Johansson <olof@lixom.net> | 2021-06-23 18:57:38 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2021-06-23 18:57:40 -0700 |
| commit | 115484216b07c2753fcc6ddf3d8acdde8fdbd4fc (patch) | |
| tree | 88602b8a0e675600477e1acb5d94855bdd0f6b1d /drivers/firmware/turris-mox-rwtm.c | |
| parent | 4014f3177b0a49bcd0ad3d347f36b7a57150a556 (diff) | |
| parent | 90ae47215de3fec862aeb1a0f0e28bb505ab1351 (diff) | |
Merge tag 'mvebu-drivers-5.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu into arm/drivers
mvebu drivers for 5.14 (part 1)
Make the turris mox rwtm firmware more generic for Armada 3700 SoCs
* tag 'mvebu-drivers-5.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu:
firmware: turris-mox-rwtm: add marvell,armada-3700-rwtm-firmware compatible string
Link: https://lore.kernel.org/r/87bl802a2d.fsf@BL-laptop
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/firmware/turris-mox-rwtm.c')
| -rw-r--r-- | drivers/firmware/turris-mox-rwtm.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/firmware/turris-mox-rwtm.c b/drivers/firmware/turris-mox-rwtm.c index 1cf4f1087492..c2d34dc8ba46 100644 --- a/drivers/firmware/turris-mox-rwtm.c +++ b/drivers/firmware/turris-mox-rwtm.c @@ -569,6 +569,7 @@ static int turris_mox_rwtm_remove(struct platform_device *pdev) static const struct of_device_id turris_mox_rwtm_match[] = { { .compatible = "cznic,turris-mox-rwtm", }, + { .compatible = "marvell,armada-3700-rwtm-firmware", }, { }, }; |