arm: topology: updates from linux 3.15-rc5

Change-Id: I74300e458c580d182de3b08cd56f837497d0e1b3