bge: Correct PHY test control register value name
authorSepherosa Ziehau <sephe@dragonflybsd.org>
Thu, 12 Jul 2012 07:05:59 +0000 (15:05 +0800)
committerSepherosa Ziehau <sephe@dragonflybsd.org>
Thu, 12 Jul 2012 07:05:59 +0000 (15:05 +0800)
sys/dev/netif/bge/if_bge.c
sys/dev/netif/bge/if_bgereg.h

index 5568302..5d67b7b 100644 (file)
@@ -2644,10 +2644,10 @@ bge_reset(struct bge_softc *sc)
                /* Force PCI-E 1.0a mode */
                if (sc->bge_asicrev != BGE_ASICREV_BCM5785 &&
                    CSR_READ_4(sc, BGE_PCIE_PHY_TSTCTL) ==
-                   (BGE_PCIE_PCIE_PHY_TSTCTL_PSCRAM |
+                   (BGE_PCIE_PHY_TSTCTL_PSCRAM |
                     BGE_PCIE_PHY_TSTCTL_PCIE10)) {
                        CSR_WRITE_4(sc, BGE_PCIE_PHY_TSTCTL,
-                           BGE_PCIE_PCIE_PHY_TSTCTL_PSCRAM);
+                           BGE_PCIE_PHY_TSTCTL_PSCRAM);
                }
                if (sc->bge_chipid != BGE_CHIPID_BCM5750_A0) {
                        /* Prevent PCIE link training during global reset */
index ca379f1..ce1577a 100644 (file)
 #define BGE_PCIE_TRANSACT              0x7c04
 #define BGE_PCIE_TRANSACT_ONESHOT_MSI  0x20000000
 
+/* PCI-E PHY test control register */
 #define BGE_PCIE_PHY_TSTCTL            0x7e2c
-#define BGE_PCIE_PCIE_PHY_TSTCTL_PSCRAM        0x00000020
+#define BGE_PCIE_PHY_TSTCTL_PSCRAM     0x00000020
 #define BGE_PCIE_PHY_TSTCTL_PCIE10     0x00000040
 
 #define PCI_SETBIT(dev, reg, x, s)     \