Revert "TEST: linux/sound: Partially merge updates into soc-dai.h"

This reverts commit 02a794dd0d1a39d4925ce426017d8dd9b68e2991.