Skip to content

Commit bb4886a

Browse files
committed
ayufan: rk3399: support i2c4
1 parent 4cbafce commit bb4886a

File tree

2 files changed

+14
-1
lines changed

2 files changed

+14
-1
lines changed

arch/arm/include/asm/arch-rockchip/grf_rk3399.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -575,6 +575,12 @@ enum {
575575
PMUGRF_GPIO1B2_SEL_SHIFT = 4,
576576
PMUGRF_GPIO1B2_SEL_MASK = 3 << PMUGRF_GPIO1B2_SEL_SHIFT,
577577
PMUGRF_SPI1EC_CSN0 = 2,
578+
PMUGRF_GPIO1B3_SEL_SHIFT = 6,
579+
PMUGRF_GPIO1B3_SEL_MASK = 3 << PMUGRF_GPIO1B3_SEL_SHIFT,
580+
PMUGRF_I2C4PMU_SDA = 1,
581+
PMUGRF_GPIO1B4_SEL_SHIFT = 8,
582+
PMUGRF_GPIO1B4_SEL_MASK = 3 << PMUGRF_GPIO1B4_SEL_SHIFT,
583+
PMUGRF_I2C4PMU_SCL = 1,
578584
PMUGRF_GPIO1B6_SEL_SHIFT = 12,
579585
PMUGRF_GPIO1B6_SEL_MASK = 3 << PMUGRF_GPIO1B6_SEL_SHIFT,
580586
PMUGRF_PWM_3B = 1,

drivers/pinctrl/rockchip/pinctrl_rk3399.c

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,17 @@ static void pinctrl_rk3399_i2c_config(struct rk3399_grf_regs *grf,
7070
PMUGRF_GPIO1C0_SEL_MASK,
7171
PMUGRF_I2C0PMU_SCL << PMUGRF_GPIO1C0_SEL_SHIFT);
7272
break;
73+
case PERIPH_ID_I2C4:
74+
rk_clrsetreg(&pmugrf->gpio1b_iomux,
75+
PMUGRF_GPIO1B3_SEL_MASK,
76+
PMUGRF_I2C4PMU_SDA << PMUGRF_GPIO1B3_SEL_SHIFT);
77+
rk_clrsetreg(&pmugrf->gpio1b_iomux,
78+
PMUGRF_GPIO1B4_SEL_MASK,
79+
PMUGRF_I2C4PMU_SCL << PMUGRF_GPIO1B4_SEL_SHIFT);
80+
break;
7381
case PERIPH_ID_I2C1:
7482
case PERIPH_ID_I2C2:
7583
case PERIPH_ID_I2C3:
76-
case PERIPH_ID_I2C4:
7784
case PERIPH_ID_I2C5:
7885
default:
7986
debug("i2c id = %d iomux error!\n", i2c_id);

0 commit comments

Comments
 (0)