重命名 AX88772C_eeprom/asix.c 为 asix_mac.c

hc

2024-09-20 a36159eec6ca17402b0e146b86efaf76568dc353

 kernel/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts
..
..
@@ -10,6 +10,7 @@
10
10
 
11
11
 / {
12
12
 	compatible = "friendlyarm,nanopi-k2", "amlogic,meson-gxbb";
13
+	model = "FriendlyARM NanoPi K2";
13
14
 
14
15
 	aliases {
15
16
 		serial0 = &uart_AO;
..
..
@@ -28,7 +29,7 @@
28
29
 	leds {
29
30
 		compatible = "gpio-leds";
30
31
 
31
-		stat {
32
+		led-stat {
32
33
 			label = "nanopi-k2:blue:stat";
33
34
 			gpios = <&gpio_ao GPIOAO_13 GPIO_ACTIVE_HIGH>;
34
35
 			default-state = "on";
..
..
@@ -154,10 +155,6 @@
154
155
 
155
156
 	amlogic,tx-delay-ns = <2>;
156
157
 
157
-	snps,reset-gpio = <&gpio GPIOZ_14 0>;
158
-	snps,reset-delays-us = <0 10000 1000000>;
159
-	snps,reset-active-low;
160
-
161
158
 	mdio {
162
159
 		compatible = "snps,dwmac-mdio";
163
160
 		#address-cells = <1>;
..
..
@@ -166,6 +163,11 @@
166
163
 		eth_phy0: ethernet-phy@0 {
167
164
 			/* Realtek RTL8211F (0x001cc916) */
168
165
 			reg = <0>;
166
+
167
+			reset-assert-us = <10000>;
168
+			reset-deassert-us = <80000>;
169
+			reset-gpios = <&gpio GPIOZ_14 GPIO_ACTIVE_LOW>;
170
+
169
171
 			interrupt-parent = <&gpio_intc>;
170
172
 			/* MAC_INTR on GPIOZ_15 */
171
173
 			interrupts = <29 IRQ_TYPE_LEVEL_LOW>;
..
..
@@ -273,10 +275,13 @@
273
275
 
274
276
 	bus-width = <4>;
275
277
 	cap-sd-highspeed;
276
-	max-frequency = <200000000>;
278
+	max-frequency = <50000000>;
277
279
 
278
280
 	non-removable;
279
281
 	disable-wp;
282
+
283
+	/* WiFi firmware requires power to be kept while in suspend */
284
+	keep-power-in-suspend;
280
285
 
281
286
 	mmc-pwrseq = <&sdio_pwrseq>;
282
287
 
..
..
@@ -301,12 +306,11 @@
301
306
 	sd-uhs-sdr12;
302
307
 	sd-uhs-sdr25;
303
308
 	sd-uhs-sdr50;
304
-	sd-uhs-sdr104;
305
-	max-frequency = <200000000>;
309
+	sd-uhs-ddr50;
310
+	max-frequency = <100000000>;
306
311
 	disable-wp;
307
312
 
308
-	cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>;
309
-	cd-inverted;
313
+	cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>;
310
314
 
311
315
 	vmmc-supply = <&vddio_ao3v3>;
312
316
 	vqmmc-supply = <&vddio_tf>;