pinctrl: rockchip: use dedicated pinctrl type for RK3328
[ Upstream commit 01b4b1d1cec48ef4c26616c2fc4600b2c9fec05a ]
rk3328_pin_ctrl uses type of RK3288 which has a hack in
rockchip_pinctrl_suspend and rockchip_pinctrl_resume to restore GPIO6-C6
at assume, the hack is not applicable to RK3328 as GPIO6 is not even
exist in it. So use a dedicated pinctrl type to skip this hack.
Fixes: 3818e4a767
("pinctrl: rockchip: Add rk3328 pinctrl support")
Reviewed-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Huang-Huang Bao <i@eh5.me>
Link: https://lore.kernel.org/r/20240606125755.53778-4-i@eh5.me
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
926cb583b9
commit
6531f8c666
@ -1864,6 +1864,7 @@ static int rockchip_get_pull(struct rockchip_pin_bank *bank, int pin_num)
|
|||||||
case RK3188:
|
case RK3188:
|
||||||
case RK3288:
|
case RK3288:
|
||||||
case RK3308:
|
case RK3308:
|
||||||
|
case RK3328:
|
||||||
case RK3368:
|
case RK3368:
|
||||||
case RK3399:
|
case RK3399:
|
||||||
case RK3568:
|
case RK3568:
|
||||||
@ -1918,6 +1919,7 @@ static int rockchip_set_pull(struct rockchip_pin_bank *bank,
|
|||||||
case RK3188:
|
case RK3188:
|
||||||
case RK3288:
|
case RK3288:
|
||||||
case RK3308:
|
case RK3308:
|
||||||
|
case RK3328:
|
||||||
case RK3368:
|
case RK3368:
|
||||||
case RK3399:
|
case RK3399:
|
||||||
case RK3568:
|
case RK3568:
|
||||||
@ -2239,6 +2241,7 @@ static bool rockchip_pinconf_pull_valid(struct rockchip_pin_ctrl *ctrl,
|
|||||||
case RK3188:
|
case RK3188:
|
||||||
case RK3288:
|
case RK3288:
|
||||||
case RK3308:
|
case RK3308:
|
||||||
|
case RK3328:
|
||||||
case RK3368:
|
case RK3368:
|
||||||
case RK3399:
|
case RK3399:
|
||||||
case RK3568:
|
case RK3568:
|
||||||
@ -3717,7 +3720,7 @@ static struct rockchip_pin_ctrl rk3328_pin_ctrl = {
|
|||||||
.pin_banks = rk3328_pin_banks,
|
.pin_banks = rk3328_pin_banks,
|
||||||
.nr_banks = ARRAY_SIZE(rk3328_pin_banks),
|
.nr_banks = ARRAY_SIZE(rk3328_pin_banks),
|
||||||
.label = "RK3328-GPIO",
|
.label = "RK3328-GPIO",
|
||||||
.type = RK3288,
|
.type = RK3328,
|
||||||
.grf_mux_offset = 0x0,
|
.grf_mux_offset = 0x0,
|
||||||
.iomux_recalced = rk3328_mux_recalced_data,
|
.iomux_recalced = rk3328_mux_recalced_data,
|
||||||
.niomux_recalced = ARRAY_SIZE(rk3328_mux_recalced_data),
|
.niomux_recalced = ARRAY_SIZE(rk3328_mux_recalced_data),
|
||||||
|
@ -27,6 +27,7 @@ enum rockchip_pinctrl_type {
|
|||||||
RK3188,
|
RK3188,
|
||||||
RK3288,
|
RK3288,
|
||||||
RK3308,
|
RK3308,
|
||||||
|
RK3328,
|
||||||
RK3368,
|
RK3368,
|
||||||
RK3399,
|
RK3399,
|
||||||
RK3568,
|
RK3568,
|
||||||
|
Loading…
Reference in New Issue
Block a user