Why would you combine mainline kernel with manufacturer device tree? Kernel includes its own device trees.