ARM: uniphier: remove SPL support for ARMv8 SoCs

[platform/kernel/u-boot.git] / drivers / pinctrl / uniphier / pinctrl-uniphier-ld11.c

diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c
index e42602b..e2b234f 100644 (file)
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c
@@ -5,7 +5,8 @@
  * SPDX-License-Identifier:    GPL-2.0+
  */
 
-#include <dm/device.h>
+#include <common.h>
+#include <dm.h>
 #include <dm/pinctrl.h>
 
 #include "pinctrl-uniphier.h"
@@ -28,6 +29,12 @@ static const int i2c4_muxvals[] = {1, 1};
 static const unsigned nand_pins[] = {3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
                                     15, 16, 17};
 static const int nand_muxvals[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+static const unsigned system_bus_pins[] = {1, 2, 6, 7, 8, 9, 10, 11, 12, 13,
+                                          14, 15, 16, 17};
+static const int system_bus_muxvals[] = {0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+                                        2};
+static const unsigned system_bus_cs1_pins[] = {0};
+static const int system_bus_cs1_muxvals[] = {0};
 static const unsigned uart0_pins[] = {54, 55};
 static const int uart0_muxvals[] = {0, 0};
 static const unsigned uart1_pins[] = {58, 59};
@@ -52,10 +59,12 @@ static const struct uniphier_pinctrl_group uniphier_ld11_groups[] = {
        UNIPHIER_PINCTRL_GROUP(i2c3),
        UNIPHIER_PINCTRL_GROUP(i2c4),
        UNIPHIER_PINCTRL_GROUP(nand),
-       UNIPHIER_PINCTRL_GROUP_SPL(uart0),
-       UNIPHIER_PINCTRL_GROUP_SPL(uart1),
-       UNIPHIER_PINCTRL_GROUP_SPL(uart2),
-       UNIPHIER_PINCTRL_GROUP_SPL(uart3),
+       UNIPHIER_PINCTRL_GROUP(system_bus),
+       UNIPHIER_PINCTRL_GROUP(system_bus_cs1),
+       UNIPHIER_PINCTRL_GROUP(uart0),
+       UNIPHIER_PINCTRL_GROUP(uart1),
+       UNIPHIER_PINCTRL_GROUP(uart2),
+       UNIPHIER_PINCTRL_GROUP(uart3),
        UNIPHIER_PINCTRL_GROUP(usb0),
        UNIPHIER_PINCTRL_GROUP(usb1),
        UNIPHIER_PINCTRL_GROUP(usb2),
@@ -69,10 +78,11 @@ static const char * const uniphier_ld11_functions[] = {
        UNIPHIER_PINMUX_FUNCTION(i2c3),
        UNIPHIER_PINMUX_FUNCTION(i2c4),
        UNIPHIER_PINMUX_FUNCTION(nand),
-       UNIPHIER_PINMUX_FUNCTION_SPL(uart0),
-       UNIPHIER_PINMUX_FUNCTION_SPL(uart1),
-       UNIPHIER_PINMUX_FUNCTION_SPL(uart2),
-       UNIPHIER_PINMUX_FUNCTION_SPL(uart3),
+       UNIPHIER_PINMUX_FUNCTION(system_bus),
+       UNIPHIER_PINMUX_FUNCTION(uart0),
+       UNIPHIER_PINMUX_FUNCTION(uart1),
+       UNIPHIER_PINMUX_FUNCTION(uart2),
+       UNIPHIER_PINMUX_FUNCTION(uart3),
        UNIPHIER_PINMUX_FUNCTION(usb0),
        UNIPHIER_PINMUX_FUNCTION(usb1),
        UNIPHIER_PINMUX_FUNCTION(usb2),
@@ -83,7 +93,8 @@ static struct uniphier_pinctrl_socdata uniphier_ld11_pinctrl_socdata = {
        .groups_count = ARRAY_SIZE(uniphier_ld11_groups),
        .functions = uniphier_ld11_functions,
        .functions_count = ARRAY_SIZE(uniphier_ld11_functions),
-       .caps = UNIPHIER_PINCTRL_CAPS_PERPIN_IECTRL,
+       .caps = UNIPHIER_PINCTRL_CAPS_PUPD_SIMPLE |
+               UNIPHIER_PINCTRL_CAPS_PERPIN_IECTRL,
 };
 
 static int uniphier_ld11_pinctrl_probe(struct udevice *dev)