aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-shmobile/pfc-r8a7740.c
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2012-06-12 05:35:58 -0400
committerRafael J. Wysocki <rjw@sisk.pl>2012-06-20 06:27:48 -0400
commite2dcd461a7ba0c3deb44336136ea784c8b972292 (patch)
tree16c8cae78794130a36db1adc9bd9894349fff804 /arch/arm/mach-shmobile/pfc-r8a7740.c
parentc6750acb3b54c77c011045467770d5143be749ee (diff)
ARM: shmobile: r8a7740: add HDMI GPIO support
In order to enable HDMI GPIO selection from platform board, this patch adds its interface to GPIO framework. This patch is based on v1.0 manual Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Acked-by: Magnus Damm <damm@opensource.se> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Diffstat (limited to 'arch/arm/mach-shmobile/pfc-r8a7740.c')
-rw-r--r--arch/arm/mach-shmobile/pfc-r8a7740.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/pfc-r8a7740.c b/arch/arm/mach-shmobile/pfc-r8a7740.c
index 670fe1869db..0dda816feff 100644
--- a/arch/arm/mach-shmobile/pfc-r8a7740.c
+++ b/arch/arm/mach-shmobile/pfc-r8a7740.c
@@ -560,6 +560,9 @@ enum {
560 /* SDENC */ 560 /* SDENC */
561 SDENC_CPG_MARK, SDENC_DV_CLKI_MARK, 561 SDENC_CPG_MARK, SDENC_DV_CLKI_MARK,
562 562
563 /* HDMI */
564 HDMI_HPD_MARK, HDMI_CEC_MARK,
565
563 /* DEBUG */ 566 /* DEBUG */
564 EDEBGREQ_PULLUP_MARK, /* for JTAG */ 567 EDEBGREQ_PULLUP_MARK, /* for JTAG */
565 EDEBGREQ_PULLDOWN_MARK, 568 EDEBGREQ_PULLDOWN_MARK,
@@ -1620,9 +1623,11 @@ static pinmux_enum_t pinmux_data[] = {
1620 1623
1621 /* Port210 */ 1624 /* Port210 */
1622 PINMUX_DATA(IRQ9_PORT210_MARK, PORT210_FN0, MSEL1CR_9_1), 1625 PINMUX_DATA(IRQ9_PORT210_MARK, PORT210_FN0, MSEL1CR_9_1),
1626 PINMUX_DATA(HDMI_HPD_MARK, PORT210_FN1),
1623 1627
1624 /* Port211 */ 1628 /* Port211 */
1625 PINMUX_DATA(IRQ16_PORT211_MARK, PORT211_FN0, MSEL1CR_16_1), 1629 PINMUX_DATA(IRQ16_PORT211_MARK, PORT211_FN0, MSEL1CR_16_1),
1630 PINMUX_DATA(HDMI_CEC_MARK, PORT211_FN1),
1626 1631
1627 /* LCDC select */ 1632 /* LCDC select */
1628 PINMUX_DATA(LCDC0_SELECT_MARK, MSEL3CR_6_0), 1633 PINMUX_DATA(LCDC0_SELECT_MARK, MSEL3CR_6_0),
@@ -2097,6 +2102,10 @@ static struct pinmux_gpio pinmux_gpios[] = {
2097 GPIO_FN(SDENC_CPG), 2102 GPIO_FN(SDENC_CPG),
2098 GPIO_FN(SDENC_DV_CLKI), 2103 GPIO_FN(SDENC_DV_CLKI),
2099 2104
2105 /* HDMI */
2106 GPIO_FN(HDMI_HPD),
2107 GPIO_FN(HDMI_CEC),
2108
2100 /* SYSC */ 2109 /* SYSC */
2101 GPIO_FN(RESETP_PULLUP), 2110 GPIO_FN(RESETP_PULLUP),
2102 GPIO_FN(RESETP_PLAIN), 2111 GPIO_FN(RESETP_PLAIN),