usb: ohci: change the NUM_EDs from 8 to 32

[u-boot] / drivers / pinctrl / uniphier / pinctrl-uniphier-ld4.c

diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c
index f3849b48f0ef9063a4ccae8091928e77da0ff107..c822bccbd103996c20a4dd980a564a465412faf0 100644 (file)
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c
@@ -1,32 +1,27 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * Copyright (C) 2015 Masahiro Yamada <yamada.masahiro@socionext.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
+ * Copyright (C) 2015-2016 Socionext Inc.
+ *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 
-#include <dm/device.h>
+#include <common.h>
+#include <dm.h>
 #include <dm/pinctrl.h>
 
 #include "pinctrl-uniphier.h"
 
-static const struct uniphier_pinctrl_pin uniphier_ld4_pins[] = {
-       UNIPHIER_PINCTRL_PIN(53, 0),
-       UNIPHIER_PINCTRL_PIN(54, 0),
-       UNIPHIER_PINCTRL_PIN(55, 0),
-       UNIPHIER_PINCTRL_PIN(56, 0),
-       UNIPHIER_PINCTRL_PIN(67, 0),
-       UNIPHIER_PINCTRL_PIN(68, 0),
-       UNIPHIER_PINCTRL_PIN(69, 0),
-       UNIPHIER_PINCTRL_PIN(70, 0),
-       UNIPHIER_PINCTRL_PIN(85, 0),
-       UNIPHIER_PINCTRL_PIN(88, 0),
-       UNIPHIER_PINCTRL_PIN(156, 0),
-};
-
 static const unsigned emmc_pins[] = {21, 22, 23, 24, 25, 26, 27};
 static const int emmc_muxvals[] = {0, 1, 1, 1, 1, 1, 1};
 static const unsigned emmc_dat8_pins[] = {28, 29, 30, 31};
 static const int emmc_dat8_muxvals[] = {1, 1, 1, 1};
