sh-pfc: r8a7779: Don't group USB OVC and PENC pins

The USB_OVCn pins are alternate options for USB over-current detection
when using a 3.3V USB interface. As they're not mandatory they can be
used independently of the USB PENC pins. Don't group the USB_OVCn and
PENC pins to avoid conflicts when the USB_OVCn pins are used by another
function.

Reported-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

authored by Laurent Pinchart and committed by Simon Horman 350753bf c7788792

+36 -9
+36 -9
drivers/pinctrl/sh-pfc/pfc-r8a7779.c
··· 2357 2357 }; 2358 2358 /* - USB0 ------------------------------------------------------------------- */ 2359 2359 static const unsigned int usb0_pins[] = { 2360 - /* OVC */ 2361 - 150, 154, 2360 + /* PENC */ 2361 + 154, 2362 2362 }; 2363 2363 static const unsigned int usb0_mux[] = { 2364 - USB_OVC0_MARK, USB_PENC0_MARK, 2364 + USB_PENC0_MARK, 2365 + }; 2366 + static const unsigned int usb0_ovc_pins[] = { 2367 + /* USB_OVC */ 2368 + 150 2369 + }; 2370 + static const unsigned int usb0_ovc_mux[] = { 2371 + USB_OVC0_MARK, 2365 2372 }; 2366 2373 /* - USB1 ------------------------------------------------------------------- */ 2367 2374 static const unsigned int usb1_pins[] = { 2368 - /* OVC */ 2369 - 152, 155, 2375 + /* PENC */ 2376 + 155, 2370 2377 }; 2371 2378 static const unsigned int usb1_mux[] = { 2372 - USB_OVC1_MARK, USB_PENC1_MARK, 2379 + USB_PENC1_MARK, 2380 + }; 2381 + static const unsigned int usb1_ovc_pins[] = { 2382 + /* USB_OVC */ 2383 + 152, 2384 + }; 2385 + static const unsigned int usb1_ovc_mux[] = { 2386 + USB_OVC1_MARK, 2373 2387 }; 2374 2388 /* - USB2 ------------------------------------------------------------------- */ 2375 2389 static const unsigned int usb2_pins[] = { 2376 - /* OVC, PENC */ 2377 - 125, 156, 2390 + /* PENC */ 2391 + 156, 2378 2392 }; 2379 2393 static const unsigned int usb2_mux[] = { 2380 - USB_OVC2_MARK, USB_PENC2_MARK, 2394 + USB_PENC2_MARK, 2395 + }; 2396 + static const unsigned int usb2_ovc_pins[] = { 2397 + /* USB_OVC */ 2398 + 125, 2399 + }; 2400 + static const unsigned int usb2_ovc_mux[] = { 2401 + USB_OVC2_MARK, 2381 2402 }; 2382 2403 2383 2404 static const struct sh_pfc_pin_group pinmux_groups[] = { ··· 2522 2501 SH_PFC_PIN_GROUP(sdhi3_cd), 2523 2502 SH_PFC_PIN_GROUP(sdhi3_wp), 2524 2503 SH_PFC_PIN_GROUP(usb0), 2504 + SH_PFC_PIN_GROUP(usb0_ovc), 2525 2505 SH_PFC_PIN_GROUP(usb1), 2506 + SH_PFC_PIN_GROUP(usb1_ovc), 2526 2507 SH_PFC_PIN_GROUP(usb2), 2508 + SH_PFC_PIN_GROUP(usb2_ovc), 2527 2509 }; 2528 2510 2529 2511 static const char * const du0_groups[] = { ··· 2707 2683 2708 2684 static const char * const usb0_groups[] = { 2709 2685 "usb0", 2686 + "usb0_ovc", 2710 2687 }; 2711 2688 2712 2689 static const char * const usb1_groups[] = { 2713 2690 "usb1", 2691 + "usb1_ovc", 2714 2692 }; 2715 2693 2716 2694 static const char * const usb2_groups[] = { 2717 2695 "usb2", 2696 + "usb2_ovc", 2718 2697 }; 2719 2698 2720 2699 static const struct sh_pfc_function pinmux_functions[] = {