vendor: Unify d2 devices

Change-Id: I4122aa9a1b7db5150dfd7e0e42c39f2cb0e16ba2