leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bcm283x: Add pinctrl driver

Browse Source 
The bcm283x family of SoCs have a GPIO controller that also acts as
pinctrl controller.

This patch introduces a new pinctrl driver that can actually properly mux
devices into their device tree defined pin states and is now the primary
owner of the gpio device. The previous GPIO driver gets moved into a
subdevice of the pinctrl driver, bound to the same OF node.

That way whenever a device asks for pinctrl support, it gets it
automatically from the pinctrl driver and GPIO support is still available
in the normal command line phase.

Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
Alexander Graf 2018-01-23 18:05:21 +01:00 committed by Tom Rini
parent 8996975ff8
commit caf2233b28
14 changed files with 202 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MAINTAINERS
View File

@ -100,6 +100,7 @@ F: drivers/mmc/bcm2835_sdhci.c
F: drivers/serial/serial_bcm283x_mu.c
F: drivers/video/bcm2835.c
F: include/dm/platform_data/serial_bcm283x_mu.h
F: drivers/pinctrl/broadcom/
ARM FREESCALE IMX
M: Stefano Babic <sbabic@denx.de>

2
arch/arm/mach-bcm283x/include/mach/gpio.h
View File

@ -61,6 +61,4 @@ struct bcm2835_gpio_platdata {
unsigned long base;
};
int bcm2835_gpio_get_func_id(struct udevice *dev, unsigned gpio);
#endif /* _BCM2835_GPIO_H_ */

5
board/raspberrypi/rpi/rpi.c
View File

@ -24,6 +24,7 @@
#include <asm/armv8/mmu.h>
#endif
#include <watchdog.h>
#include <dm/pinctrl.h>
DECLARE_GLOBAL_DATA_PTR;
@ -430,10 +431,10 @@ static bool rpi_is_serial_active(void)
* out whether it is available is to check if the RX pin is muxed.
*/
if (uclass_first_device(UCLASS_GPIO, &dev) || !dev)
if (uclass_first_device(UCLASS_PINCTRL, &dev) || !dev)
return true;
if (bcm2835_gpio_get_func_id(dev, serial_gpio) != BCM2835_GPIO_ALT5)
if (pinctrl_get_gpio_mux(dev, 0, serial_gpio) != BCM2835_GPIO_ALT5)
return false;
return true;

4
configs/rpi_0_w_defconfig
View File

@ -32,3 +32,7 @@ CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_CONSOLE_SCROLL_LINES=10
CONFIG_PHYS_TO_BUS=y
CONFIG_OF_LIBFDT_OVERLAY=y
CONFIG_PINCTRL=y
CONFIG_PINCTRL_FULL=y
# CONFIG_PINCTRL_GENERIC is not set
CONFIG_PINCTRL_BCM283X=y

4
configs/rpi_2_defconfig
View File

@ -32,3 +32,7 @@ CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_CONSOLE_SCROLL_LINES=10
CONFIG_PHYS_TO_BUS=y
CONFIG_OF_LIBFDT_OVERLAY=y
CONFIG_PINCTRL=y
CONFIG_PINCTRL_FULL=y
# CONFIG_PINCTRL_GENERIC is not set
CONFIG_PINCTRL_BCM283X=y

4
configs/rpi_3_32b_defconfig
View File

@ -34,3 +34,7 @@ CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_CONSOLE_SCROLL_LINES=10
CONFIG_PHYS_TO_BUS=y
CONFIG_OF_LIBFDT_OVERLAY=y
CONFIG_PINCTRL=y
CONFIG_PINCTRL_FULL=y
# CONFIG_PINCTRL_GENERIC is not set
CONFIG_PINCTRL_BCM283X=y

4
configs/rpi_3_defconfig
View File

@ -34,3 +34,7 @@ CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_CONSOLE_SCROLL_LINES=10
CONFIG_PHYS_TO_BUS=y
CONFIG_OF_LIBFDT_OVERLAY=y
CONFIG_PINCTRL=y
CONFIG_PINCTRL_FULL=y
# CONFIG_PINCTRL_GENERIC is not set
CONFIG_PINCTRL_BCM283X=y

4
configs/rpi_defconfig
View File

@ -32,3 +32,7 @@ CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_CONSOLE_SCROLL_LINES=10
CONFIG_PHYS_TO_BUS=y
CONFIG_OF_LIBFDT_OVERLAY=y
CONFIG_PINCTRL=y
CONFIG_PINCTRL_FULL=y
# CONFIG_PINCTRL_GENERIC is not set
CONFIG_PINCTRL_BCM283X=y

29
drivers/gpio/bcm2835_gpio.c
View File

