forked from ~ljy/RK356X_SDK_RELEASE
blame | history | patch | commit | commitdiff
hc
2024-01-04 1543e317f1da31b75942316931e8f491a8920811 
 kernel/drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c
....@@ -1,17 +1,7 @@
1
-/*
2
- * Copyright (C) 2015-2017 Socionext Inc.
3
- *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
4
- *
5
- * This program is free software; you can redistribute it and/or modify
6
- * it under the terms of the GNU General Public License as published by
7
- * the Free Software Foundation; either version 2 of the License, or
8
- * (at your option) any later version.
9
- *
10
- * This program is distributed in the hope that it will be useful,
11
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
12
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
13
- * GNU General Public License for more details.
14
- */
1
+// SPDX-License-Identifier: GPL-2.0+
2
+//
3
+// Copyright (C) 2015-2017 Socionext Inc.
4
+//   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
155 
166 #include <linux/kernel.h>
177 #include <linux/init.h>
....@@ -790,8 +780,10 @@
790780 static const int system_bus_cs5_muxvals[] = {6};
791781 static const unsigned uart0_pins[] = {135, 136};
792782 static const int uart0_muxvals[] = {3, 3};
793
-static const unsigned uart0_ctsrts_pins[] = {137, 138, 139, 140, 141, 124};
794
-static const int uart0_ctsrts_muxvals[] = {3, 3, 3, 3, 3, 3};
783
+static const unsigned uart0_ctsrts_pins[] = {137, 139};
784
+static const int uart0_ctsrts_muxvals[] = {3, 3};
785
+static const unsigned uart0_modem_pins[] = {124, 138, 140, 141};
786
+static const int uart0_modem_muxvals[] = {3, 3, 3, 3};
795787 static const unsigned uart0b_pins[] = {11, 12};
796788 static const int uart0b_muxvals[] = {2, 2};
797789 static const unsigned uart1_pins[] = {115, 116};
....@@ -866,6 +858,7 @@
866858 	UNIPHIER_PINCTRL_GROUP(system_bus_cs5),
867859 	UNIPHIER_PINCTRL_GROUP(uart0),
868860 	UNIPHIER_PINCTRL_GROUP(uart0_ctsrts),
861
+	UNIPHIER_PINCTRL_GROUP(uart0_modem),
869862 	UNIPHIER_PINCTRL_GROUP(uart0b),
870863 	UNIPHIER_PINCTRL_GROUP(uart1),
871864 	UNIPHIER_PINCTRL_GROUP(uart1b),
....@@ -897,7 +890,8 @@
897890 						 "system_bus_cs3",
898891 						 "system_bus_cs4",
899892 						 "system_bus_cs5"};
900
-static const char * const uart0_groups[] = {"uart0", "uart0_ctsrts", "uart0b"};
893
+static const char * const uart0_groups[] = {"uart0", "uart0_ctsrts",
894
+					    "uart0_modem", "uart0b"};
901895 static const char * const uart1_groups[] = {"uart1", "uart1b"};
902896 static const char * const uart2_groups[] = {"uart2", "uart2b"};
903897 static const char * const usb0_groups[] = {"usb0"};
....@@ -938,7 +932,7 @@
938932 	return 15;
939933 }
940934 
941
-static struct uniphier_pinctrl_socdata uniphier_ld6b_pindata = {
935
+static const struct uniphier_pinctrl_socdata uniphier_ld6b_pindata = {
942936 	.pins = uniphier_ld6b_pins,
943937 	.npins = ARRAY_SIZE(uniphier_ld6b_pins),
944938 	.groups = uniphier_ld6b_groups,