Merge with mainline to get latest APIs and device tree bindings.