hc
2023-11-22 d0a428a6556ea5a006e22e28b0b1cd037885fe20
kernel/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
....@@ -2349,12 +2349,14 @@
23492349
23502350 static unsigned char macaddr[6];
23512351 extern ssize_t at24_mac_read(unsigned char* addr);
2352
+extern ssize_t at24_mac1_read(unsigned char* addr);
23522353 void rk_get_eth_addr(void *priv, unsigned char *addr)
23532354 {
23542355 struct rk_priv_data *bsp_priv = priv;
23552356 struct device *dev = &bsp_priv->pdev->dev;
23562357 unsigned char ethaddr[ETH_ALEN * MAX_ETH] = {0};
23572358 int ret,i, id = bsp_priv->bus_id;
2359
+ printk("troy test id : %d\n",id);
23582360 #if 0
23592361 rk_devinfo_get_eth_mac(addr);
23602362 if (is_valid_ether_addr(addr))
....@@ -2388,19 +2390,32 @@
23882390 }
23892391 #endif
23902392 #if 1
2391
- if (at24_mac_read(macaddr) > 0) {
2392
- printk("ben %s: at24_mac_read Success!! \n", __func__);
2393
- memcpy(addr, macaddr, 6);
2394
-
2395
- printk("Read the Ethernet MAC address from :");
2396
- for (i = 0; i < 5; i++)
2397
- printk("%2.2x:", addr[i]);
2398
-
2399
- printk("%2.2x\n", addr[i]);
2400
- } else {
2393
+ if (id == 1 ){
2394
+ if (at24_mac_read(macaddr) > 0) {
2395
+ printk("ben %s: at24_mac_read Success!! \n", __func__);
2396
+ memcpy(addr, macaddr, 6);
2397
+ printk("Read the Ethernet MAC address from :");
2398
+ for (i = 0; i < 5; i++)
2399
+ printk("%2.2x:", addr[i]);
2400
+ } else {
24012401 printk("ben %s: at24_mac_read Failed!! \n", __func__);
24022402 goto out;
2403
- }
2403
+ }
2404
+ }
2405
+ else
2406
+ {
2407
+ if (at24_mac1_read(macaddr) > 0) {
2408
+ printk("ben %s: at24_mac_read Success!! \n", __func__);
2409
+ memcpy(addr, macaddr, 6);
2410
+ printk("Read the Ethernet MAC address from :");
2411
+ for (i = 0; i < 5; i++)
2412
+ printk("%2.2x:", addr[i]);
2413
+ } else {
2414
+ printk("ben %s: at24_mac_read Failed!! \n", __func__);
2415
+ goto out;
2416
+ }
2417
+ }
2418
+
24042419 #endif
24052420
24062421 out: