Merge "arm/dt: msm8610: move audio routing map into device tree"