Add some changes from CM's device tree...