Commit 01b4b1d1 authored by Huang-Huang Bao's avatar Huang-Huang Bao Committed by Linus Walleij
Browse files

pinctrl: rockchip: use dedicated pinctrl type for RK3328 



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: 3818e4a7 ("pinctrl: rockchip: Add rk3328 pinctrl support")
Reviewed-by: default avatarHeiko Stuebner <heiko@sntech.de>
Signed-off-by: default avatarHuang-Huang Bao <i@eh5.me>
Link: https://lore.kernel.org/r/20240606125755.53778-4-i@eh5.me


Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 5ef6914e

drivers/pinctrl/pinctrl-rockchip.c

+4 −1
Original line number Diff line number Diff line
@@ -2478,6 +2478,7 @@ static int rockchip_get_pull(struct rockchip_pin_bank *bank, int pin_num) 
	case RK3188:

	case RK3288:

	case RK3308:

	case RK3328:

	case RK3368:

	case RK3399:

	case RK3568:
@@ -2536,6 +2537,7 @@ static int rockchip_set_pull(struct rockchip_pin_bank *bank, 
	case RK3188:

	case RK3288:

	case RK3308:

	case RK3328:

	case RK3368:

	case RK3399:

	case RK3568:
@@ -2798,6 +2800,7 @@ static bool rockchip_pinconf_pull_valid(struct rockchip_pin_ctrl *ctrl, 
	case RK3188:

	case RK3288:

	case RK3308:

	case RK3328:

	case RK3368:

	case RK3399:

	case RK3568:
@@ -3822,7 +3825,7 @@ static struct rockchip_pin_ctrl rk3328_pin_ctrl = { 
		.pin_banks		= rk3328_pin_banks,

		.nr_banks		= ARRAY_SIZE(rk3328_pin_banks),

		.label			= "RK3328-GPIO",

		.type			= RK3288,

		.type			= RK3328,

		.grf_mux_offset		= 0x0,

		.iomux_recalced		= rk3328_mux_recalced_data,

		.niomux_recalced	= ARRAY_SIZE(rk3328_mux_recalced_data),

drivers/pinctrl/pinctrl-rockchip.h

+1 −0
Original line number Diff line number Diff line
@@ -193,6 +193,7 @@ enum rockchip_pinctrl_type { 
	RK3188,

	RK3288,

	RK3308,

	RK3328,

	RK3368,

	RK3399,

	RK3568,