Merge branch 'bcm-nsp' into devel

diff --cc drivers/pinctrl/bcm/Kconfig
Simple merge

diff --cc drivers/pinctrl/bcm/Makefile
index 9ac6370,2fb1ed8..6148367
--- 1/drivers/pinctrl/bcm/Makefile
--- 2/drivers/pinctrl/bcm/Makefile
+++ b/drivers/pinctrl/bcm/Makefile
@@@ -2,5 -2,6 +2,6 @@@
  
  obj-$(CONFIG_PINCTRL_BCM281XX)                += pinctrl-bcm281xx.o
  obj-$(CONFIG_PINCTRL_BCM2835)         += pinctrl-bcm2835.o
 -obj-$(CONFIG_PINCTRL_CYGNUS_GPIO)     += pinctrl-cygnus-gpio.o
 +obj-$(CONFIG_PINCTRL_IPROC_GPIO)      += pinctrl-iproc-gpio.o
  obj-$(CONFIG_PINCTRL_CYGNUS_MUX)      += pinctrl-cygnus-mux.o
+ obj-$(CONFIG_PINCTRL_NSP_GPIO)                += pinctrl-nsp-gpio.o