This reverts commit 38c3c968. Conflicts: sound/soc/msm/msm-pcm-routing.h Change-Id: I14993fcc1c25e499ef22b54c58ddfc7c41458f53