Merge "HiKey960: Add sys.usb.controller override for newer kernels"