diff options
| author |   Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2007-12-05 11:14:29 +1100 |
|---|---|---|
| committer |   Jeff Garzik <jeff@garzik.org> | 2007-12-07 15:09:06 -0500 |
| commit | bff713b562d495658093f1716a80c6ad76920e8b (patch) | |
| tree | 584374279b328d171b158f51faeb94766fce2421 /drivers/net/ibm_newemac/core.h | |
| parent | ibm_newemac: Cleanup/Fix RGMII MDIO support detection (diff) | |
| download | linux-dev-bff713b562d495658093f1716a80c6ad76920e8b.tar.xz linux-dev-bff713b562d495658093f1716a80c6ad76920e8b.zip | |
ibm_newemac: Cleanup/fix support for STACR register variants
There are a few variants of the STACR register that affect more than
just the "AXON" version of EMAC. Replace the current test of various
chip models with tests for generic properties in the device-tree.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: Stefan Roese <sr@denx.de>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/ibm_newemac/core.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ibm_newemac/core.h b/drivers/net/ibm_newemac/core.h index a010b2463fd9..04105f939cfd 100644 --- a/drivers/net/ibm_newemac/core.h +++ b/drivers/net/ibm_newemac/core.h @@ -293,9 +293,9 @@ struct emac_instance { */ #define EMAC_FTR_HAS_RGMII 0x00000020 /* - * Set if we have axon-type STACR + * Set if we have new type STACR with STAOPC */ -#define EMAC_FTR_HAS_AXON_STACR 0x00000040 +#define EMAC_FTR_HAS_NEW_STACR 0x00000040 /* Right now, we don't quite handle the always/possible masks on the @@ -307,7 +307,7 @@ enum { EMAC_FTRS_POSSIBLE = #ifdef CONFIG_IBM_NEW_EMAC_EMAC4 - EMAC_FTR_EMAC4 | EMAC_FTR_HAS_AXON_STACR | + EMAC_FTR_EMAC4 | EMAC_FTR_HAS_NEW_STACR | EMAC_FTR_STACR_OC_INVERT | #endif #ifdef CONFIG_IBM_NEW_EMAC_TAH |