Reviewed-by: Patrick Robb <probb@iol.unh.edu>

Applying to next-dts with Luca's suggested fixup.