Update for ucc_geth driver
PATCH 1/1 Update for ucc_geth driver
Update the ucc_geth driver according to qe_lib changes. Fix l3qt bug.
---
drivers/net/Kconfig | 2 +- drivers/net/ucc_geth.c | 6 +++--- drivers/net/ucc_geth_phy.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-)
drivers/net/Kconfig +0 -0
@@ -2258,7 +2258,7 @@ config UGETH_TX_ON_DEMOND
config UGETH_HAS_GIGA
bool
- depends on UCC_GETH && MPC836x
+ depends on UCC_GETH && PPC_MPC836x
config MV643XX_ETH
tristate "MV-643XX Ethernet support"
drivers/net/ucc_geth.c +0 -0
@@ -1722,7 +1722,7 @@ static void adjust_link(struct net_devic
if (mii_info->speed != ugeth->oldspeed) {
switch (mii_info->speed) {
case 1000:-#ifdef CONFIG_MPC836x
+#ifdef CONFIG_PPC_MPC836x
/* FIXME: This code is for 100Mbs BUG fixing,
remove this when it is fixed!!! */
if (ugeth->ug_info->enet_interface == @@ -1768,7 +1768,7 @@ #endif /* CONFIG_MPC8360 */ break; case 100: case 10:
-#ifdef CONFIG_MPC836x
+#ifdef CONFIG_PPC_MPC836x
/* FIXME: This code is for 100Mbs BUG fixing,
remove this lines when it will be fixed!!! */
ugeth->ug_info->enet_interface = ENET_100_RGMII; @@ -3302,7 +3302,7 @@ static int ucc_geth_startup(ucc_geth_pri l3qt = 0; for (i = 0; i < 8; i++) l3qt |= (ug_info->l3qt[j + i] << (28 - 4 * i)); - out_be32(&ugeth->p_rx_glbl_pram->l3qt[j], l3qt); + out_be32(&ugeth->p_rx_glbl_pram->l3qt[j/8], l3qt); } /* vlantype */
drivers/net/ucc_geth_phy.c +0 -0
@@ -638,7 +638,7 @@ static int dm9161_ack_interrupt(struct u
/* FIXME: This lines are for BUG fixing in the mpc8325. Remove this from here when it's fixed */
if (bcsr_regs == NULL)
- bcsr_regs = (u8 *) ioremap(BCSR_PHYS_ADDR, BCSR_SIZE);
+ bcsr_regs = get_bcsr();
bcsr_regs[14] |= 0x40;
ugphy_vdbg("%s: IN", __FUNCTION__);@@ -654,7 +654,7 @@ static int dm9161_config_intr(struct uge /* FIXME: This lines are for BUG fixing in the mpc8325. Remove this from here when it's fixed */
if (bcsr_regs == NULL) {
- bcsr_regs = (u8 *) ioremap(BCSR_PHYS_ADDR, BCSR_SIZE);
+ bcsr_regs = get_bcsr();
bcsr_regs[14] &= ~0x40;
}
ugphy_vdbg("%s: IN", __FUNCTION__);