omap: devices: Avoid merge conflict between ASoC and OMAP hwmod changes