Reconcile Mako props with Carbon

Why carbon, they seem up-t0-date with EOS + PA
Ours were VERY out-of-date

I also changed the structure to make it sane to find diff drivers

Change-Id: I25569ee3f60ab78b0df29b2c36be42e04052e32d
Signed-off-by: DHO <DHO@dho.im>