Merge branches 'soc' and 'pinmux' into boards-base