diff options
| author | Alexander Graf <agraf@suse.de> | 2018-01-23 18:05:21 +0100 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-01-28 12:27:32 -0500 |
| commit | caf2233b281c03e3e359061a3dfa537d8a25c273 (patch) | |
| tree | 028ce4e5fbf40c57382d9010fb2ade46cd1b187f /board/raspberrypi/rpi/rpi.c | |
| parent | 8996975ff8422e07f43eb8b3b0c7ed8c2b35442f (diff) | |
bcm283x: Add pinctrl driver
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>
Diffstat (limited to 'board/raspberrypi/rpi/rpi.c')
| -rw-r--r-- | board/raspberrypi/rpi/rpi.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c index 3b7a54f519..c8924d4362 100644 --- a/board/raspberrypi/rpi/rpi.c +++ b/board/raspberrypi/rpi/rpi.c @@ -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; |