diff options
author | Tom Rini <trini@konsulko.com> | 2023-03-20 17:51:10 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2023-03-20 17:51:10 -0400 |
commit | 1a4f2cc55a2e8d12f7b5fe13a5ba167e48ef7a85 (patch) | |
tree | cc2c42f4ecece074870c2b5821c4041c7e24d7ce /drivers/gpio/sh_pfc.c | |
parent | 95e0f9ac095bb250024c7648c3b0733d0a61a189 (diff) | |
parent | 6254c5f7e176311eb8bd57817f85d1eed1c362cb (diff) |
Merge branch 'next' of https://source.denx.de/u-boot/custodians/u-boot-sh into next
Diffstat (limited to 'drivers/gpio/sh_pfc.c')
-rw-r--r-- | drivers/gpio/sh_pfc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpio/sh_pfc.c b/drivers/gpio/sh_pfc.c index 988f7e9bbad..92522b63bbe 100644 --- a/drivers/gpio/sh_pfc.c +++ b/drivers/gpio/sh_pfc.c @@ -568,10 +568,10 @@ static int sh_gpio_get_value(struct pinmux_info *gpioc, unsigned gpio) if (!gpioc || get_data_reg(gpioc, gpio, &dr, &bit) != 0) return -1; -#if defined(CONFIG_RCAR_GEN3) - if ((gpioc->gpios[gpio].flags & PINMUX_FLAG_TYPE) == PINMUX_TYPE_INPUT) + + if (IS_ENABLED(CONFIG_RCAR_GEN3) && + ((gpioc->gpios[gpio].flags & PINMUX_FLAG_TYPE) == PINMUX_TYPE_INPUT)) offset += 4; -#endif return gpio_read_bit(dr, offset, bit); } |