Merge the new generic RPMHPD defines from a topic branch, to alow them being used in DeviceTree source, and the driver.