Merge tag 'omap-for-v5.13/fixes-rc6-signed' of git://git.kernel.org/pub/scm/linux...
authorOlof Johansson <olof@lixom.net>
Thu, 24 Jun 2021 01:44:45 +0000 (18:44 -0700)
committerOlof Johansson <olof@lixom.net>
Thu, 24 Jun 2021 01:44:47 +0000 (18:44 -0700)
Fix duplicate usb4 regression for dra74 variants

USB4 is only present in DRA74x variants, and I managed to add it for the
other variants too with the recent legacy platform data removal.

* tag 'omap-for-v5.13/fixes-rc6-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: dra7: Fix duplicate USB4 target module node

Link: https://lore.kernel.org/r/pull-1623999845-180025@atomide.com
Signed-off-by: Olof Johansson <olof@lixom.net>

Trivial merge