expressatt: disable CONFIG_MSM_STANDALONE_POWER_COLLAPSE

Change-Id: I2c7f605d64bccb926f87848cf0a714728419c35a
cypress-touchkey: tweak BLN implementation

- don't call enable_irq unless we're actually resuming, there's
  no need have it enabled just to illuminate the touchkeys.

Change-Id: I591150d51b1ab98041fa50c9bdccbeccb876bc26
Merge remote-tracking branch 'upstream/cm-11.0' into HEAD