Merge "ASoC: msm8x10: Register headset jack"