Drivers: add/update drivers for kernel merge

Change-Id: Ica4ddfaa16170c363203161aa1d4042b662ba6cf