sh: Merge clkdev API updates.