forked from ~ljy/RK356X_SDK_RELEASE

hc
2023-12-06 08f87f769b595151be1afeff53e144f543faa614
kernel/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts
....@@ -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.
434
445 /dts-v1/;
456 #include "sun50i-h5.dtsi"
....@@ -78,7 +39,6 @@
7839
7940 reg_gmac_3v3: gmac-3v3 {
8041 compatible = "regulator-fixed";
81
- pinctrl-names = "default";
8242 regulator-name = "gmac-3v3";
8343 regulator-min-microvolt = <3300000>;
8444 regulator-max-microvolt = <3300000>;
....@@ -96,7 +56,6 @@
9656
9757 vdd_cpux: gpio-regulator {
9858 compatible = "regulator-gpio";
99
- pinctrl-names = "default";
10059 regulator-name = "vdd-cpux";
10160 regulator-type = "voltage";
10261 regulator-boot-on;
....@@ -106,13 +65,11 @@
10665 regulator-ramp-delay = <50>; /* 4ms */
10766 gpios = <&r_pio 0 6 GPIO_ACTIVE_HIGH>;
10867 gpios-states = <0x1>;
109
- states = <1100000 0x0
110
- 1300000 0x1>;
68
+ states = <1100000 0>, <1300000 1>;
11169 };
11270
11371 wifi_pwrseq: wifi_pwrseq {
11472 compatible = "mmc-pwrseq-simple";
115
- pinctrl-names = "default";
11673 reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>; /* PL7 */
11774 post-power-on-delay-ms = <200>;
11875 };
....@@ -139,7 +96,7 @@
13996 pinctrl-0 = <&emac_rgmii_pins>;
14097 phy-supply = <&reg_gmac_3v3>;
14198 phy-handle = <&ext_rgmii_phy>;
142
- phy-mode = "rgmii";
99
+ phy-mode = "rgmii-id";
143100 status = "okay";
144101 };
145102
....@@ -191,7 +148,7 @@
191148
192149 &uart0 {
193150 pinctrl-names = "default";
194
- pinctrl-0 = <&uart0_pins_a>;
151
+ pinctrl-0 = <&uart0_pa_pins>;
195152 status = "okay";
196153 };
197154