summaryrefslogtreecommitdiff
path: root/drivers/pinctrl
diff options
context:
space:
mode:
authorKilian Strasser <kilian.strasser@wolfvision.net>2023-02-09 10:56:40 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2023-02-10 10:50:01 +0100
commit6652ffcdab4716f2bf0b3bb75d79069ec1698ec6 (patch)
treeb6fcbbdd7342b4e19919c25a6f52feecbb169c2b /drivers/pinctrl
parent0275cbae004d3f8510589d486645cd5d205cc525 (diff)
downloadbarebox-6652ffcdab4716f2bf0b3bb75d79069ec1698ec6.tar.gz
pinctrl: rockchip: fix get_value
Function gpioinfo returns wrong gpio values. In the file pinctrl.rockchip.c a wrong register offset is used by the function rockchip_gpiov2_get_value. Also the bit-mask for this register is wrong. Change register offset for this function to GPIO_EXT_PORT and set the bit-mask correctly. Signed-off-by: Kilian Strasser <kilian.strasser@wolfvision.net> Link: https://lore.barebox.org/20230209095640.47469-1-kilian.strasser@wolfvision.net Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/pinctrl')
-rw-r--r--drivers/pinctrl/pinctrl-rockchip.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/pinctrl/pinctrl-rockchip.c b/drivers/pinctrl/pinctrl-rockchip.c
index 1e51b1574e..ed53630fe0 100644
--- a/drivers/pinctrl/pinctrl-rockchip.c
+++ b/drivers/pinctrl/pinctrl-rockchip.c
@@ -226,6 +226,7 @@ enum {
RK_GPIOV2_DR_H = 0x04,
RK_GPIOV2_DDR_L = 0x08,
RK_GPIOV2_DDR_H = 0x0c,
+ RK_GPIOV2_EXT_PORT = 0x70,
};
static struct rockchip_pin_bank *gc_to_rockchip_pinctrl(struct gpio_chip *gc)
@@ -306,12 +307,8 @@ static int rockchip_gpiov2_get_value(struct gpio_chip *gc, unsigned int gpio)
struct rockchip_pin_bank *bank = gc_to_rockchip_pinctrl(gc);
u32 mask, r;
- mask = 1 << (gpio % 16);
-
- if (gpio < 16)
- r = readl(bank->reg_base + RK_GPIOV2_DR_L);
- else
- r = readl(bank->reg_base + RK_GPIOV2_DR_L);
+ mask = 1 << (gpio % 32);
+ r = readl(bank->reg_base + RK_GPIOV2_EXT_PORT);
return r & mask ? 1 : 0;
}