usb: B&N usb (mostly related to charging) changes

Conflicts:
	drivers/usb/otg/twl6030-usb.c