Merge devicetree ad our subdirectory