pinctrl: bcm: consolidate Broadcom pinctrl drivers

Consolidate Broadcom pinctrl drivers into drivers/pinctrl/bcm/*

Signed-off-by: Ray Jui <rjui@broadcom.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

6 files changed, 29 insertions, 22 deletions

diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
index 17b7f6ac8b25..adfe8546abc2 100644
--- a/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
@@ -67,24 +67,6 @@ config PINCTRL_AT91
         help
           Say Y here to enable the at91 pinctrl driver
 
-config PINCTRL_BCM2835
-        bool
-        select PINMUX
-        select PINCONF
-
-config PINCTRL_BCM281XX
-        bool "Broadcom BCM281xx pinctrl driver"
-        depends on OF && (ARCH_BCM_MOBILE || COMPILE_TEST)
-        select PINMUX
-        select PINCONF
-        select GENERIC_PINCONF
-        select REGMAP_MMIO
-        help
-          Say Y here to support Broadcom BCM281xx pinctrl driver, which is used
-          for the BCM281xx SoC family, including BCM11130, BCM11140, BCM11351,
-          BCM28145, and BCM28155 SoCs.  This driver requires the pinctrl
-          framework.  GPIO is provided by a separate GPIO driver.
-
 config PINCTRL_LANTIQ
         bool
         depends on LANTIQ
@@ -211,6 +193,7 @@ config PINCTRL_ZYNQ
         help
           This selectes the pinctrl driver for Xilinx Zynq.
 
+source "drivers/pinctrl/bcm/Kconfig"
 source "drivers/pinctrl/berlin/Kconfig"
 source "drivers/pinctrl/freescale/Kconfig"
 source "drivers/pinctrl/intel/Kconfig"
diff --git a/drivers/pinctrl/Makefile b/drivers/pinctrl/Makefile
index 9b4d6c7f4277..3d62946f3f29 100644
--- a/drivers/pinctrl/Makefile
+++ b/drivers/pinctrl/Makefile
@@ -14,8 +14,6 @@ obj-$(CONFIG_PINCTRL_AS3722)	+= pinctrl-as3722.o
 obj-$(CONFIG_PINCTRL_BF54x)     += pinctrl-adi2-bf54x.o
 obj-$(CONFIG_PINCTRL_BF60x)     += pinctrl-adi2-bf60x.o
 obj-$(CONFIG_PINCTRL_AT91)      += pinctrl-at91.o
-obj-$(CONFIG_PINCTRL_BCM2835)   += pinctrl-bcm2835.o
-obj-$(CONFIG_PINCTRL_BCM281XX)  += pinctrl-bcm281xx.o
 obj-$(CONFIG_PINCTRL_FALCON)    += pinctrl-falcon.o
 obj-$(CONFIG_PINCTRL_MESON)     += meson/
 obj-$(CONFIG_PINCTRL_PALMAS)    += pinctrl-palmas.o
@@ -39,6 +37,7 @@ obj-$(CONFIG_PINCTRL_TB10X)	+= pinctrl-tb10x.o
 obj-$(CONFIG_PINCTRL_ST)        += pinctrl-st.o
 obj-$(CONFIG_PINCTRL_ZYNQ)      += pinctrl-zynq.o
 
+obj-$(CONFIG_ARCH_BCM)          += bcm/
 obj-$(CONFIG_ARCH_BERLIN)       += berlin/
 obj-y                           += freescale/
 obj-$(CONFIG_X86)               += intel/
diff --git a/drivers/pinctrl/bcm/Kconfig b/drivers/pinctrl/bcm/Kconfig
new file mode 100644
index 000000000000..bc6d048ac7bc
--- /dev/null
+++ b/drivers/pinctrl/bcm/Kconfig
@@ -0,0 +1,21 @@
+#
+# Broadcom pinctrl drivers
+#
+
+config PINCTRL_BCM281XX
+        bool "Broadcom BCM281xx pinctrl driver"
+        depends on OF && (ARCH_BCM_MOBILE || COMPILE_TEST)
+        select PINMUX
+        select PINCONF
+        select GENERIC_PINCONF
+        select REGMAP_MMIO
+        help
+          Say Y here to support Broadcom BCM281xx pinctrl driver, which is used
+          for the BCM281xx SoC family, including BCM11130, BCM11140, BCM11351,
+          BCM28145, and BCM28155 SoCs.  This driver requires the pinctrl
+          framework.  GPIO is provided by a separate GPIO driver.
+
+config PINCTRL_BCM2835
+        bool
+        select PINMUX
+        select PINCONF
diff --git a/drivers/pinctrl/bcm/Makefile b/drivers/pinctrl/bcm/Makefile
new file mode 100644
index 000000000000..7ba80a383767
--- /dev/null
+++ b/drivers/pinctrl/bcm/Makefile
@@ -0,0 +1,4 @@
+# Broadcom pinctrl support
+
+obj-$(CONFIG_PINCTRL_BCM281XX)  += pinctrl-bcm281xx.o
+obj-$(CONFIG_PINCTRL_BCM2835)   += pinctrl-bcm2835.o
diff --git a/drivers/pinctrl/pinctrl-bcm281xx.c b/drivers/pinctrl/bcm/pinctrl-bcm281xx.c
index b88cfe5ed55a..9641f1c7617e 100644
--- a/drivers/pinctrl/pinctrl-bcm281xx.c
+++ b/drivers/pinctrl/bcm/pinctrl-bcm281xx.c
@@ -21,8 +21,8 @@
 #include <linux/pinctrl/pinconf-generic.h>
 #include <linux/regmap.h>
 #include <linux/slab.h>
-#include "core.h"
-#include "pinctrl-utils.h"
+#include "../core.h"
+#include "../pinctrl-utils.h"
 
 /* BCM281XX Pin Control Registers Definitions */
 
diff --git a/drivers/pinctrl/pinctrl-bcm2835.c b/drivers/pinctrl/bcm/pinctrl-bcm2835.c
index 9aa8a3f10b10..9aa8a3f10b10 100644
--- a/drivers/pinctrl/pinctrl-bcm2835.c
+++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c