mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 04:13:31 +00:00
47 lines
1.5 KiB
Diff
47 lines
1.5 KiB
Diff
From 41209307cad7f14c387c68375a93b50e54261a53 Mon Sep 17 00:00:00 2001
|
|
From: Ye Zhang <ye.zhang@rock-chips.com>
|
|
Date: Tue, 12 Nov 2024 09:54:06 +0800
|
|
Subject: [PATCH] gpio: rockchip: change the GPIO version judgment logic
|
|
|
|
Have a list of valid IDs and default to -ENODEV.
|
|
|
|
Signed-off-by: Ye Zhang <ye.zhang@rock-chips.com>
|
|
Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.com>
|
|
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
|
|
Link: https://lore.kernel.org/r/20241112015408.3139996-3-ye.zhang@rock-chips.com
|
|
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
|
|
---
|
|
drivers/gpio/gpio-rockchip.c | 12 +++++++++---
|
|
1 file changed, 9 insertions(+), 3 deletions(-)
|
|
|
|
--- a/drivers/gpio/gpio-rockchip.c
|
|
+++ b/drivers/gpio/gpio-rockchip.c
|
|
@@ -667,8 +667,9 @@ static int rockchip_get_bank_data(struct
|
|
clk_prepare_enable(bank->clk);
|
|
id = readl(bank->reg_base + gpio_regs_v2.version_id);
|
|
|
|
- /* If not gpio v2, that is default to v1. */
|
|
- if (id == GPIO_TYPE_V2 || id == GPIO_TYPE_V2_1) {
|
|
+ switch (id) {
|
|
+ case GPIO_TYPE_V2:
|
|
+ case GPIO_TYPE_V2_1:
|
|
bank->gpio_regs = &gpio_regs_v2;
|
|
bank->gpio_type = GPIO_TYPE_V2;
|
|
bank->db_clk = of_clk_get(bank->of_node, 1);
|
|
@@ -677,9 +678,14 @@ static int rockchip_get_bank_data(struct
|
|
clk_disable_unprepare(bank->clk);
|
|
return -EINVAL;
|
|
}
|
|
- } else {
|
|
+ break;
|
|
+ case GPIO_TYPE_V1:
|
|
bank->gpio_regs = &gpio_regs_v1;
|
|
bank->gpio_type = GPIO_TYPE_V1;
|
|
+ break;
|
|
+ default:
|
|
+ dev_err(bank->dev, "unsupported version ID: 0x%08x\n", id);
|
|
+ return -ENODEV;
|
|
}
|
|
|
|
return 0;
|