| Message ID | 20210913224926.1260726-2-heiko@sntech.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | gpio/pinctrl-rockchip: Fixes for the recently separated gpio/pinctrl driver | expand |
On Tue, Sep 14, 2021 at 12:49 AM Heiko Stuebner <heiko@sntech.de> wrote: > The gpio driver runs into issues on v1 gpio blocks, as the db_clk > and the whole extended debounce support is only ever defined on v2. > So checking for the IS_ERR on the db_clk is not enough, as it will > be NULL on v1. > > Fix this by adding the needed condition for v2 first before checking > the existence of the db_clk. > > This caused my rk3288-veyron-pinky to enter a reboot loop when it > tried to enable the power-key as adc-key device. > > Fixes: 3bcbd1a85b68 ("gpio/rockchip: support next version gpio controller") > Signed-off-by: Heiko Stuebner <heiko@sntech.de> Reviewed-by: Linus Walleij <linus.walleij@linaro.org> This can be applied by Bartosz to the GPIO subsystem. Yours, Linus Walleij
On Tue, Sep 14, 2021 at 12:49 AM Heiko Stuebner <heiko@sntech.de> wrote: > > The gpio driver runs into issues on v1 gpio blocks, as the db_clk > and the whole extended debounce support is only ever defined on v2. > So checking for the IS_ERR on the db_clk is not enough, as it will > be NULL on v1. > > Fix this by adding the needed condition for v2 first before checking > the existence of the db_clk. > > This caused my rk3288-veyron-pinky to enter a reboot loop when it > tried to enable the power-key as adc-key device. > > Fixes: 3bcbd1a85b68 ("gpio/rockchip: support next version gpio controller") > Signed-off-by: Heiko Stuebner <heiko@sntech.de> > --- Queued for fixes. Thanks! Bart
diff --git a/drivers/gpio/gpio-rockchip.c b/drivers/gpio/gpio-rockchip.c index 036b2d959503..16d9bf7188e3 100644 --- a/drivers/gpio/gpio-rockchip.c +++ b/drivers/gpio/gpio-rockchip.c @@ -195,7 +195,7 @@ static int rockchip_gpio_set_debounce(struct gpio_chip *gc, unsigned int cur_div_reg; u64 div; - if (!IS_ERR(bank->db_clk)) { + if (bank->gpio_type == GPIO_TYPE_V2 && !IS_ERR(bank->db_clk)) { div_debounce_support = true; freq = clk_get_rate(bank->db_clk); max_debounce = (GENMASK(23, 0) + 1) * 2 * 1000000 / freq;
The gpio driver runs into issues on v1 gpio blocks, as the db_clk and the whole extended debounce support is only ever defined on v2. So checking for the IS_ERR on the db_clk is not enough, as it will be NULL on v1. Fix this by adding the needed condition for v2 first before checking the existence of the db_clk. This caused my rk3288-veyron-pinky to enter a reboot loop when it tried to enable the power-key as adc-key device. Fixes: 3bcbd1a85b68 ("gpio/rockchip: support next version gpio controller") Signed-off-by: Heiko Stuebner <heiko@sntech.de> --- drivers/gpio/gpio-rockchip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)