Merge branch 'CR_1279_I2S_wm8960_Curry.zhang' into 'jh7110-5.15.y-devel'