Skip to content

Commit

Permalink
Merge tag 'mvebu-drivers-5.14-1' of git://git.kernel.org/pub/scm/linu…
Browse files Browse the repository at this point in the history
…x/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 <[email protected]>
  • Loading branch information
olofj committed Jun 24, 2021
2 parents 4014f31 + 90ae472 commit 1154842
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions drivers/firmware/turris-mox-rwtm.c
Original file line number Diff line number Diff line change
Expand Up @@ -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", },
{ },
};

Expand Down

0 comments on commit 1154842

Please sign in to comment.