Merge branch 'pm-wip/smps-regulator' into for_3.4/pm/smps-regulator