Merge "cma: Fix up devicetree bindings"