~hc/RK356X_SDK_RELEASE.git

..	..	@@ -1,51 +1,32 @@
1		-/*
2		- * Copyright (c) 2017 Icenowy Zheng <icenowy@aosc.xyz>
3		- *
4		- * Based on sun50i-a64-pine64.dts, which is:
5		- * Copyright (c) 2016 ARM Ltd.
6		- *
7		- * This file is dual-licensed: you can use it either under the terms
8		- * of the GPL or the X11 license, at your option. Note that this dual
9		- * licensing only applies to this file, and not this project as a
10		- * whole.
11		- *
12		- * a) This library is free software; you can redistribute it and/or
13		- * modify it under the terms of the GNU General Public License as
14		- * published by the Free Software Foundation; either version 2 of the
15		- * License, or (at your option) any later version.
16		- *
17		- * This library is distributed in the hope that it will be useful,
18		- * but WITHOUT ANY WARRANTY; without even the implied warranty of
19		- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20		- * GNU General Public License for more details.
21		- *
22		- * Or, alternatively,
23		- *
24		- * b) Permission is hereby granted, free of charge, to any person
25		- * obtaining a copy of this software and associated documentation
26		- * files (the "Software"), to deal in the Software without
27		- * restriction, including without limitation the rights to use,
28		- * copy, modify, merge, publish, distribute, sublicense, and/or
29		- * sell copies of the Software, and to permit persons to whom the
30		- * Software is furnished to do so, subject to the following
31		- * conditions:
32		- *
33		- * The above copyright notice and this permission notice shall be
34		- * included in all copies or substantial portions of the Software.
35		- *
36		- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
37		- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
38		- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
39		- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
40		- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
41		- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
42		- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
43		- * OTHER DEALINGS IN THE SOFTWARE.
44		- */
	1	+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
	2	+// Copyright (c) 2017 Icenowy Zheng <icenowy@aosc.xyz>
	3	+// Based on sun50i-a64-pine64.dts, which is:
	4	+// Copyright (c) 2016 ARM Ltd.
45	5
46	6	#include "sun50i-a64.dtsi"
	7	+#include "sun50i-a64-cpu-opp.dtsi"
47	8
48	9	#include <dt-bindings/gpio/gpio.h>
	10	+
	11	+&codec_analog {
	12	+ cpvdd-supply = <&reg_eldo1>;
	13	+};
	14	+
	15	+&cpu0 {
	16	+ cpu-supply = <&reg_dcdc2>;
	17	+};
	18	+
	19	+&cpu1 {
	20	+ cpu-supply = <&reg_dcdc2>;
	21	+};
	22	+
	23	+&cpu2 {
	24	+ cpu-supply = <&reg_dcdc2>;
	25	+};
	26	+
	27	+&cpu3 {
	28	+ cpu-supply = <&reg_dcdc2>;
	29	+};
49	30
50	31	&mmc0 {
51	32	pinctrl-names = "default";
..	..	@@ -53,7 +34,7 @@
53	34	vmmc-supply = <&reg_dcdc1>;
54	35	disable-wp;
55	36	bus-width = <4>;
56		- cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */
	37	+ cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>; /* PF6 push-pull switch */
57	38	status = "okay";
58	39	};
59	40