i2c-qup: de-derp

Touchscreen optimizations cherry-pick breaks the camera on Apex (and
probably other devices with the same camera). Restore most of the
original i2c-qup file, while still allowing i2c to overclock for d2

Change-Id: I7d6c1f8c9a1064e95d59f60d81be5c9c59512e74
Merge branch 'cm-10.2' into martincz