| From 324a377b25c8f48279298c74f52dcd864e742786 Mon Sep 17 00:00:00 2001 |
| From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> |
| Date: Wed, 8 May 2013 23:12:47 +0000 |
| Subject: sh-pfc: r8a7778: add USB pin groups |
| |
| Add USB0/1 PENC/USB_OVC pin groups to R8A7778 PFC driver. |
| |
| Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> |
| Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> |
| Acked-by: Linus Walleij <linus.walleij@linaro.org> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit 5cee53b6fc59c60c7fb7328c0a339dd37e6a5105) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/pinctrl/sh-pfc/pfc-r8a7778.c | 28 ++++++++++++++++++++++++++++ |
| 1 file changed, 28 insertions(+) |
| |
| diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7778.c b/drivers/pinctrl/sh-pfc/pfc-r8a7778.c |
| index 15295a5b..1f692e5b 100644 |
| --- a/drivers/pinctrl/sh-pfc/pfc-r8a7778.c |
| +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7778.c |
| @@ -1501,6 +1501,18 @@ SDHI_PFC_WPPN(sdhi2_wp_a, SD2_WP_A); |
| SDHI_PFC_PINS(sdhi2_wp_b, RCAR_GP_PIN(3, 28)); |
| SDHI_PFC_WPPN(sdhi2_wp_b, SD2_WP_B); |
| |
| +/* - USB0 ------------------------------------------------------------------- */ |
| +SH_PFC_PINS(usb0, RCAR_GP_PIN(0, 1)); |
| +SH_PFC_MUX1(usb0, PENC0); |
| +SH_PFC_PINS(usb0_ovc, RCAR_GP_PIN(0, 3)); |
| +SH_PFC_MUX1(usb0_ovc, USB_OVC0); |
| + |
| +/* - USB1 ------------------------------------------------------------------- */ |
| +SH_PFC_PINS(usb1, RCAR_GP_PIN(0, 2)); |
| +SH_PFC_MUX1(usb1, PENC1); |
| +SH_PFC_PINS(usb1_ovc, RCAR_GP_PIN(0, 4)); |
| +SH_PFC_MUX1(usb1_ovc, USB_OVC1); |
| + |
| static const struct sh_pfc_pin_group pinmux_groups[] = { |
| SH_PFC_PIN_GROUP(hscif0_data_a), |
| SH_PFC_PIN_GROUP(hscif0_data_b), |
| @@ -1570,6 +1582,10 @@ static const struct sh_pfc_pin_group pinmux_groups[] = { |
| SH_PFC_PIN_GROUP(sdhi2_data4_b), |
| SH_PFC_PIN_GROUP(sdhi2_wp_a), |
| SH_PFC_PIN_GROUP(sdhi2_wp_b), |
| + SH_PFC_PIN_GROUP(usb0), |
| + SH_PFC_PIN_GROUP(usb0_ovc), |
| + SH_PFC_PIN_GROUP(usb1), |
| + SH_PFC_PIN_GROUP(usb1_ovc), |
| }; |
| |
| static const char * const hscif0_groups[] = { |
| @@ -1677,6 +1693,16 @@ static const char * const sdhi2_groups[] = { |
| "sdhi2_wp_b", |
| }; |
| |
| +static const char * const usb0_groups[] = { |
| + "usb0", |
| + "usb0_ovc", |
| +}; |
| + |
| +static const char * const usb1_groups[] = { |
| + "usb1", |
| + "usb1_ovc", |
| +}; |
| + |
| static const struct sh_pfc_function pinmux_functions[] = { |
| SH_PFC_FUNCTION(hscif0), |
| SH_PFC_FUNCTION(hscif1), |
| @@ -1690,6 +1716,8 @@ static const struct sh_pfc_function pinmux_functions[] = { |
| SH_PFC_FUNCTION(sdhi0), |
| SH_PFC_FUNCTION(sdhi1), |
| SH_PFC_FUNCTION(sdhi2), |
| + SH_PFC_FUNCTION(usb0), |
| + SH_PFC_FUNCTION(usb1), |
| }; |
| |
| static struct pinmux_cfg_reg pinmux_config_regs[] = { |
| -- |
| 1.8.4.3.gca3854a |
| |