mach-msm: updates from mako

Signed-off-by: helicopter88 <johnlemon.lol@gmail.com>