Merge "ASoC: wcd9304: enable charge pump for headphones" into msm-3.0