Merge "platform: qpnp-power-on: choose correct s2 control registers"