forked from ~ljy/RK356X_SDK_RELEASE

blame | history | patch | commit | commitdiff
hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d 
 kernel/drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.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 program5 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>
....@@ -1048,9 +1038,8 @@
10481038 static const int nand_cs1_muxvals[] = {1, 1};
10491039 static const unsigned sd_pins[] = {150, 151, 152, 153, 154, 155, 156, 157, 158};
10501040 static const int sd_muxvals[] = {0, 0, 0, 0, 0, 0, 0, 0, 0};
1051
-static const unsigned sd1_pins[] = {319, 320, 321, 322, 323, 324, 325, 326,
1052
-				    327};
1053
-static const int sd1_muxvals[] = {0, 0, 0, 0, 0, 0, 0, 0, 0};
1041
+static const unsigned int sd1_pins[] = {319, 320, 321, 322, 323, 324, 325, 326};
1042
+static const int sd1_muxvals[] = {0, 0, 0, 0, 0, 0, 0, 0};
10541043 static const unsigned spi0_pins[] = {199, 200, 201, 202};
10551044 static const int spi0_muxvals[] = {11, 11, 11, 11};
10561045 static const unsigned spi1_pins[] = {195, 196, 197, 198, 235, 238, 239};
....@@ -1083,8 +1072,10 @@
10831072 static const int uart2_muxvals[] = {0, 0};
10841073 static const unsigned uart3_pins[] = {88, 89};
10851074 static const int uart3_muxvals[] = {2, 2};
1086
-static const unsigned uart3_ctsrts_pins[] = {80, 81, 82, 83, 90, 91};
1087
-static const int uart3_ctsrts_muxvals[] = {2, 2, 2, 2, 2, 2};
1075
+static const unsigned uart3_ctsrts_pins[] = {90, 91};
1076
+static const int uart3_ctsrts_muxvals[] = {2, 2};
1077
+static const unsigned uart3_modem_pins[] = {80, 81, 82, 83};
1078
+static const int uart3_modem_muxvals[] = {2, 2, 2, 2};
10881079 static const unsigned usb0_pins[] = {180, 181};
10891080 static const int usb0_muxvals[] = {0, 0};
10901081 static const unsigned usb1_pins[] = {182, 183};
....@@ -1159,6 +1150,7 @@
11591150 	UNIPHIER_PINCTRL_GROUP(uart2),
11601151 	UNIPHIER_PINCTRL_GROUP(uart3),
11611152 	UNIPHIER_PINCTRL_GROUP(uart3_ctsrts),
1153
+	UNIPHIER_PINCTRL_GROUP(uart3_modem),
11621154 	UNIPHIER_PINCTRL_GROUP(usb0),
11631155 	UNIPHIER_PINCTRL_GROUP(usb1),
11641156 	UNIPHIER_PINCTRL_GROUP(usb2),
....@@ -1192,7 +1184,8 @@
11921184 static const char * const uart0_groups[] = {"uart0"};
11931185 static const char * const uart1_groups[] = {"uart1"};
11941186 static const char * const uart2_groups[] = {"uart2"};
1195
-static const char * const uart3_groups[] = {"uart3", "uart3_ctsrts"};
1187
+static const char * const uart3_groups[] = {"uart3", "uart3_ctsrts",
1188
+					    "uart3_modem"};
11961189 static const char * const usb0_groups[] = {"usb0"};
11971190 static const char * const usb1_groups[] = {"usb1"};
11981191 static const char * const usb2_groups[] = {"usb2"};
....@@ -1233,7 +1226,7 @@
12331226 	return 7;
12341227 }
12351228 
1236
-static struct uniphier_pinctrl_socdata uniphier_pro4_pindata = {
1229
+static const struct uniphier_pinctrl_socdata uniphier_pro4_pindata = {
12371230 	.pins = uniphier_pro4_pins,
12381231 	.npins = ARRAY_SIZE(uniphier_pro4_pins),
12391232 	.groups = uniphier_pro4_groups,