aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pinctrl/sh-pfc
diff options
context:
space:
mode:
authorMagnus Damm <damm@opensource.se>2014-01-29 18:10:19 -0500
committerLinus Walleij <linus.walleij@linaro.org>2014-02-11 03:35:19 -0500
commit97e00faaf16a0642cac47937e26f437651a6b4a4 (patch)
treee7fba466bf3c097f4d19877492c790c846e4a7a0 /drivers/pinctrl/sh-pfc
parent9a8b6079721ff2e59439fa688916c8e364599eef (diff)
pinctrl: sh-pfc: r8a7790: Break out USB0 OVC/VBUS
Create a new group for the USB0 OVC/VBUS pin by itself. This allows us to monitor PWEN as GPIO on the Lager board. Signed-off-by: Magnus Damm <damm@opensource.se> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Acked-by: Simon Horman <horms+renesas@verge.net.au> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl/sh-pfc')
-rw-r--r--drivers/pinctrl/sh-pfc/pfc-r8a7790.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7790.c b/drivers/pinctrl/sh-pfc/pfc-r8a7790.c
index c381ae63c508..ee2ae05c23ad 100644
--- a/drivers/pinctrl/sh-pfc/pfc-r8a7790.c
+++ b/drivers/pinctrl/sh-pfc/pfc-r8a7790.c
@@ -3231,6 +3231,13 @@ static const unsigned int usb0_pins[] = {
3231static const unsigned int usb0_mux[] = { 3231static const unsigned int usb0_mux[] = {
3232 USB0_PWEN_MARK, USB0_OVC_VBUS_MARK, 3232 USB0_PWEN_MARK, USB0_OVC_VBUS_MARK,
3233}; 3233};
3234static const unsigned int usb0_ovc_vbus_pins[] = {
3235 /* OVC/VBUS */
3236 RCAR_GP_PIN(5, 19),
3237};
3238static const unsigned int usb0_ovc_vbus_mux[] = {
3239 USB0_OVC_VBUS_MARK,
3240};
3234/* - USB1 ------------------------------------------------------------------- */ 3241/* - USB1 ------------------------------------------------------------------- */
3235static const unsigned int usb1_pins[] = { 3242static const unsigned int usb1_pins[] = {
3236 /* PWEN, OVC */ 3243 /* PWEN, OVC */
@@ -3789,6 +3796,7 @@ static const struct sh_pfc_pin_group pinmux_groups[] = {
3789 SH_PFC_PIN_GROUP(tpu0_to2), 3796 SH_PFC_PIN_GROUP(tpu0_to2),
3790 SH_PFC_PIN_GROUP(tpu0_to3), 3797 SH_PFC_PIN_GROUP(tpu0_to3),
3791 SH_PFC_PIN_GROUP(usb0), 3798 SH_PFC_PIN_GROUP(usb0),
3799 SH_PFC_PIN_GROUP(usb0_ovc_vbus),
3792 SH_PFC_PIN_GROUP(usb1), 3800 SH_PFC_PIN_GROUP(usb1),
3793 SH_PFC_PIN_GROUP(usb2), 3801 SH_PFC_PIN_GROUP(usb2),
3794 VIN_DATA_PIN_GROUP(vin0_data, 24), 3802 VIN_DATA_PIN_GROUP(vin0_data, 24),
@@ -4134,6 +4142,7 @@ static const char * const tpu0_groups[] = {
4134 4142
4135static const char * const usb0_groups[] = { 4143static const char * const usb0_groups[] = {
4136 "usb0", 4144 "usb0",
4145 "usb0_ovc_vbus",
4137}; 4146};
4138 4147
4139static const char * const usb1_groups[] = { 4148static const char * const usb1_groups[] = {