forked from ~ljy/RK356X_SDK_RELEASE

blame | history | patch | commit | commitdiff
hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d 
 kernel/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.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>
....@@ -793,8 +783,10 @@
793783 static const int uart0_muxvals[] = {8, 8};
794784 static const unsigned uart0b_pins[] = {179, 180};
795785 static const int uart0b_muxvals[] = {10, 10};
796
-static const unsigned uart0b_ctsrts_pins[] = {176, 177, 178, 183, 184, 185};
797
-static const int uart0b_ctsrts_muxvals[] = {10, 10, 10, 10, 10, 10};
786
+static const unsigned uart0b_ctsrts_pins[] = {183, 185};
787
+static const int uart0b_ctsrts_muxvals[] = {10, 10};
788
+static const unsigned uart0b_modem_pins[] = {176, 177, 178, 184};
789
+static const int uart0b_modem_muxvals[] = {10, 10, 10, 10};
798790 static const unsigned uart1_pins[] = {115, 116};
799791 static const int uart1_muxvals[] = {8, 8};
800792 static const unsigned uart2_pins[] = {113, 114};
....@@ -873,6 +865,7 @@
873865 	UNIPHIER_PINCTRL_GROUP(uart0),
874866 	UNIPHIER_PINCTRL_GROUP(uart0b),
875867 	UNIPHIER_PINCTRL_GROUP(uart0b_ctsrts),
868
+	UNIPHIER_PINCTRL_GROUP(uart0b_modem),
876869 	UNIPHIER_PINCTRL_GROUP(uart1),
877870 	UNIPHIER_PINCTRL_GROUP(uart2),
878871 	UNIPHIER_PINCTRL_GROUP(uart3),
....@@ -908,7 +901,8 @@
908901 static const char * const spi1_groups[] = {"spi1"};
909902 static const char * const system_bus_groups[] = {"system_bus",
910903 						 "system_bus_cs1"};
911
-static const char * const uart0_groups[] = {"uart0", "uart0b", "uart0b_ctsrts"};
904
+static const char * const uart0_groups[] = {"uart0", "uart0b",
905
+					    "uart0b_ctsrts", "uart0b_modem"};
912906 static const char * const uart1_groups[] = {"uart1"};
913907 static const char * const uart2_groups[] = {"uart2"};
914908 static const char * const uart3_groups[] = {"uart3", "uart3b"};
....@@ -960,7 +954,7 @@
960954 	return 15;
961955 }
962956 
963
-static struct uniphier_pinctrl_socdata uniphier_pxs2_pindata = {
957
+static const struct uniphier_pinctrl_socdata uniphier_pxs2_pindata = {
964958 	.pins = uniphier_pxs2_pins,
965959 	.npins = ARRAY_SIZE(uniphier_pxs2_pins),
966960 	.groups = uniphier_pxs2_groups,