DT2W : Make changes inline with kernel commit

Change-Id: I4457cdd848264e6cc23a62883f95f5c848468a79