n1: partial revert of USB power changes
n1: update msm_thermal_pdata for in-kernel thermal management
include: pcb_version: remove faulty ifdef

* N1 needs these enum values
n1: fix more power management code
msm_camera: fix double defines