d2/jf: unify devices

Change-Id: I22026b5241b2a667fcd016049d01fae59d5c87ba
Merge pull request #408 from invisiblek/consolidation

d2/jf - consolidation