diff options
| author | Tom Rini <trini@konsulko.com> | 2017-06-23 08:23:14 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-06-23 08:23:14 -0400 |
| commit | 431c66a3bad13e13c1d44ef4ec3638f95e72e11d (patch) | |
| tree | 76c35babd4befe835f8546eb1a71880aa24bfe5b | |
| parent | c8f258d8a8452b9f74c0032aaa3dee3804b1fd45 (diff) | |
| parent | ae118b6855a7d003a7d024129e686c8a4a400141 (diff) | |
| download | u-boot-431c66a3bad13e13c1d44ef4ec3638f95e72e11d.zip u-boot-431c66a3bad13e13c1d44ef4ec3638f95e72e11d.tar.gz u-boot-431c66a3bad13e13c1d44ef4ec3638f95e72e11d.tar.bz2 | |
Merge git://www.denx.de/git/u-boot-marvell
| -rw-r--r-- | drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c index 3bb4c43..27165b0 100644 --- 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; } |