2nd attempt at USB-OTG support