* [PATCH 1/15] Update for ucc_geth driver
@ 2006-09-30 23:33 Kim Phillips
2006-10-02 7:24 ` Paul Mackerras
0 siblings, 1 reply; 3+ messages in thread
From: Kim Phillips @ 2006-09-30 23:33 UTC (permalink / raw)
To: linuxppc-dev
Update the ucc_geth driver according to qe_lib changes.
Fix l3qt bug.
Signed-off-by: Li Yang <leoli@freescale.com>
---
drivers/net/Kconfig | 2 +-
drivers/net/ucc_geth.c | 6 +++---
drivers/net/ucc_geth_phy.c | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 6315477..74db2c1 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2285,7 +2285,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"
diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c
index 700ebd7..625a9ab 100644
--- a/drivers/net/ucc_geth.c
+++ b/drivers/net/ucc_geth.c
@@ -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;
@@ -3300,7 +3300,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 */
diff --git a/drivers/net/ucc_geth_phy.c b/drivers/net/ucc_geth_phy.c
index f91028c..cc4fffb 100644
--- a/drivers/net/ucc_geth_phy.c
+++ b/drivers/net/ucc_geth_phy.c
@@ -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__);
--
1.4.2.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/15] Update for ucc_geth driver
2006-09-30 23:33 [PATCH 1/15] Update for ucc_geth driver Kim Phillips
@ 2006-10-02 7:24 ` Paul Mackerras
2006-10-02 16:31 ` Sergei Shtylyov
0 siblings, 1 reply; 3+ messages in thread
From: Paul Mackerras @ 2006-10-02 7:24 UTC (permalink / raw)
To: Kim Phillips; +Cc: linuxppc-dev
Kim Phillips writes:
> if (bcsr_regs == NULL)
> - bcsr_regs = (u8 *) ioremap(BCSR_PHYS_ADDR, BCSR_SIZE);
> + bcsr_regs = get_bcsr();
> bcsr_regs[14] |= 0x40;
Umm, if the BSCR is really so unique to each board, how come this
driver is frobbing a specific bit? How does the ucc_geth driver know
about the layout of a given board's BCSR?
Also, this patch means that the kernel won't build (assuming you have
the ucc_geth driver in your config) until we get to patch 9/15, where
get_bcsr gets defined.
Lastly, shouldn't this patch be going through Jeff Garzik?
Paul.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 1/15] Update for ucc_geth driver
2006-10-02 7:24 ` Paul Mackerras
@ 2006-10-02 16:31 ` Sergei Shtylyov
0 siblings, 0 replies; 3+ messages in thread
From: Sergei Shtylyov @ 2006-10-02 16:31 UTC (permalink / raw)
To: Paul Mackerras; +Cc: linuxppc-dev
Hello.
Paul Mackerras wrote:
> Lastly, shouldn't this patch be going through Jeff Garzik?
It's already too late for 2.6.19-rc1 -- Jeff has closed his tree.
> Paul.
WBR, Sergei
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2006-10-02 16:31 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-09-30 23:33 [PATCH 1/15] Update for ucc_geth driver Kim Phillips
2006-10-02 7:24 ` Paul Mackerras
2006-10-02 16:31 ` Sergei Shtylyov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).