~hc/RK356X_SDK_RELEASE.git

..	..	@@ -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>
15	5
16	6	#include <linux/kernel.h>
17	7	#include <linux/init.h>
..	..	@@ -790,8 +780,10 @@
790	780	static const int system_bus_cs5_muxvals[] = {6};
791	781	static const unsigned uart0_pins[] = {135, 136};
792	782	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};
795	787	static const unsigned uart0b_pins[] = {11, 12};
796	788	static const int uart0b_muxvals[] = {2, 2};
797	789	static const unsigned uart1_pins[] = {115, 116};
..	..	@@ -866,6 +858,7 @@
866	858	UNIPHIER_PINCTRL_GROUP(system_bus_cs5),
867	859	UNIPHIER_PINCTRL_GROUP(uart0),
868	860	UNIPHIER_PINCTRL_GROUP(uart0_ctsrts),
	861	+ UNIPHIER_PINCTRL_GROUP(uart0_modem),
869	862	UNIPHIER_PINCTRL_GROUP(uart0b),
870	863	UNIPHIER_PINCTRL_GROUP(uart1),
871	864	UNIPHIER_PINCTRL_GROUP(uart1b),
..	..	@@ -897,7 +890,8 @@
897	890	"system_bus_cs3",
898	891	"system_bus_cs4",
899	892	"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"};
901	895	static const char * const uart1_groups[] = {"uart1", "uart1b"};
902	896	static const char * const uart2_groups[] = {"uart2", "uart2b"};
903	897	static const char * const usb0_groups[] = {"usb0"};
..	..	@@ -938,7 +932,7 @@
938	932	return 15;
939	933	}
940	934
941		-static struct uniphier_pinctrl_socdata uniphier_ld6b_pindata = {
	935	+static const struct uniphier_pinctrl_socdata uniphier_ld6b_pindata = {
942	936	.pins = uniphier_ld6b_pins,
943	937	.npins = ARRAY_SIZE(uniphier_ld6b_pins),
944	938	.groups = uniphier_ld6b_groups,