Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b17f2f9b authored by Ray Jui's avatar Ray Jui Committed by Linus Walleij
Browse files

pinctrl: bcm: consolidate Broadcom pinctrl drivers 



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

Signed-off-by: default avatarRay Jui <rjui@broadcom.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 4691dd01

drivers/pinctrl/Kconfig

+1 −18
Original line number Diff line number Diff line
@@ -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"

drivers/pinctrl/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -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/

drivers/pinctrl/bcm/Kconfig

0 → 100644
+21 −0
Original line number Diff line number Diff line 
#

# 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

drivers/pinctrl/bcm/Makefile

0 → 100644
+4 −0
Original line number Diff line number Diff line 
# Broadcom pinctrl support



obj-$(CONFIG_PINCTRL_BCM281XX)	+= pinctrl-bcm281xx.o

obj-$(CONFIG_PINCTRL_BCM2835)	+= pinctrl-bcm2835.o

drivers/pinctrl/pinctrl-bcm281xx.c→drivers/pinctrl/bcm/pinctrl-bcm281xx.c

+2 −2
Original line number Diff line number Diff line
@@ -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 */