~hc/RK356X_SDK_RELEASE.git

..	..	@@ -1,45 +1,6 @@
1		-/*
2		- * Copyright (C) 2017 Antony Antony <antony@phenome.org>
3		- * Copyright (C) 2016 ARM Ltd.
4		- *
5		- * This file is dual-licensed: you can use it either under the terms
6		- * of the GPL or the X11 license, at your option. Note that this dual
7		- * licensing only applies to this file, and not this project as a
8		- * whole.
9		- *
10		- * a) This file is free software; you can redistribute it and/or
11		- * modify it under the terms of the GNU General Public License as
12		- * published by the Free Software Foundation; either version 2 of the
13		- * License, or (at your option) any later version.
14		- *
15		- * This file is distributed in the hope that it will be useful,
16		- * but WITHOUT ANY WARRANTY; without even the implied warranty of
17		- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18		- * GNU General Public License for more details.
19		- *
20		- * Or, alternatively,
21		- *
22		- * b) Permission is hereby granted, free of charge, to any person
23		- * obtaining a copy of this software and associated documentation
24		- * files (the "Software"), to deal in the Software without
25		- * restriction, including without limitation the rights to use,
26		- * copy, modify, merge, publish, distribute, sublicense, and/or
27		- * sell copies of the Software, and to permit persons to whom the
28		- * Software is furnished to do so, subject to the following
29		- * conditions:
30		- *
31		- * The above copyright notice and this permission notice shall be
32		- * included in all copies or substantial portions of the Software.
33		- *
34		- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
35		- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
36		- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
37		- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
38		- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
39		- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
40		- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
41		- * OTHER DEALINGS IN THE SOFTWARE.
42		- */
	1	+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
	2	+// Copyright (C) 2017 Antony Antony <antony@phenome.org>
	3	+// Copyright (C) 2016 ARM Ltd.
43	4
44	5	/dts-v1/;
45	6	#include "sun50i-h5.dtsi"
..	..	@@ -78,7 +39,6 @@
78	39
79	40	reg_gmac_3v3: gmac-3v3 {
80	41	compatible = "regulator-fixed";
81		- pinctrl-names = "default";
82	42	regulator-name = "gmac-3v3";
83	43	regulator-min-microvolt = <3300000>;
84	44	regulator-max-microvolt = <3300000>;
..	..	@@ -96,7 +56,6 @@
96	56
97	57	vdd_cpux: gpio-regulator {
98	58	compatible = "regulator-gpio";
99		- pinctrl-names = "default";
100	59	regulator-name = "vdd-cpux";
101	60	regulator-type = "voltage";
102	61	regulator-boot-on;
..	..	@@ -106,13 +65,11 @@
106	65	regulator-ramp-delay = <50>; /* 4ms */
107	66	gpios = <&r_pio 0 6 GPIO_ACTIVE_HIGH>;
108	67	gpios-states = <0x1>;
109		- states = <1100000 0x0
110		- 1300000 0x1>;
	68	+ states = <1100000 0>, <1300000 1>;
111	69	};
112	70
113	71	wifi_pwrseq: wifi_pwrseq {
114	72	compatible = "mmc-pwrseq-simple";
115		- pinctrl-names = "default";
116	73	reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>; /* PL7 */
117	74	post-power-on-delay-ms = <200>;
118	75	};
..	..	@@ -139,7 +96,7 @@
139	96	pinctrl-0 = <&emac_rgmii_pins>;
140	97	phy-supply = <&reg_gmac_3v3>;
141	98	phy-handle = <&ext_rgmii_phy>;
142		- phy-mode = "rgmii";
	99	+ phy-mode = "rgmii-id";
143	100	status = "okay";
144	101	};
145	102
..	..	@@ -191,7 +148,7 @@
191	148
192	149	&uart0 {
193	150	pinctrl-names = "default";
194		- pinctrl-0 = <&uart0_pins_a>;
	151	+ pinctrl-0 = <&uart0_pa_pins>;
195	152	status = "okay";
196	153	};
197	154