| 修订版 | efe53b88eb7bdefc8895be129fa08e4a8edf615a (tree) |
|---|---|
| 时间 | 2019-07-29 15:31:12 |
| 作者 | Yoshinori Sato <ysato@user...> |
| Commiter | Yoshinori Sato |
update 2019.01
drivers/net/sh_eth.c (diff)| @@ -375,25 +375,13 @@ static void sh_eth_mac_regs_config(struct sh_eth_dev *eth, unsigned char *mac) | ||
| 375 | 375 | struct sh_eth_info *port_info = ð->port_info[eth->port]; |
| 376 | 376 | |
| 377 | 377 | /* Configure e-dmac registers */ |
| 378 | -<<<<<<< HEAD | |
| 379 | 378 | #if defined(CONFIG_CPU_SH7619) |
| 380 | - sh_eth_write(eth, (sh_eth_read(eth, EDMR) & ~EMDR_DESC_R) | | |
| 379 | + sh_eth_write(port_info, (sh_eth_read(port)info, EDMR) & ~EMDR_DESC_R) | | |
| 381 | 380 | EMDR_DESC, EDMR); |
| 382 | 381 | #else |
| 383 | - sh_eth_write(eth, (sh_eth_read(eth, EDMR) & ~EMDR_DESC_R) | | |
| 384 | - (EMDR_DESC | EDMR_EL), EDMR); | |
| 385 | -#endif | |
| 386 | - sh_eth_write(eth, 0, EESIPR); | |
| 387 | - sh_eth_write(eth, 0, TRSCER); | |
| 388 | - sh_eth_write(eth, 0, TFTR); | |
| 389 | - sh_eth_write(eth, (FIFO_SIZE_T | FIFO_SIZE_R), FDR); | |
| 390 | - sh_eth_write(eth, RMCR_RST, RMCR); | |
| 391 | -#if defined(SH_ETH_TYPE_GETHER) | |
| 392 | - sh_eth_write(eth, 0, RPADIR); | |
| 393 | -======= | |
| 394 | 382 | sh_eth_write(port_info, (sh_eth_read(port_info, EDMR) & ~EMDR_DESC_R) | |
| 395 | 383 | (EMDR_DESC | EDMR_EL), EDMR); |
| 396 | - | |
| 384 | +#endif | |
| 397 | 385 | sh_eth_write(port_info, 0, EESIPR); |
| 398 | 386 | sh_eth_write(port_info, 0, TRSCER); |
| 399 | 387 | sh_eth_write(port_info, 0, TFTR); |
| @@ -401,7 +389,6 @@ static void sh_eth_mac_regs_config(struct sh_eth_dev *eth, unsigned char *mac) | ||
| 401 | 389 | sh_eth_write(port_info, RMCR_RST, RMCR); |
| 402 | 390 | #if defined(SH_ETH_TYPE_GETHER) || defined(SH_ETH_TYPE_RZ) |
| 403 | 391 | sh_eth_write(port_info, 0, RPADIR); |
| 404 | ->>>>>>> v2019.01 | |
| 405 | 392 | #endif |
| 406 | 393 | sh_eth_write(port_info, (FIFO_F_D_RFF | FIFO_F_D_RFD), FCFTR); |
| 407 | 394 |
Fork