diff options
author | Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> | 2013-10-15 18:29:58 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-10-23 16:49:58 -0400 |
commit | 305a3388b5b3121aff6b10054136b40ca91ab35b (patch) | |
tree | 68718fc756b50b51ea7e594b2865569b00a0a366 | |
parent | c3fa32b9764dc45dcf8a2231b1c110abc4a63e0b (diff) |
sh_eth: add/use RMCR.RNC bit
Declare 'enum RMCR_BIT' containing the single member for the RMCR.RNC bit and
replace bare numbers in the driver by this mnemonic.
Suggested-by: David Miller <davem@davemloft.net>
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/ethernet/renesas/sh_eth.c | 6 | ||||
-rw-r--r-- | drivers/net/ethernet/renesas/sh_eth.h | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c index 7258366f7e0b..eaf11e47334f 100644 --- a/drivers/net/ethernet/renesas/sh_eth.c +++ b/drivers/net/ethernet/renesas/sh_eth.c | |||
@@ -483,7 +483,7 @@ static struct sh_eth_cpu_data sh7757_data = { | |||
483 | .register_type = SH_ETH_REG_FAST_SH4, | 483 | .register_type = SH_ETH_REG_FAST_SH4, |
484 | 484 | ||
485 | .eesipr_value = DMAC_M_RFRMER | DMAC_M_ECI | 0x003fffff, | 485 | .eesipr_value = DMAC_M_RFRMER | DMAC_M_ECI | 0x003fffff, |
486 | .rmcr_value = 0x00000001, | 486 | .rmcr_value = RMCR_RNC, |
487 | 487 | ||
488 | .tx_check = EESR_FTC | EESR_CND | EESR_DLC | EESR_CD | EESR_RTO, | 488 | .tx_check = EESR_FTC | EESR_CND | EESR_DLC | EESR_CD | EESR_RTO, |
489 | .eesr_err_check = EESR_TWB | EESR_TABT | EESR_RABT | EESR_RFE | | 489 | .eesr_err_check = EESR_TWB | EESR_TABT | EESR_RABT | EESR_RFE | |
@@ -561,7 +561,7 @@ static struct sh_eth_cpu_data sh7757_data_giga = { | |||
561 | EESR_RFE | EESR_RDE | EESR_RFRMER | EESR_TFE | | 561 | EESR_RFE | EESR_RDE | EESR_RFRMER | EESR_TFE | |
562 | EESR_TDE | EESR_ECI, | 562 | EESR_TDE | EESR_ECI, |
563 | .fdr_value = 0x0000072f, | 563 | .fdr_value = 0x0000072f, |
564 | .rmcr_value = 0x00000001, | 564 | .rmcr_value = RMCR_RNC, |
565 | 565 | ||
566 | .irq_flags = IRQF_SHARED, | 566 | .irq_flags = IRQF_SHARED, |
567 | .apr = 1, | 567 | .apr = 1, |
@@ -689,7 +689,7 @@ static struct sh_eth_cpu_data r8a7740_data = { | |||
689 | EESR_RFE | EESR_RDE | EESR_RFRMER | EESR_TFE | | 689 | EESR_RFE | EESR_RDE | EESR_RFRMER | EESR_TFE | |
690 | EESR_TDE | EESR_ECI, | 690 | EESR_TDE | EESR_ECI, |
691 | .fdr_value = 0x0000070f, | 691 | .fdr_value = 0x0000070f, |
692 | .rmcr_value = 0x00000001, | 692 | .rmcr_value = RMCR_RNC, |
693 | 693 | ||
694 | .apr = 1, | 694 | .apr = 1, |
695 | .mpr = 1, | 695 | .mpr = 1, |
diff --git a/drivers/net/ethernet/renesas/sh_eth.h b/drivers/net/ethernet/renesas/sh_eth.h index a0db02c63b11..f32c1692d310 100644 --- a/drivers/net/ethernet/renesas/sh_eth.h +++ b/drivers/net/ethernet/renesas/sh_eth.h | |||
@@ -321,6 +321,9 @@ enum TD_STS_BIT { | |||
321 | #define TD_TFP (TD_TFP1|TD_TFP0) | 321 | #define TD_TFP (TD_TFP1|TD_TFP0) |
322 | 322 | ||
323 | /* RMCR */ | 323 | /* RMCR */ |
324 | enum RMCR_BIT { | ||
325 | RMCR_RNC = 0x00000001, | ||
326 | }; | ||
324 | #define DEFAULT_RMCR_VALUE 0x00000000 | 327 | #define DEFAULT_RMCR_VALUE 0x00000000 |
325 | 328 | ||
326 | /* ECMR */ | 329 | /* ECMR */ |