ASoC: ti: Merge davinci and omap directories