Merge branch 'bcm-nsp' of ../linux-pinctrl into devel