Removed duplicate i2c
Added ian's vmmc fix