bcm283x: Add pinctrl driver

[oweals/u-boot.git] / board / raspberrypi / rpi / rpi.c

diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c
index 3b7a54f519d701de8f83543038d696873a415601..c8924d43627cc364dae9e51f752af05d18282008 100644 (file)
--- 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;