[cns3xxx]: split the i2c patch, merge the retry fixup