Merge git://git.denx.de/u-boot-fsl-qoriq

[oweals/u-boot.git] / drivers / pinctrl / mvebu / pinctrl-armada-37xx.c

diff --git a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
index 3bb4c4341ce21902738c7df5734b5bfa4a885803..2bf853eba13d237d3c6882daae08128fdb18e815 100644 (file)
--- a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
+++ b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
@@ -159,8 +159,9 @@ static struct armada_37xx_pin_group armada_37xx_nb_groups[] = {
        PIN_GRP_GPIO("onewire", 4, 1, BIT(16), "onewire"),
        PIN_GRP_GPIO("uart1", 25, 2, BIT(17), "uart"),
        PIN_GRP_GPIO("spi_quad", 15, 2, BIT(18), "spi"),
-       PIN_GRP_EXTRA("uart2", 9, 2, BIT(13) | BIT(14) | BIT(19),
-                     BIT(13) | BIT(14), BIT(19), 18, 2, "gpio", "uart"),
+       PIN_GRP_EXTRA("uart2", 9, 2, BIT(1) | BIT(13) | BIT(14) | BIT(19),
+                     BIT(1) | BIT(13) | BIT(14), BIT(1) | BIT(19),
+                     18, 2, "gpio", "uart"),
        PIN_GRP_GPIO("led0_od", 11, 1, BIT(20), "led"),
        PIN_GRP_GPIO("led1_od", 12, 1, BIT(21), "led"),
        PIN_GRP_GPIO("led2_od", 13, 1, BIT(22), "led"),
@@ -538,7 +539,7 @@ static int armada_37xx_gpiochip_register(struct udevice *parent,
        }
 
        fdt_for_each_subnode(subnode, blob, node) {
-               if (!fdtdec_get_bool(blob, subnode, "gpio-controller")) {
+               if (fdtdec_get_bool(blob, subnode, "gpio-controller")) {
                        ret = 0;
                        break;
                }
@@ -577,7 +578,7 @@ int armada_37xx_pinctrl_probe(struct udevice *dev)
 
        info->base = (void __iomem *)devfdt_get_addr(dev);
        if (!info->base) {
-               error("unable to find regmap\n");
+               pr_err("unable to find regmap\n");
                return -ENODEV;
        }