SPDX: Convert all of our single license tags to Linux Kernel style

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

diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c
index cee0eb1abdd19f5faa0c72b6afc28292506030ea..c072fc5280d6f1fe63ac636e331fde2b10f04c83 100644 (file)
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c
@@ -1,42 +1,15 @@
+// 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_sld8_pins[] = {
-       UNIPHIER_PINCTRL_PIN(32, 8),
-       UNIPHIER_PINCTRL_PIN(33, 8),
-       UNIPHIER_PINCTRL_PIN(34, 8),
-       UNIPHIER_PINCTRL_PIN(35, 8),
-       UNIPHIER_PINCTRL_PIN(36, 8),
-       UNIPHIER_PINCTRL_PIN(37, 8),
-       UNIPHIER_PINCTRL_PIN(38, 8),
-       UNIPHIER_PINCTRL_PIN(39, 8),
-       UNIPHIER_PINCTRL_PIN(40, 9),
-       UNIPHIER_PINCTRL_PIN(41, 0),
-       UNIPHIER_PINCTRL_PIN(42, 0),
-       UNIPHIER_PINCTRL_PIN(43, 0),
-       UNIPHIER_PINCTRL_PIN(44, 0),
-       UNIPHIER_PINCTRL_PIN(70, 0),
-       UNIPHIER_PINCTRL_PIN(71, 0),
-       UNIPHIER_PINCTRL_PIN(102, 10),
-       UNIPHIER_PINCTRL_PIN(103, 10),
-       UNIPHIER_PINCTRL_PIN(104, 11),
-       UNIPHIER_PINCTRL_PIN(105, 11),
-       UNIPHIER_PINCTRL_PIN(108, 13),
-       UNIPHIER_PINCTRL_PIN(109, 13),
-       UNIPHIER_PINCTRL_PIN(112, 0),
-       UNIPHIER_PINCTRL_PIN(113, 0),
-       UNIPHIER_PINCTRL_PIN(114, 0),
-       UNIPHIER_PINCTRL_PIN(115, 0),
-};
-
 static const unsigned emmc_pins[] = {21, 22, 23, 24, 25, 26, 27};
 static const int emmc_muxvals[] = {1, 1, 1, 1, 1, 1, 1};
 static const unsigned emmc_dat8_pins[] = {28, 29, 30, 31};
@@ -64,6 +37,20 @@ static const unsigned nand_cs1_pins[] = {22, 23};
 static const int nand_cs1_muxvals[] = {0, 0};
 static const unsigned sd_pins[] = {32, 33, 34, 35, 36, 37, 38, 39, 40};
 static const int sd_muxvals[] = {0, 0, 0, 0, 0, 0, 0, 0, 0};
+static const unsigned system_bus_pins[] = {136, 137, 138, 139, 140, 141, 142,
+                                          143, 144, 145, 146, 147, 148, 149};
+static const int system_bus_muxvals[] = {-1, -1, -1, -1, -1, -1, -1, -1, -1,
+                                        -1, -1, -1, -1, -1};
+static const unsigned system_bus_cs1_pins[] = {150};
+static const int system_bus_cs1_muxvals[] = {-1};
+static const unsigned system_bus_cs2_pins[] = {10};
+static const int system_bus_cs2_muxvals[] = {1};
+static const unsigned system_bus_cs3_pins[] = {11};
+static const int system_bus_cs3_muxvals[] = {1};
+static const unsigned system_bus_cs4_pins[] = {12};
+static const int system_bus_cs4_muxvals[] = {1};
+static const unsigned system_bus_cs5_pins[] = {13};
+static const int system_bus_cs5_muxvals[] = {1};
 static const unsigned uart0_pins[] = {70, 71};
 static const int uart0_muxvals[] = {3, 3};
 static const unsigned uart1_pins[] = {114, 115};
@@ -91,6 +78,12 @@ static const struct uniphier_pinctrl_group uniphier_sld8_groups[] = {
        UNIPHIER_PINCTRL_GROUP(nand),
        UNIPHIER_PINCTRL_GROUP(nand_cs1),
        UNIPHIER_PINCTRL_GROUP(sd),
+       UNIPHIER_PINCTRL_GROUP(system_bus),
+       UNIPHIER_PINCTRL_GROUP(system_bus_cs1),
+       UNIPHIER_PINCTRL_GROUP(system_bus_cs2),
+       UNIPHIER_PINCTRL_GROUP(system_bus_cs3),
+       UNIPHIER_PINCTRL_GROUP(system_bus_cs4),
+       UNIPHIER_PINCTRL_GROUP(system_bus_cs5),
        UNIPHIER_PINCTRL_GROUP_SPL(uart0),
        UNIPHIER_PINCTRL_GROUP_SPL(uart1),
        UNIPHIER_PINCTRL_GROUP_SPL(uart2),
@@ -110,6 +103,7 @@ static const char * const uniphier_sld8_functions[] = {
        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),
@@ -120,8 +114,6 @@ static const char * const uniphier_sld8_functions[] = {
 };
 
 static struct uniphier_pinctrl_socdata uniphier_sld8_pinctrl_socdata = {
-       .pins = uniphier_sld8_pins,
-       .pins_count = ARRAY_SIZE(uniphier_sld8_pins),
        .groups = uniphier_sld8_groups,
        .groups_count = ARRAY_SIZE(uniphier_sld8_groups),
        .functions = uniphier_sld8_functions,
@@ -143,7 +135,6 @@ U_BOOT_DRIVER(uniphier_sld8_pinctrl) = {
        .id = UCLASS_PINCTRL,
        .of_match = of_match_ptr(uniphier_sld8_pinctrl_match),
        .probe = uniphier_sld8_pinctrl_probe,
-       .remove = uniphier_pinctrl_remove,
        .priv_auto_alloc_size = sizeof(struct uniphier_pinctrl_priv),
        .ops = &uniphier_pinctrl_ops,
 };