Merge branch 'bcm/cleanup' into next/soc

This is a dependency for the bcm21664 support.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>