Skip to content

Commit 01b4b1d

Browse files
EHfivelinusw
authored andcommitted
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: 3818e4a ("pinctrl: rockchip: Add rk3328 pinctrl support") Reviewed-by: Heiko Stuebner <[email protected]> Signed-off-by: Huang-Huang Bao <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Linus Walleij <[email protected]>
1 parent 5ef6914 commit 01b4b1d

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

drivers/pinctrl/pinctrl-rockchip.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2478,6 +2478,7 @@ static int rockchip_get_pull(struct rockchip_pin_bank *bank, int pin_num)
24782478
case RK3188:
24792479
case RK3288:
24802480
case RK3308:
2481+
case RK3328:
24812482
case RK3368:
24822483
case RK3399:
24832484
case RK3568:
@@ -2536,6 +2537,7 @@ static int rockchip_set_pull(struct rockchip_pin_bank *bank,
25362537
case RK3188:
25372538
case RK3288:
25382539
case RK3308:
2540+
case RK3328:
25392541
case RK3368:
25402542
case RK3399:
25412543
case RK3568:
@@ -2798,6 +2800,7 @@ static bool rockchip_pinconf_pull_valid(struct rockchip_pin_ctrl *ctrl,
27982800
case RK3188:
27992801
case RK3288:
28002802
case RK3308:
2803+
case RK3328:
28012804
case RK3368:
28022805
case RK3399:
28032806
case RK3568:
@@ -3822,7 +3825,7 @@ static struct rockchip_pin_ctrl rk3328_pin_ctrl = {
38223825
.pin_banks = rk3328_pin_banks,
38233826
.nr_banks = ARRAY_SIZE(rk3328_pin_banks),
38243827
.label = "RK3328-GPIO",
3825-
.type = RK3288,
3828+
.type = RK3328,
38263829
.grf_mux_offset = 0x0,
38273830
.iomux_recalced = rk3328_mux_recalced_data,
38283831
.niomux_recalced = ARRAY_SIZE(rk3328_mux_recalced_data),

drivers/pinctrl/pinctrl-rockchip.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,7 @@ enum rockchip_pinctrl_type {
193193
RK3188,
194194
RK3288,
195195
RK3308,
196+
RK3328,
196197
RK3368,
197198
RK3399,
198199
RK3568,

0 commit comments

Comments
 (0)