forked from ~ljy/RK356X_SDK_RELEASE

blame | history | patch | commit | commitdiff
hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d 
 kernel/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs3.c
....@@ -1,17 +1,7 @@
1
-/*
2
- * Copyright (C) 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) 2017 Socionext Inc.
4
+//   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
155 
166 #include <linux/init.h>
177 #include <linux/kernel.h>
....@@ -821,8 +811,10 @@
821811 static const int system_bus_cs1_muxvals[] = {0};
822812 static const unsigned int uart0_pins[] = {92, 93};
823813 static const int uart0_muxvals[] = {0, 0};
824
-static const unsigned int uart0_ctsrts_pins[] = {243, 244, 245, 246, 247, 248};
825
-static const int uart0_ctsrts_muxvals[] = {3, 3, 3, 3, 3, 3};
814
+static const unsigned int uart0_ctsrts_pins[] = {243, 247};
815
+static const int uart0_ctsrts_muxvals[] = {3, 3};
816
+static const unsigned int uart0_modem_pins[] = {244, 245, 246, 248};
817
+static const int uart0_modem_muxvals[] = {3, 3, 3, 3};
826818 static const unsigned int uart1_pins[] = {94, 95};
827819 static const int uart1_muxvals[] = {0, 0};
828820 static const unsigned int uart2_pins[] = {96, 97};
....@@ -897,6 +889,7 @@
897889 	UNIPHIER_PINCTRL_GROUP(system_bus_cs1),
898890 	UNIPHIER_PINCTRL_GROUP(uart0),
899891 	UNIPHIER_PINCTRL_GROUP(uart0_ctsrts),
892
+	UNIPHIER_PINCTRL_GROUP(uart0_modem),
900893 	UNIPHIER_PINCTRL_GROUP(uart1),
901894 	UNIPHIER_PINCTRL_GROUP(uart2),
902895 	UNIPHIER_PINCTRL_GROUP(uart3),
....@@ -924,7 +917,8 @@
924917 static const char * const spi1_groups[] = {"spi1"};
925918 static const char * const system_bus_groups[] = {"system_bus",
926919 						 "system_bus_cs1"};
927
-static const char * const uart0_groups[] = {"uart0", "uart0_ctsrts"};
920
+static const char * const uart0_groups[] = {"uart0", "uart0_ctsrts",
921
+					    "uart0_modem"};
928922 static const char * const uart1_groups[] = {"uart1"};
929923 static const char * const uart2_groups[] = {"uart2"};
930924 static const char * const uart3_groups[] = {"uart3"};
....@@ -971,7 +965,7 @@
971965 	return 15;
972966 }
973967 
974
-static struct uniphier_pinctrl_socdata uniphier_pxs3_pindata = {
968
+static const struct uniphier_pinctrl_socdata uniphier_pxs3_pindata = {
975969 	.pins = uniphier_pxs3_pins,
976970 	.npins = ARRAY_SIZE(uniphier_pxs3_pins),
977971 	.groups = uniphier_pxs3_groups,