leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pinctrl: Rename gpio driver from cygnus to iproc

Browse Source 
Rename gpio driver file name from pinctrl-cygnus-gpio.c to
pinctrl-iproc-gpio.c to make it more generic so that all
iproc based future SoCs using the same gpio block could
use this driver.

Signed-off-by: Pramod Kumar <pramodku@broadcom.com>
Reviewed-by: Ray Jui <rjui@broadcom.com>
Reviewed-by: Scott Branden <sbranden@broadcom.com>
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Pramod Kumar 2015-11-19 09:22:19 +05:30 committed by Linus Walleij
parent 604b25793b
commit 616043d58a
3 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/pinctrl/bcm/Kconfig
View File

@ -20,27 +20,41 @@ config PINCTRL_BCM2835
select PINMUX select PINMUX
select PINCONF select PINCONF
config PINCTRL_CYGNUS_GPIO config PINCTRL_IPROC_GPIO
bool "Broadcom Cygnus GPIO (with PINCONF) driver" bool "Broadcom iProc GPIO (with PINCONF) driver"
depends on OF_GPIO && ARCH_BCM_CYGNUS depends on OF_GPIO && (ARCH_BCM_IPROC || COMPILE_TEST)
select GPIOLIB_IRQCHIP select GPIOLIB_IRQCHIP
select PINCONF select PINCONF
select GENERIC_PINCONF select GENERIC_PINCONF
default ARCH_BCM_CYGNUS default ARCH_BCM_IPROC
help help
Say yes here to enable the Broadcom Cygnus GPIO driver. Say yes here to enable the Broadcom iProc GPIO driver.
The Broadcom iProc based SoCs- Cygnus, NS2, NSP and Stingray, use
same GPIO Controller IP hence this driver could be used for all.
The Broadcom Cygnus SoC has 3 GPIO controllers including the ASIU The Broadcom Cygnus SoC has 3 GPIO controllers including the ASIU
GPIO controller (ASIU), the chipCommonG GPIO controller (CCM), and GPIO controller (ASIU), the chipCommonG GPIO controller (CCM), and
the always-ON GPIO controller (CRMU/AON). All 3 GPIO controllers are the always-ON GPIO controller (CRMU/AON). All 3 GPIO controllers are
supported by this driver. supported by this driver.
All 3 Cygnus GPIO controllers support basic PINCONF functions such The Broadcom NSP has two GPIO controllers including the ChipcommonA
GPIO, the ChipcommonB GPIO. Later controller is supported by this
driver.
The Broadcom NS2 has two GPIO controller including the CRMU GPIO,
the ChipcommonG GPIO. Both controllers are supported by this driver.
The Broadcom Stingray GPIO controllers are supported by this driver.
All above SoCs GPIO controllers support basic PINCONF functions such
as bias pull up, pull down, and drive strength configurations, when as bias pull up, pull down, and drive strength configurations, when
these pins are muxed to GPIO. these pins are muxed to GPIO.
Pins from the ASIU GPIO can be individually muxed to GPIO function, It provides the framework where pins from the individual GPIO can be
through interaction with the Cygnus IOMUX controller. individually muxed to GPIO function, through interaction with the
SoCs IOMUX controller. This features could be used only on SoCs which
support individual pin muxing.
config PINCTRL_CYGNUS_MUX config PINCTRL_CYGNUS_MUX
bool "Broadcom Cygnus IOMUX driver" bool "Broadcom Cygnus IOMUX driver"

2
drivers/pinctrl/bcm/Makefile
View File

@ -2,5 +2,5 @@
obj-$(CONFIG_PINCTRL_BCM281XX) += pinctrl-bcm281xx.o obj-$(CONFIG_PINCTRL_BCM281XX) += pinctrl-bcm281xx.o
obj-$(CONFIG_PINCTRL_BCM2835) += pinctrl-bcm2835.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_CYGNUS_MUX) += pinctrl-cygnus-mux.o

3
drivers/pinctrl/bcm/pinctrl-cygnus-gpio.c → drivers/pinctrl/bcm/pinctrl-iproc-gpio.c
View File

@ -531,8 +531,7 @@ static int iproc_pin_config_get(struct pinctrl_dev *pctldev, unsigned pin,
ret = iproc_gpio_get_strength(chip, gpio, &arg); ret = iproc_gpio_get_strength(chip, gpio, &arg);
if (ret) if (ret)
return ret; return ret;
else *config = pinconf_to_config_packed(param, arg);
*config = pinconf_to_config_packed(param, arg);
return 0; return 0;