hc
2024-05-13 9d77db3c730780c8ef5ccd4b66403ff5675cfe4e
kernel/arch/arm/boot/dts/sun7i-a20-icnova-swac.dts
....@@ -49,7 +49,8 @@
4949
5050 / {
5151 model = "ICnova-A20 SWAC";
52
- compatible = "swac,icnova-a20-swac", "incircuit,icnova-a20", "allwinner,sun7i-a20";
52
+ compatible = "incircuit,icnova-a20-swac", "incircuit,icnova-a20",
53
+ "allwinner,sun7i-a20";
5354
5455 aliases {
5556 serial0 = &uart0;
....@@ -74,19 +75,13 @@
7475
7576 &gmac {
7677 pinctrl-names = "default";
77
- pinctrl-0 = <&gmac_pins_mii_a>;
78
- phy = <&phy1>;
78
+ pinctrl-0 = <&gmac_mii_pins>;
79
+ phy-handle = <&phy1>;
7980 phy-mode = "mii";
8081 status = "okay";
81
-
82
- phy1: ethernet-phy@1 {
83
- reg = <1>;
84
- };
8582 };
8683
8784 &i2c0 {
88
- pinctrl-names = "default";
89
- pinctrl-0 = <&i2c0_pins_a>;
9085 status = "okay";
9186
9287 axp209: pmic@34 {
....@@ -97,14 +92,16 @@
9792 };
9893
9994 &i2c1 {
100
- pinctrl-names = "default";
101
- pinctrl-0 = <&i2c1_pins_a>;
10295 status = "okay";
10396 };
10497
98
+&gmac_mdio {
99
+ phy1: ethernet-phy@1 {
100
+ reg = <1>;
101
+ };
102
+};
103
+
105104 &mmc0 {
106
- pinctrl-names = "default";
107
- pinctrl-0 = <&mmc0_pins_a>;
108105 vmmc-supply = <&reg_vcc3v3>;
109106 bus-width = <4>;
110107 cd-gpios = <&pio 8 5 GPIO_ACTIVE_LOW>; /* PI5 */
....@@ -156,7 +153,7 @@
156153
157154 &uart0 {
158155 pinctrl-names = "default";
159
- pinctrl-0 = <&uart0_pins_a>;
156
+ pinctrl-0 = <&uart0_pb_pins>;
160157 status = "okay";
161158 };
162159