Merge "xhci-plat: Use correct dev to get usb-phy handle"