+static const unsigned ether_mii_pins[] = {32, 33, 34, 35, 36, 37, 38, 39, 40,
+                                         41, 42, 43, 136, 137, 138, 139, 140,
+                                         141, 142};
+static const int ether_mii_muxvals[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                                       4, 4, 4, 4, 4, 4, 4};
+static const unsigned ether_rmii_pins[] = {32, 33, 34, 35, 36, 37, 38, 39, 40,
+                                          41, 42, 43};
+static const int ether_rmii_muxvals[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 static const unsigned i2c0_pins[] = {102, 103};
 static const int i2c0_muxvals[] = {0, 0};
 static const unsigned i2c1_pins[] = {104, 105};
@@ -42,6 +37,18 @@ static const unsigned nand_cs1_pins[] = {22, 23};
 static const int nand_cs1_muxvals[] = {0, 0};
 static const unsigned sd_pins[] = {44, 45, 46, 47, 48, 49, 50, 51, 52};
 static const int sd_muxvals[] = {0, 0, 0, 0, 0, 0, 0, 0, 0};
+static const unsigned system_bus_pins[] = {16, 17, 18, 19, 20, 165, 166, 167,
+                                          168, 169, 170, 171, 172, 173};
+static const int system_bus_muxvals[] = {0, 0, 0, 0, 0, -1, -1, -1, -1, -1, -1,
+                                        -1, -1, -1};
+static const unsigned system_bus_cs0_pins[] = {155};
+static const int system_bus_cs0_muxvals[] = {1};
+static const unsigned system_bus_cs1_pins[] = {174};
+static const int system_bus_cs1_muxvals[] = {-1};
+static const unsigned system_bus_cs2_pins[] = {64};
+static const int system_bus_cs2_muxvals[] = {1};
+static const unsigned system_bus_cs3_pins[] = {156};
+static const int system_bus_cs3_muxvals[] = {1};
 static const unsigned uart0_pins[] = {85, 88};
 static const int uart0_muxvals[] = {1, 1};
 static const unsigned uart1_pins[] = {155, 156};
@@ -62,8 +69,10 @@ static const unsigned usb2b_pins[] = {67, 68};
 static const int usb2b_muxvals[] = {23, 23};
 
 static const struct uniphier_pinctrl_group uniphier_ld4_groups[] = {
-       UNIPHIER_PINCTRL_GROUP(emmc),
-       UNIPHIER_PINCTRL_GROUP(emmc_dat8),
+       UNIPHIER_PINCTRL_GROUP_SPL(emmc),
+       UNIPHIER_PINCTRL_GROUP_SPL(emmc_dat8),
+       UNIPHIER_PINCTRL_GROUP(ether_mii),
+       UNIPHIER_PINCTRL_GROUP(ether_rmii),
        UNIPHIER_PINCTRL_GROUP(i2c0),
        UNIPHIER_PINCTRL_GROUP(i2c1),
        UNIPHIER_PINCTRL_GROUP(i2c2),
@@ -71,11 +80,16 @@ static const struct uniphier_pinctrl_group uniphier_ld4_groups[] = {
        UNIPHIER_PINCTRL_GROUP(nand),
        UNIPHIER_PINCTRL_GROUP(nand_cs1),
        UNIPHIER_PINCTRL_GROUP(sd),
-       UNIPHIER_PINCTRL_GROUP(uart0),
-       UNIPHIER_PINCTRL_GROUP(uart1),
-       UNIPHIER_PINCTRL_GROUP(uart1b),
-       UNIPHIER_PINCTRL_GROUP(uart2),
-       UNIPHIER_PINCTRL_GROUP(uart3),
+       UNIPHIER_PINCTRL_GROUP(system_bus),
+       UNIPHIER_PINCTRL_GROUP(system_bus_cs0),
+       UNIPHIER_PINCTRL_GROUP(system_bus_cs1),
+       UNIPHIER_PINCTRL_GROUP(system_bus_cs2),
+       UNIPHIER_PINCTRL_GROUP(system_bus_cs3),
+       UNIPHIER_PINCTRL_GROUP_SPL(uart0),
+       UNIPHIER_PINCTRL_GROUP_SPL(uart1),
+       UNIPHIER_PINCTRL_GROUP_SPL(uart1b),
+       UNIPHIER_PINCTRL_GROUP_SPL(uart2),
+       UNIPHIER_PINCTRL_GROUP_SPL(uart3),
        UNIPHIER_PINCTRL_GROUP(usb0),
        UNIPHIER_PINCTRL_GROUP(usb1),
        UNIPHIER_PINCTRL_GROUP(usb2),
@@ -83,25 +97,26 @@ static const struct uniphier_pinctrl_group uniphier_ld4_groups[] = {
 };
 
 static const char * const uniphier_ld4_functions[] = {
-       "emmc",
-       "i2c0",
-       "i2c1",
-       "i2c2",
-       "i2c3",
-       "nand",
-       "sd",
-       "uart0",
-       "uart1",
-       "uart2",
-       "uart3",
-       "usb0",
-       "usb1",
-       "usb2",
+       UNIPHIER_PINMUX_FUNCTION_SPL(emmc),
+       UNIPHIER_PINMUX_FUNCTION(ether_mii),
+       UNIPHIER_PINMUX_FUNCTION(ether_rmii),
+       UNIPHIER_PINMUX_FUNCTION(i2c0),
+       UNIPHIER_PINMUX_FUNCTION(i2c1),
+       UNIPHIER_PINMUX_FUNCTION(i2c2),
+       UNIPHIER_PINMUX_FUNCTION(i2c3),
+       UNIPHIER_PINMUX_FUNCTION(nand),
+       UNIPHIER_PINMUX_FUNCTION(sd),
+       UNIPHIER_PINMUX_FUNCTION(system_bus),
+       UNIPHIER_PINMUX_FUNCTION_SPL(uart0),
+       UNIPHIER_PINMUX_FUNCTION_SPL(uart1),
+       UNIPHIER_PINMUX_FUNCTION_SPL(uart2),
+       UNIPHIER_PINMUX_FUNCTION_SPL(uart3),
+       UNIPHIER_PINMUX_FUNCTION(usb0),
+       UNIPHIER_PINMUX_FUNCTION(usb1),
+       UNIPHIER_PINMUX_FUNCTION(usb2),
 };
 
 static struct uniphier_pinctrl_socdata uniphier_ld4_pinctrl_socdata = {
-       .pins = uniphier_ld4_pins,
-       .pins_count = ARRAY_SIZE(uniphier_ld4_pins),
        .groups = uniphier_ld4_groups,
        .groups_count = ARRAY_SIZE(uniphier_ld4_groups),
        .functions = uniphier_ld4_functions,
@@ -123,7 +138,6 @@ U_BOOT_DRIVER(uniphier_ld4_pinctrl) = {
        .id = UCLASS_PINCTRL,
        .of_match = of_match_ptr(uniphier_ld4_pinctrl_match),
        .probe = uniphier_ld4_pinctrl_probe,
-       .remove = uniphier_pinctrl_remove,
        .priv_auto_alloc_size = sizeof(struct uniphier_pinctrl_priv),
        .ops = &uniphier_pinctrl_ops,
 };