mach-msm: Added more definitions

Change-Id: I28810a1116a5b26e706d6fbc952e35eacc93c2bb
3.0-wip: Desire bringup

I had to squash everything into a commit because a certain someone complained
about spamming gerrit :'(

Change-Id: I7158245839caaf1b8235ac126fa7337e3592ea97