Revert "[WIP] merge to 3.0.31"

This reverts commit 7ad5188e034d485d7e3db34860434df4b42fef01.
Revert "omap4-common: Update Workaround for OMAP errata i640"

This reverts commit 5e24c3e48a0d5b569550d723c4803c4d16c33d34.