Merge "ASoC: wcd9310: Codec changes to use new macros"