WTF: DIAF: stop merging borked hardware support or it gets the HOSE

seriously can we submit finished code please?

Change-Id: Idf3ceb14157c69a9fb4018f062cfafd170acba93