Merge "[msm7x30]: Add support for Rev2.1 chip id"