ARM: imx: cm-fx6: reinstate USB support by syncing the devicetree with Linux
authorChristopher Spinrath <christopher.spinrath@rwth-aachen.de>
Thu, 30 Nov 2017 21:38:37 +0000 (22:38 +0100)
committerStefano Babic <sbabic@denx.de>
Fri, 29 Dec 2017 10:17:22 +0000 (11:17 +0100)
commitc10809dd0fb9fc1443d21242a349879a5c0d5069
tree9b259fe628c750f0ddc539241679688df1257fde
parent647155bcd549edae57f027e08add4c9ac090f05e
ARM: imx: cm-fx6: reinstate USB support by syncing the devicetree with Linux

Commit 5248930ebf48 ("dm: imx: cm_fx6: Enable more driver model support")
enabled driver model support for USB, thereby effectively removing USB
support because the cm_fx6 devicetree in the U-Boot does *not* enable the
USB nodes.

Reinstate the USB support by syncing the devicetree with Linux whose
devicetree enables the USB nodes properly.

More precisely, use the devicetree found in Linux v4.15-rc1 with the
following two changes:
  1) Remove the audio mux; the required dt-bindings header is not
     present in the U-Boot.
  2) Keep the usdhc3 MMC controller node currently present in the
     U-Boot's devicetree to retain the ability to boot from MMC.

Fixes: 5248930ebf48 ("dm: imx: cm_fx6: Enable more driver model support")
Signed-off-by: Christopher Spinrath <christopher.spinrath@rwth-aachen.de>
Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
arch/arm/dts/imx6q-cm-fx6.dts