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>

3 files changed, 20 insertions, 13 deletions

diff --git a/arch/powerpc/boot/dts/sequoia.dts b/arch/powerpc/boot/dts/sequoia.dts
index 3d0dfaecc7b6..10784ff45dd6 100644
--- a/arch/powerpc/boot/dts/sequoia.dts
+++ b/arch/powerpc/boot/dts/sequoia.dts
@@ -274,6 +274,8 @@
                                 zmii-channel = <0>;
                                 rgmii-device = <&RGMII0>;
                                 rgmii-channel = <0>;
+                                has-inverted-stacr-oc;
+                                has-new-stacr-staopc;
                         };
 
                         EMAC1: ethernet@ef600f00 {
@@ -302,6 +304,8 @@
                                 zmii-channel = <1>;
                                 rgmii-device = <&RGMII0>;
                                 rgmii-channel = <1>;
+                                has-inverted-stacr-oc;
+                                has-new-stacr-staopc;
                         };
                 };
         };
diff --git a/drivers/net/ibm_newemac/core.c b/drivers/net/ibm_newemac/core.c
index e0eae09febfa..ac9fd46509c1 100644
--- a/drivers/net/ibm_newemac/core.c
+++ b/drivers/net/ibm_newemac/core.c
@@ -711,7 +711,7 @@ static int __emac_mdio_read(struct emac_instance *dev, u8 id, u8 reg)
                 r = EMAC_STACR_BASE(dev->opb_bus_freq);
         if (emac_has_feature(dev, EMAC_FTR_STACR_OC_INVERT))
                 r |= EMAC_STACR_OC;
-        if (emac_has_feature(dev, EMAC_FTR_HAS_AXON_STACR))
+        if (emac_has_feature(dev, EMAC_FTR_HAS_NEW_STACR))
                 r |= EMACX_STACR_STAC_READ;
         else
                 r |= EMAC_STACR_STAC_READ;
@@ -783,7 +783,7 @@ static void __emac_mdio_write(struct emac_instance *dev, u8 id, u8 reg,
                 r = EMAC_STACR_BASE(dev->opb_bus_freq);
         if (emac_has_feature(dev, EMAC_FTR_STACR_OC_INVERT))
                 r |= EMAC_STACR_OC;
-        if (emac_has_feature(dev, EMAC_FTR_HAS_AXON_STACR))
+        if (emac_has_feature(dev, EMAC_FTR_HAS_NEW_STACR))
                 r |= EMACX_STACR_STAC_WRITE;
         else
                 r |= EMAC_STACR_STAC_WRITE;
@@ -2480,16 +2480,19 @@ static int __devinit emac_init_config(struct emac_instance *dev)
         /* Check EMAC version */
         if (of_device_is_compatible(np, "ibm,emac4"))
                 dev->features |= EMAC_FTR_EMAC4;
-        if (of_device_is_compatible(np, "ibm,emac-axon")
-            || of_device_is_compatible(np, "ibm,emac-440epx"))
-                dev->features |= EMAC_FTR_HAS_AXON_STACR
-                        | EMAC_FTR_STACR_OC_INVERT;
-        if (of_device_is_compatible(np, "ibm,emac-440spe"))
+
+        /* Fixup some feature bits based on the device tree */
+        if (of_get_property(np, "has-inverted-stacr-oc", NULL))
                 dev->features |= EMAC_FTR_STACR_OC_INVERT;
+        if (of_get_property(np, "has-new-stacr-staopc", NULL))
+                dev->features |= EMAC_FTR_HAS_NEW_STACR;
 
-        /* Fixup some feature bits based on the device tree and verify
-         * we have support for them compiled in
-         */
+        /* CAB lacks the appropriate properties */
+        if (of_device_is_compatible(np, "ibm,emac-axon"))
+                dev->features |= EMAC_FTR_HAS_NEW_STACR |
+                        EMAC_FTR_STACR_OC_INVERT;
+
+        /* Enable TAH/ZMII/RGMII features as found */
         if (dev->tah_ph != 0) {
 #ifdef CONFIG_IBM_NEW_EMAC_TAH
                 dev->features |= EMAC_FTR_HAS_TAH;
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