Device tree from erikcas (thx) with fixes