diff options
author | Shinya Kuribayashi <shinya.kuribayashi.px@renesas.com> | 2013-05-24 03:31:32 -0400 |
---|---|---|
committer | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2013-07-29 09:52:10 -0400 |
commit | 05bcb07bc8dd5f185e9f6568866e7b1abdc60e82 (patch) | |
tree | 4eb178d51973880b9b2ac9e4c282fd4fd2d794c3 /drivers/pinctrl | |
parent | 5de880dd953ebb5b5d7852ce568608e828a7217e (diff) |
sh-pfc: r8a7790: Add TCLK1 pin configuration support
Update the pinmux configuration tables to support the TCLK1 pin.
Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi.px@renesas.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Diffstat (limited to 'drivers/pinctrl')
-rw-r--r-- | drivers/pinctrl/sh-pfc/pfc-r8a7790.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7790.c b/drivers/pinctrl/sh-pfc/pfc-r8a7790.c index b06d36ce10ab..51e590bf7435 100644 --- a/drivers/pinctrl/sh-pfc/pfc-r8a7790.c +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7790.c | |||
@@ -170,7 +170,7 @@ enum { | |||
170 | FN_VI0_R1, FN_VI0_R1_B, FN_TX0_B, FN_D6, | 170 | FN_VI0_R1, FN_VI0_R1_B, FN_TX0_B, FN_D6, |
171 | FN_IIC2_SCL_C, FN_VI3_DATA6, FN_VI0_R2, FN_VI0_R2_B, | 171 | FN_IIC2_SCL_C, FN_VI3_DATA6, FN_VI0_R2, FN_VI0_R2_B, |
172 | FN_I2C2_SCL_C, FN_D7, FN_AD_DI_B, FN_IIC2_SDA_C, | 172 | FN_I2C2_SCL_C, FN_D7, FN_AD_DI_B, FN_IIC2_SDA_C, |
173 | FN_VI3_DATA7, FN_VI0_R3, FN_VI0_R3_B, FN_I2C2_SDA_C, | 173 | FN_VI3_DATA7, FN_VI0_R3, FN_VI0_R3_B, FN_I2C2_SDA_C, FN_TCLK1, |
174 | FN_D8, FN_SCIFA1_SCK_C, FN_AVB_TXD0, | 174 | FN_D8, FN_SCIFA1_SCK_C, FN_AVB_TXD0, |
175 | FN_VI0_G0, FN_VI0_G0_B, FN_VI2_DATA0_VI2_B0, | 175 | FN_VI0_G0, FN_VI0_G0_B, FN_VI2_DATA0_VI2_B0, |
176 | 176 | ||
@@ -547,7 +547,7 @@ enum { | |||
547 | VI0_R1_MARK, VI0_R1_B_MARK, TX0_B_MARK, D6_MARK, | 547 | VI0_R1_MARK, VI0_R1_B_MARK, TX0_B_MARK, D6_MARK, |
548 | IIC2_SCL_C_MARK, VI3_DATA6_MARK, VI0_R2_MARK, VI0_R2_B_MARK, | 548 | IIC2_SCL_C_MARK, VI3_DATA6_MARK, VI0_R2_MARK, VI0_R2_B_MARK, |
549 | I2C2_SCL_C_MARK, D7_MARK, AD_DI_B_MARK, IIC2_SDA_C_MARK, | 549 | I2C2_SCL_C_MARK, D7_MARK, AD_DI_B_MARK, IIC2_SDA_C_MARK, |
550 | VI3_DATA7_MARK, VI0_R3_MARK, VI0_R3_B_MARK, I2C2_SDA_C_MARK, | 550 | VI3_DATA7_MARK, VI0_R3_MARK, VI0_R3_B_MARK, I2C2_SDA_C_MARK, TCLK1_MARK, |
551 | D8_MARK, SCIFA1_SCK_C_MARK, AVB_TXD0_MARK, | 551 | D8_MARK, SCIFA1_SCK_C_MARK, AVB_TXD0_MARK, |
552 | VI0_G0_MARK, VI0_G0_B_MARK, VI2_DATA0_VI2_B0_MARK, | 552 | VI0_G0_MARK, VI0_G0_B_MARK, VI2_DATA0_VI2_B0_MARK, |
553 | 553 | ||
@@ -900,6 +900,7 @@ static const pinmux_enum_t pinmux_data[] = { | |||
900 | PINMUX_IPSR_MODSEL_DATA(IP0_26_23, VI0_R3, SEL_VI0_0), | 900 | PINMUX_IPSR_MODSEL_DATA(IP0_26_23, VI0_R3, SEL_VI0_0), |
901 | PINMUX_IPSR_MODSEL_DATA(IP0_26_23, VI0_R3_B, SEL_VI0_1), | 901 | PINMUX_IPSR_MODSEL_DATA(IP0_26_23, VI0_R3_B, SEL_VI0_1), |
902 | PINMUX_IPSR_MODSEL_DATA(IP0_26_23, I2C2_SDA_C, SEL_I2C2_2), | 902 | PINMUX_IPSR_MODSEL_DATA(IP0_26_23, I2C2_SDA_C, SEL_I2C2_2), |
903 | PINMUX_IPSR_MODSEL_DATA(IP0_26_23, TCLK1, SEL_TMU1_0), | ||
903 | PINMUX_IPSR_DATA(IP0_30_27, D8), | 904 | PINMUX_IPSR_DATA(IP0_30_27, D8), |
904 | PINMUX_IPSR_MODSEL_DATA(IP0_30_27, SCIFA1_SCK_C, SEL_SCIFA1_2), | 905 | PINMUX_IPSR_MODSEL_DATA(IP0_30_27, SCIFA1_SCK_C, SEL_SCIFA1_2), |
905 | PINMUX_IPSR_DATA(IP0_30_27, AVB_TXD0), | 906 | PINMUX_IPSR_DATA(IP0_30_27, AVB_TXD0), |
@@ -3214,7 +3215,7 @@ static struct pinmux_cfg_reg pinmux_config_regs[] = { | |||
3214 | /* IP0_26_23 [4] */ | 3215 | /* IP0_26_23 [4] */ |
3215 | FN_D7, FN_AD_DI_B, FN_IIC2_SDA_C, | 3216 | FN_D7, FN_AD_DI_B, FN_IIC2_SDA_C, |
3216 | FN_VI3_DATA7, FN_VI0_R3, FN_VI0_R3_B, FN_I2C2_SDA_C, | 3217 | FN_VI3_DATA7, FN_VI0_R3, FN_VI0_R3_B, FN_I2C2_SDA_C, |
3217 | 0, 0, 0, 0, 0, 0, 0, 0, 0, | 3218 | FN_TCLK1, 0, 0, 0, 0, 0, 0, 0, 0, |
3218 | /* IP0_22_20 [3] */ | 3219 | /* IP0_22_20 [3] */ |
3219 | FN_D6, FN_IIC2_SCL_C, FN_VI3_DATA6, FN_VI0_R2, FN_VI0_R2_B, | 3220 | FN_D6, FN_IIC2_SCL_C, FN_VI3_DATA6, FN_VI0_R2, FN_VI0_R2_B, |
3220 | FN_I2C2_SCL_C, 0, 0, | 3221 | FN_I2C2_SCL_C, 0, 0, |