Merge "ASoC: msm8974: use newer AFE port IDs for Primary AUXPCM"