2nd set of device tree changes for v3.3