Merge changes I22e22414,I53c85b4a into msm-3.4

* changes:
  gpio: qpnp-pin: Update MPP and GPIO subtypes based on doc change
  gpio: qpnp-pin: Fix constraint checking for mode