aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pinctrl
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>2013-03-07 07:36:36 -0500
committerLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>2013-03-15 08:34:08 -0400
commit0f6e2e0e4e3cf5899c9acf03884991bb67301132 (patch)
tree51452b71e52a3195ce7b343608f351978495ebcb /drivers/pinctrl
parentf516238737e1412613aee493961f352977666bbd (diff)
sh-pfc: r8a7779: Add USB0 and USB1 PENC pinmux support
The USB0 and USB1 PENC functions were missing. Add them. Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> Acked-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl')
-rw-r--r--drivers/pinctrl/sh-pfc/pfc-r8a7779.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7779.c b/drivers/pinctrl/sh-pfc/pfc-r8a7779.c
index 361b16240887..946572bcdaac 100644
--- a/drivers/pinctrl/sh-pfc/pfc-r8a7779.c
+++ b/drivers/pinctrl/sh-pfc/pfc-r8a7779.c
@@ -429,7 +429,8 @@ enum {
429 A0_MARK, SD1_DAT3_MARK, MMC0_D3_MARK, FD3_MARK, 429 A0_MARK, SD1_DAT3_MARK, MMC0_D3_MARK, FD3_MARK,
430 BS_MARK, SD1_DAT2_MARK, MMC0_D2_MARK, FD2_MARK, 430 BS_MARK, SD1_DAT2_MARK, MMC0_D2_MARK, FD2_MARK,
431 ATADIR0_MARK, SDSELF_MARK, HCTS1_MARK, TX4_C_MARK, 431 ATADIR0_MARK, SDSELF_MARK, HCTS1_MARK, TX4_C_MARK,
432 USB_PENC2_MARK, SCK0_MARK, PWM1_MARK, PWMFSW0_MARK, 432 USB_PENC0_MARK, USB_PENC1_MARK, USB_PENC2_MARK,
433 SCK0_MARK, PWM1_MARK, PWMFSW0_MARK,
433 SCIF_CLK_MARK, TCLK0_C_MARK, 434 SCIF_CLK_MARK, TCLK0_C_MARK,
434 435
435 EX_CS0_MARK, RX3_C_IRDA_RX_C_MARK, MMC0_D6_MARK, 436 EX_CS0_MARK, RX3_C_IRDA_RX_C_MARK, MMC0_D6_MARK,
@@ -640,6 +641,9 @@ static const pinmux_enum_t pinmux_data[] = {
640 PINMUX_DATA(A18_MARK, FN_A18), 641 PINMUX_DATA(A18_MARK, FN_A18),
641 PINMUX_DATA(A19_MARK, FN_A19), 642 PINMUX_DATA(A19_MARK, FN_A19),
642 643
644 PINMUX_DATA(USB_PENC0_MARK, FN_USB_PENC0),
645 PINMUX_DATA(USB_PENC1_MARK, FN_USB_PENC1),
646
643 PINMUX_IPSR_DATA(IP0_2_0, USB_PENC2), 647 PINMUX_IPSR_DATA(IP0_2_0, USB_PENC2),
644 PINMUX_IPSR_MODSEL_DATA(IP0_2_0, SCK0, SEL_SCIF0_0), 648 PINMUX_IPSR_MODSEL_DATA(IP0_2_0, SCK0, SEL_SCIF0_0),
645 PINMUX_IPSR_DATA(IP0_2_0, PWM1), 649 PINMUX_IPSR_DATA(IP0_2_0, PWM1),