@ -7,6 +7,7 @@
#include <common.h>
#include <dm.h>
#include <dm/pinctrl.h>
#include <errno.h>
#include <asm/gpio.h>
#include <asm/io.h>
@ -14,6 +15,7 @@
struct bcm2835_gpios {
struct bcm2835_gpio_regs *reg;
struct udevice *pinctrl;
};
static int bcm2835_gpio_direction_input(struct udevice *dev, unsigned gpio)
@ -29,7 +31,7 @@ static int bcm2835_gpio_direction_input(struct udevice *dev, unsigned gpio)
return 0;
}
static int bcm2835_gpio_direction_output(struct udevice *dev, unsigned gpio,
static int bcm2835_gpio_direction_output(struct udevice *dev, unsigned int gpio,
int value)
{
struct bcm2835_gpios *gpios = dev_get_priv(dev);
@ -73,19 +75,12 @@ static int bcm2835_gpio_set_value(struct udevice *dev, unsigned gpio,
return 0;
}
int bcm2835_gpio_get_func_id(struct udevice *dev, unsigned gpio)
{
struct bcm2835_gpios *gpios = dev_get_priv(dev);
u32 val;
val = readl(&gpios->reg->gpfsel[BCM2835_GPIO_FSEL_BANK(gpio)]);
return (val >> BCM2835_GPIO_FSEL_SHIFT(gpio) & BCM2835_GPIO_FSEL_MASK);
}
static int bcm2835_gpio_get_function(struct udevice *dev, unsigned offset)
{
int funcid = bcm2835_gpio_get_func_id(dev, offset);
struct bcm2835_gpios *priv = dev_get_priv(dev);
int funcid;
funcid = pinctrl_get_gpio_mux(priv->pinctrl, 0, offset);
switch (funcid) {
case BCM2835_GPIO_OUTPUT:
@ -97,7 +92,6 @@ static int bcm2835_gpio_get_function(struct udevice *dev, unsigned offset)
}
}
static const struct dm_gpio_ops gpio_bcm2835_ops = {
.direction_input = bcm2835_gpio_direction_input,
.direction_output = bcm2835_gpio_direction_output,
@ -116,15 +110,13 @@ static int bcm2835_gpio_probe(struct udevice *dev)
uc_priv->gpio_count = BCM2835_GPIO_COUNT;
gpios->reg = (struct bcm2835_gpio_regs *)plat->base;
/* We know we're spawned by the pinctrl driver */
gpios->pinctrl = dev->parent;
return 0;
}
#if CONFIG_IS_ENABLED(OF_CONTROL)
static const struct udevice_id bcm2835_gpio_id[] = {
{.compatible = "brcm,bcm2835-gpio"},
{}
};
static int bcm2835_gpio_ofdata_to_platdata(struct udevice *dev)
{
struct bcm2835_gpio_platdata *plat = dev_get_platdata(dev);
@ -142,7 +134,6 @@ static int bcm2835_gpio_ofdata_to_platdata(struct udevice *dev)
U_BOOT_DRIVER(gpio_bcm2835) = {
.name = "gpio_bcm2835",
.id = UCLASS_GPIO,
.of_match = of_match_ptr(bcm2835_gpio_id),
.ofdata_to_platdata = of_match_ptr(bcm2835_gpio_ofdata_to_platdata),
.platdata_auto_alloc_size = sizeof(struct bcm2835_gpio_platdata),
.ops = &gpio_bcm2835_ops,

1
drivers/pinctrl/Kconfig
View File

@ -306,5 +306,6 @@ source "drivers/pinctrl/renesas/Kconfig"
source "drivers/pinctrl/uniphier/Kconfig"
source "drivers/pinctrl/exynos/Kconfig"
source "drivers/pinctrl/mvebu/Kconfig"
source "drivers/pinctrl/broadcom/Kconfig"
endmenu

1
drivers/pinctrl/Makefile
View File

@ -22,3 +22,4 @@ obj-$(CONFIG_ARCH_MVEBU) += mvebu/
obj-$(CONFIG_PINCTRL_SINGLE) += pinctrl-single.o
obj-$(CONFIG_PINCTRL_STI) += pinctrl-sti.o
obj-$(CONFIG_PINCTRL_STM32) += pinctrl_stm32.o
obj-y += broadcom/

7
drivers/pinctrl/broadcom/Kconfig Normal file
View File

@ -0,0 +1,7 @@
config PINCTRL_BCM283X
depends on ARCH_BCM283X && PINCTRL_FULL && OF_CONTROL
default y
bool "Broadcom 283x family pin control driver"
help
Support pin multiplexing and pin configuration control on
Broadcom's 283x family of SoCs.

7
drivers/pinctrl/broadcom/Makefile Normal file
View File

@ -0,0 +1,7 @@
#
# Copyright (C) 2018 Alexander Graf <agraf@suse.de>
#
# SPDX-License-Identifier: GPL-2.0
# https://spdx.org/licenses
obj-$(CONFIG_PINCTRL_BCM283X) += pinctrl-bcm283x.o

152
drivers/pinctrl/broadcom/pinctrl-bcm283x.c Normal file
View File

@ -0,0 +1,152 @@
/*
* Copyright (C) 2018 Alexander Graf <agraf@suse.de>
*
* Based on drivers/pinctrl/mvebu/pinctrl-mvebu.c and
* drivers/gpio/bcm2835_gpio.c
*
* This driver gets instantiated by the GPIO driver, because both devices
* share the same device node.
*
* SPDX-License-Identifier: GPL-2.0
* https://spdx.org/licenses
*/
#include <common.h>
#include <config.h>
#include <errno.h>
#include <dm.h>
#include <dm/pinctrl.h>
#include <dm/root.h>
#include <dm/device-internal.h>
#include <dm/lists.h>
#include <asm/system.h>
#include <asm/io.h>
#include <asm/gpio.h>
struct bcm283x_pinctrl_priv {
u32 *base_reg;
};
#define MAX_PINS_PER_BANK 16
static void bcm2835_gpio_set_func_id(struct udevice *dev, unsigned int gpio,
int func)
{
struct bcm283x_pinctrl_priv *priv = dev_get_priv(dev);
int reg_offset;
int field_offset;
reg_offset = BCM2835_GPIO_FSEL_BANK(gpio);
field_offset = BCM2835_GPIO_FSEL_SHIFT(gpio);
clrsetbits_le32(&priv->base_reg[reg_offset],
BCM2835_GPIO_FSEL_MASK << field_offset,
(func & BCM2835_GPIO_FSEL_MASK) << field_offset);
}
static int bcm2835_gpio_get_func_id(struct udevice *dev, unsigned int gpio)
{
struct bcm283x_pinctrl_priv *priv = dev_get_priv(dev);
u32 val;
val = readl(&priv->base_reg[BCM2835_GPIO_FSEL_BANK(gpio)]);
return (val >> BCM2835_GPIO_FSEL_SHIFT(gpio) & BCM2835_GPIO_FSEL_MASK);
}
/*
* bcm283x_pinctrl_set_state: configure pin functions.
* @dev: the pinctrl device to be configured.
* @config: the state to be configured.
* @return: 0 in success
*/
int bcm283x_pinctrl_set_state(struct udevice *dev, struct udevice *config)
{
u32 pin_arr[MAX_PINS_PER_BANK];
u32 function;
int i, len, pin_count = 0;
if (!dev_read_prop(config, "brcm,pins", &len) || !len ||
len & 0x3 || dev_read_u32_array(config, "brcm,pins", pin_arr,
len / sizeof(u32))) {
debug("Failed reading pins array for pinconfig %s (%d)\n",
config->name, len);
return -EINVAL;
}
pin_count = len / sizeof(u32);
function = dev_read_u32_default(config, "brcm,function", -1);
if (function < 0) {
debug("Failed reading function for pinconfig %s (%d)\n",
config->name, function);
return -EINVAL;
}
for (i = 0; i < pin_count; i++)
bcm2835_gpio_set_func_id(dev, pin_arr[i], function);
return 0;
}
static int bcm283x_pinctrl_get_gpio_mux(struct udevice *dev, int banknum,
int index)
{
if (banknum != 0)
return -EINVAL;
return bcm2835_gpio_get_func_id(dev, index);
}
static const struct udevice_id bcm2835_pinctrl_id[] = {
{.compatible = "brcm,bcm2835-gpio"},
{}
};
int bcm283x_pinctl_probe(struct udevice *dev)
{
struct bcm283x_pinctrl_priv *priv;
int ret;
struct udevice *pdev;
priv = dev_get_priv(dev);
if (!priv) {
debug("%s: Failed to get private\n", __func__);
return -EINVAL;
}
priv->base_reg = dev_read_addr_ptr(dev);
if (priv->base_reg == (void *)FDT_ADDR_T_NONE) {
debug("%s: Failed to get base address\n", __func__);
return -EINVAL;
}
/* Create GPIO device as well */
ret = device_bind(dev, lists_driver_lookup_name("gpio_bcm2835"),
"gpio_bcm2835", NULL, dev_of_offset(dev), &pdev);
if (ret) {
/*
* While we really want the pinctrl driver to work to make
* devices go where they should go, the GPIO controller is
* not quite as crucial as it's only rarely used, so don't
* fail here.
*/
printf("Failed to bind GPIO driver\n");
}
return 0;
}
static struct pinctrl_ops bcm283x_pinctrl_ops = {
.set_state = bcm283x_pinctrl_set_state,
.get_gpio_mux = bcm283x_pinctrl_get_gpio_mux,
};
U_BOOT_DRIVER(pinctrl_bcm283x) = {
.name = "bcm283x_pinctrl",
.id = UCLASS_PINCTRL,
.of_match = of_match_ptr(bcm2835_pinctrl_id),
.priv_auto_alloc_size = sizeof(struct bcm283x_pinctrl_priv),
.ops = &bcm283x_pinctrl_ops,
.probe = bcm283x_pinctl_probe
};