A fairly hefty change in diff terms but no actual code changes, will be
used by the next commit.
Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>