split b44 patch, fix compile warning in b44.h

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@1932 3c298f89-4303-0410-b956-a3cf2f4a3e73

1 files changed, 759 insertions, 0 deletions

diff --git a/openwrt/target/linux/linux-2.6/patches/generic/003-net-b44.patch b/openwrt/target/linux/linux-2.6/patches/generic/003-net-b44.patch
new file mode 100644
index 000000000..dcab825c6
--- /dev/null
+++ b/openwrt/target/linux/linux-2.6/patches/generic/003-net-b44.patch
@@ -0,0 +1,759 @@
+diff -Nur linux-2.6.12.5/drivers/net/b44.c linux-2.6.12.5-b44/drivers/net/b44.c
+--- linux-2.6.12.5/drivers/net/b44.c	2005-08-15 02:20:18.000000000 +0200
++++ linux-2.6.12.5-b44/drivers/net/b44.c	2005-09-16 10:33:56.284312840 +0200
+@@ -1,7 +1,8 @@
+-/* b44.c: Broadcom 4400 device driver.
++/* b44.c: Broadcom 4400/47xx device driver.
+  *
+  * Copyright (C) 2002 David S. Miller (davem@redhat.com)
+- * Fixed by Pekka Pietikainen (pp@ee.oulu.fi)
++ * Copyright (C) 2004 Pekka Pietikainen (pp@ee.oulu.fi)
++ * Copyright (C) 2004 Florian Schirmer (jolt@tuxbox.org)
+  *
+  * Distribute under GPL.
+  */
+@@ -78,7 +79,7 @@
+ 	DRV_MODULE_NAME ".c:v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n";
+ 
+ MODULE_AUTHOR("Florian Schirmer, Pekka Pietikainen, David S. Miller");
+-MODULE_DESCRIPTION("Broadcom 4400 10/100 PCI ethernet driver");
++MODULE_DESCRIPTION("Broadcom 4400/47xx 10/100 PCI ethernet driver");
+ MODULE_LICENSE("GPL");
+ MODULE_VERSION(DRV_MODULE_VERSION);
+ 
+@@ -93,6 +94,8 @@
+ 	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
+ 	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_BCM4401B1,
+ 	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
++	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_BCM4713,
++	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
+ 	{ }	/* terminate list with empty entry */
+ };
+ 
+@@ -106,24 +109,13 @@
+ static void b44_poll_controller(struct net_device *dev);
+ #endif
+ 
+-static inline unsigned long br32(const struct b44 *bp, unsigned long reg)
+-{
+-	return readl(bp->regs + reg);
+-}
+-
+-static inline void bw32(const struct b44 *bp, 
+-			unsigned long reg, unsigned long val)
+-{
+-	writel(val, bp->regs + reg);
+-}
+-
+ static int b44_wait_bit(struct b44 *bp, unsigned long reg,
+ 			u32 bit, unsigned long timeout, const int clear)
+ {
+ 	unsigned long i;
+ 
+ 	for (i = 0; i < timeout; i++) {
+-		u32 val = br32(bp, reg);
++		u32 val = br32(reg);
+ 
+ 		if (clear && !(val & bit))
+ 			break;
+@@ -154,7 +146,7 @@
+ 
+ static u32 ssb_get_core_rev(struct b44 *bp)
+ {
+-	return (br32(bp, B44_SBIDHIGH) & SBIDHIGH_RC_MASK);
++	return (br32(B44_SBIDHIGH) & SBIDHIGH_RC_MASK);
+ }
+ 
+ static u32 ssb_pci_setup(struct b44 *bp, u32 cores)
+@@ -165,13 +157,13 @@
+ 	pci_write_config_dword(bp->pdev, SSB_BAR0_WIN, BCM4400_PCI_CORE_ADDR);
+ 	pci_rev = ssb_get_core_rev(bp);
+ 
+-	val = br32(bp, B44_SBINTVEC);
++	val = br32(B44_SBINTVEC);
+ 	val |= cores;
+-	bw32(bp, B44_SBINTVEC, val);
++	bw32(B44_SBINTVEC, val);
+ 
+-	val = br32(bp, SSB_PCI_TRANS_2);
++	val = br32(SSB_PCI_TRANS_2);
+ 	val |= SSB_PCI_PREF | SSB_PCI_BURST;
+-	bw32(bp, SSB_PCI_TRANS_2, val);
++	bw32(SSB_PCI_TRANS_2, val);
+ 
+ 	pci_write_config_dword(bp->pdev, SSB_BAR0_WIN, bar_orig);
+ 
+@@ -180,18 +172,18 @@
+ 
+ static void ssb_core_disable(struct b44 *bp)
+ {
+-	if (br32(bp, B44_SBTMSLOW) & SBTMSLOW_RESET)
++	if (br32(B44_SBTMSLOW) & SBTMSLOW_RESET)
+ 		return;
+ 
+-	bw32(bp, B44_SBTMSLOW, (SBTMSLOW_REJECT | SBTMSLOW_CLOCK));
++	bw32(B44_SBTMSLOW, (SBTMSLOW_REJECT | SBTMSLOW_CLOCK));
+ 	b44_wait_bit(bp, B44_SBTMSLOW, SBTMSLOW_REJECT, 100000, 0);
+ 	b44_wait_bit(bp, B44_SBTMSHIGH, SBTMSHIGH_BUSY, 100000, 1);
+-	bw32(bp, B44_SBTMSLOW, (SBTMSLOW_FGC | SBTMSLOW_CLOCK |
++	bw32(B44_SBTMSLOW, (SBTMSLOW_FGC | SBTMSLOW_CLOCK |
+ 			    SBTMSLOW_REJECT | SBTMSLOW_RESET));
+-	br32(bp, B44_SBTMSLOW);
++	br32(B44_SBTMSLOW);
+ 	udelay(1);
+-	bw32(bp, B44_SBTMSLOW, (SBTMSLOW_REJECT | SBTMSLOW_RESET));
+-	br32(bp, B44_SBTMSLOW);
++	bw32(B44_SBTMSLOW, (SBTMSLOW_REJECT | SBTMSLOW_RESET));
++	br32(B44_SBTMSLOW);
+ 	udelay(1);
+ }
+ 
+@@ -200,58 +192,65 @@
+ 	u32 val;
+ 
+ 	ssb_core_disable(bp);
+-	bw32(bp, B44_SBTMSLOW, (SBTMSLOW_RESET | SBTMSLOW_CLOCK | SBTMSLOW_FGC));
+-	br32(bp, B44_SBTMSLOW);
++	bw32(B44_SBTMSLOW, (SBTMSLOW_RESET | SBTMSLOW_CLOCK | SBTMSLOW_FGC));
++	br32(B44_SBTMSLOW);
+ 	udelay(1);
+ 
+ 	/* Clear SERR if set, this is a hw bug workaround.  */
+-	if (br32(bp, B44_SBTMSHIGH) & SBTMSHIGH_SERR)
+-		bw32(bp, B44_SBTMSHIGH, 0);
++	if (br32(B44_SBTMSHIGH) & SBTMSHIGH_SERR)
++		bw32(B44_SBTMSHIGH, 0);
+ 
+-	val = br32(bp, B44_SBIMSTATE);
++	val = br32(B44_SBIMSTATE);
+ 	if (val & (SBIMSTATE_IBE | SBIMSTATE_TO))
+-		bw32(bp, B44_SBIMSTATE, val & ~(SBIMSTATE_IBE | SBIMSTATE_TO));
++		bw32(B44_SBIMSTATE, val & ~(SBIMSTATE_IBE | SBIMSTATE_TO));
+ 
+-	bw32(bp, B44_SBTMSLOW, (SBTMSLOW_CLOCK | SBTMSLOW_FGC));
+-	br32(bp, B44_SBTMSLOW);
++	bw32(B44_SBTMSLOW, (SBTMSLOW_CLOCK | SBTMSLOW_FGC));
++	br32(B44_SBTMSLOW);
+ 	udelay(1);
+ 
+-	bw32(bp, B44_SBTMSLOW, (SBTMSLOW_CLOCK));
+-	br32(bp, B44_SBTMSLOW);
++	bw32(B44_SBTMSLOW, (SBTMSLOW_CLOCK));
++	br32(B44_SBTMSLOW);
+ 	udelay(1);
+ }
+ 
++static int b44_4713_instance;
++
+ static int ssb_core_unit(struct b44 *bp)
+ {
+-#if 0
+-	u32 val = br32(bp, B44_SBADMATCH0);
+-	u32 base;
+-
+-	type = val & SBADMATCH0_TYPE_MASK;
+-	switch (type) {
+-	case 0:
+-		base = val & SBADMATCH0_BS0_MASK;
+-		break;
+-
+-	case 1:
+-		base = val & SBADMATCH0_BS1_MASK;
+-		break;
+-
+-	case 2:
+-	default:
+-		base = val & SBADMATCH0_BS2_MASK;
+-		break;
+-	};
+-#endif
+-	return 0;
++	if (bp->pdev->device == PCI_DEVICE_ID_BCM4713)
++		return b44_4713_instance++;
++	else
++		return 0;
+ }
+ 
+ static int ssb_is_core_up(struct b44 *bp)
+ {
+-	return ((br32(bp, B44_SBTMSLOW) & (SBTMSLOW_RESET | SBTMSLOW_REJECT | SBTMSLOW_CLOCK))
++	return ((br32(B44_SBTMSLOW) & (SBTMSLOW_RESET | SBTMSLOW_REJECT | SBTMSLOW_CLOCK))
+ 		== SBTMSLOW_CLOCK);
+ }
+ 
++static void __b44_cam_read(struct b44 *bp, unsigned char *data, int index)
++{
++	u32 val;
++
++	bw32(B44_CAM_CTRL, (CAM_CTRL_READ |
++			    (index << CAM_CTRL_INDEX_SHIFT)));
++
++	b44_wait_bit(bp, B44_CAM_CTRL, CAM_CTRL_BUSY, 100, 1);	
++
++	val = br32(B44_CAM_DATA_LO);
++
++	data[2] = (val >> 24) & 0xFF;
++	data[3] = (val >> 16) & 0xFF;
++	data[4] = (val >> 8) & 0xFF;
++	data[5] = (val >> 0) & 0xFF;
++
++	val = br32(B44_CAM_DATA_HI);
++	
++	data[0] = (val >> 8) & 0xFF;
++	data[1] = (val >> 0) & 0xFF;
++}
++
+ static void __b44_cam_write(struct b44 *bp, unsigned char *data, int index)
+ {
+ 	u32 val;
+@@ -260,19 +259,19 @@
+ 	val |= ((u32) data[3]) << 16;
+ 	val |= ((u32) data[4]) <<  8;
+ 	val |= ((u32) data[5]) <<  0;
+-	bw32(bp, B44_CAM_DATA_LO, val);
++	bw32(B44_CAM_DATA_LO, val);
+ 	val = (CAM_DATA_HI_VALID | 
+ 	       (((u32) data[0]) << 8) |
+ 	       (((u32) data[1]) << 0));
+-	bw32(bp, B44_CAM_DATA_HI, val);
+-	bw32(bp, B44_CAM_CTRL, (CAM_CTRL_WRITE |
++	bw32(B44_CAM_DATA_HI, val);
++	bw32(B44_CAM_CTRL, (CAM_CTRL_WRITE |
+ 			    (index << CAM_CTRL_INDEX_SHIFT)));
+ 	b44_wait_bit(bp, B44_CAM_CTRL, CAM_CTRL_BUSY, 100, 1);	
+ }
+ 
+ static inline void __b44_disable_ints(struct b44 *bp)
+ {
+-	bw32(bp, B44_IMASK, 0);
++	bw32(B44_IMASK, 0);
+ }
+ 
+ static void b44_disable_ints(struct b44 *bp)
+@@ -280,34 +279,40 @@
+ 	__b44_disable_ints(bp);
+ 
+ 	/* Flush posted writes. */
+-	br32(bp, B44_IMASK);
++	br32(B44_IMASK);
+ }
+ 
+ static void b44_enable_ints(struct b44 *bp)
+ {
+-	bw32(bp, B44_IMASK, bp->imask);
++	bw32(B44_IMASK, bp->imask);
+ }
+ 
+ static int b44_readphy(struct b44 *bp, int reg, u32 *val)
+ {
+ 	int err;
+ 
+-	bw32(bp, B44_EMAC_ISTAT, EMAC_INT_MII);
+-	bw32(bp, B44_MDIO_DATA, (MDIO_DATA_SB_START |
++	if (bp->phy_addr == B44_PHY_ADDR_NO_PHY)
++		return 0;
++
++	bw32(B44_EMAC_ISTAT, EMAC_INT_MII);
++	bw32(B44_MDIO_DATA, (MDIO_DATA_SB_START |
+ 			     (MDIO_OP_READ << MDIO_DATA_OP_SHIFT) |
+ 			     (bp->phy_addr << MDIO_DATA_PMD_SHIFT) |
+ 			     (reg << MDIO_DATA_RA_SHIFT) |
+ 			     (MDIO_TA_VALID << MDIO_DATA_TA_SHIFT)));
+ 	err = b44_wait_bit(bp, B44_EMAC_ISTAT, EMAC_INT_MII, 100, 0);
+-	*val = br32(bp, B44_MDIO_DATA) & MDIO_DATA_DATA;
++	*val = br32(B44_MDIO_DATA) & MDIO_DATA_DATA;
+ 
+ 	return err;
+ }
+ 
+ static int b44_writephy(struct b44 *bp, int reg, u32 val)
+ {
+-	bw32(bp, B44_EMAC_ISTAT, EMAC_INT_MII);
+-	bw32(bp, B44_MDIO_DATA, (MDIO_DATA_SB_START |
++	if (bp->phy_addr == B44_PHY_ADDR_NO_PHY)
++		return 0;
++
++	bw32(B44_EMAC_ISTAT, EMAC_INT_MII);
++	bw32(B44_MDIO_DATA, (MDIO_DATA_SB_START |
+ 			     (MDIO_OP_WRITE << MDIO_DATA_OP_SHIFT) |
+ 			     (bp->phy_addr << MDIO_DATA_PMD_SHIFT) |
+ 			     (reg << MDIO_DATA_RA_SHIFT) |
+@@ -344,6 +349,9 @@
+ 	u32 val;
+ 	int err;
+ 
++	if (bp->phy_addr == B44_PHY_ADDR_NO_PHY)
++		return 0;
++
+ 	err = b44_writephy(bp, MII_BMCR, BMCR_RESET);
+ 	if (err)
+ 		return err;
+@@ -367,20 +375,20 @@
+ 	bp->flags &= ~(B44_FLAG_TX_PAUSE | B44_FLAG_RX_PAUSE);
+ 	bp->flags |= pause_flags;
+ 
+-	val = br32(bp, B44_RXCONFIG);
++	val = br32(B44_RXCONFIG);
+ 	if (pause_flags & B44_FLAG_RX_PAUSE)
+ 		val |= RXCONFIG_FLOW;
+ 	else
+ 		val &= ~RXCONFIG_FLOW;
+-	bw32(bp, B44_RXCONFIG, val);
++	bw32(B44_RXCONFIG, val);
+ 
+-	val = br32(bp, B44_MAC_FLOW);
++	val = br32(B44_MAC_FLOW);
+ 	if (pause_flags & B44_FLAG_TX_PAUSE)
+ 		val |= (MAC_FLOW_PAUSE_ENAB |
+ 			(0xc0 & MAC_FLOW_RX_HI_WATER));
+ 	else
+ 		val &= ~MAC_FLOW_PAUSE_ENAB;
+-	bw32(bp, B44_MAC_FLOW, val);
++	bw32(B44_MAC_FLOW, val);
+ }
+ 
+ static void b44_set_flow_ctrl(struct b44 *bp, u32 local, u32 remote)
+@@ -414,6 +422,9 @@
+ 	u32 val;
+ 	int err;
+ 
++	if (bp->phy_addr == B44_PHY_ADDR_NO_PHY)
++		return 0;
++
+ 	if ((err = b44_readphy(bp, B44_MII_ALEDCTRL, &val)) != 0)
+ 		goto out;
+ 	if ((err = b44_writephy(bp, B44_MII_ALEDCTRL,
+@@ -476,11 +487,11 @@
+ 
+ 	val = &bp->hw_stats.tx_good_octets;
+ 	for (reg = B44_TX_GOOD_O; reg <= B44_TX_PAUSE; reg += 4UL) {
+-		*val++ += br32(bp, reg);
++		*val++ += br32(reg);
+ 	}
+ 	val = &bp->hw_stats.rx_good_octets;
+ 	for (reg = B44_RX_GOOD_O; reg <= B44_RX_NPAUSE; reg += 4UL) {
+-		*val++ += br32(bp, reg);
++		*val++ += br32(reg);
+ 	}
+ }
+ 
+@@ -506,6 +517,19 @@
+ {
+ 	u32 bmsr, aux;
+ 
++	if (bp->phy_addr == B44_PHY_ADDR_NO_PHY) {
++		bp->flags |= B44_FLAG_100_BASE_T;
++		bp->flags |= B44_FLAG_FULL_DUPLEX;
++		if (!netif_carrier_ok(bp->dev)) {
++			u32 val = br32(B44_TX_CTRL);
++			val |= TX_CTRL_DUPLEX;
++			bw32(B44_TX_CTRL, val);
++			netif_carrier_on(bp->dev);
++			b44_link_report(bp);
++		}
++		return;
++	}
++
+ 	if (!b44_readphy(bp, MII_BMSR, &bmsr) &&
+ 	    !b44_readphy(bp, B44_MII_AUXCTRL, &aux) &&
+ 	    (bmsr != 0xffff)) {
+@@ -520,14 +544,14 @@
+ 
+ 		if (!netif_carrier_ok(bp->dev) &&
+ 		    (bmsr & BMSR_LSTATUS)) {
+-			u32 val = br32(bp, B44_TX_CTRL);
++			u32 val = br32(B44_TX_CTRL);
+ 			u32 local_adv, remote_adv;
+ 
+ 			if (bp->flags & B44_FLAG_FULL_DUPLEX)
+ 				val |= TX_CTRL_DUPLEX;
+ 			else
+ 				val &= ~TX_CTRL_DUPLEX;
+-			bw32(bp, B44_TX_CTRL, val);
++			bw32(B44_TX_CTRL, val);
+ 
+ 			if (!(bp->flags & B44_FLAG_FORCE_LINK) &&
+ 			    !b44_readphy(bp, MII_ADVERTISE, &local_adv) &&
+@@ -572,7 +596,7 @@
+ {
+ 	u32 cur, cons;
+ 
+-	cur  = br32(bp, B44_DMATX_STAT) & DMATX_STAT_CDMASK;
++	cur  = br32(B44_DMATX_STAT) & DMATX_STAT_CDMASK;
+ 	cur /= sizeof(struct dma_desc);
+ 
+ 	/* XXX needs updating when NETIF_F_SG is supported */
+@@ -596,7 +620,7 @@
+ 	    TX_BUFFS_AVAIL(bp) > B44_TX_WAKEUP_THRESH)
+ 		netif_wake_queue(bp->dev);
+ 
+-	bw32(bp, B44_GPTIMER, 0);
++	bw32(B44_GPTIMER, 0);
+ }
+ 
+ /* Works like this.  This chip writes a 'struct rx_header" 30 bytes
+@@ -713,7 +737,7 @@
+ 	u32 cons, prod;
+ 
+ 	received = 0;
+-	prod  = br32(bp, B44_DMARX_STAT) & DMARX_STAT_CDMASK;
++	prod  = br32(B44_DMARX_STAT) & DMARX_STAT_CDMASK;
+ 	prod /= sizeof(struct dma_desc);
+ 	cons = bp->rx_cons;
+ 
+@@ -792,7 +816,7 @@
+ 	}
+ 
+ 	bp->rx_cons = cons;
+-	bw32(bp, B44_DMARX_PTR, cons * sizeof(struct dma_desc));
++	bw32(B44_DMARX_PTR, cons * sizeof(struct dma_desc));
+ 
+ 	return received;
+ }
+@@ -856,8 +880,8 @@
+ 
+ 	spin_lock_irqsave(&bp->lock, flags);
+ 
+-	istat = br32(bp, B44_ISTAT);
+-	imask = br32(bp, B44_IMASK);
++	istat = br32(B44_ISTAT);
++	imask = br32(B44_IMASK);
+ 
+ 	/* ??? What the fuck is the purpose of the interrupt mask
+ 	 * ??? register if we have to mask it out by hand anyways?
+@@ -877,8 +901,8 @@
+ 			       dev->name);
+ 		}
+ 
+-		bw32(bp, B44_ISTAT, istat);
+-		br32(bp, B44_ISTAT);
++		bw32(B44_ISTAT, istat);
++		br32(B44_ISTAT);
+ 	}
+ 	spin_unlock_irqrestore(&bp->lock, flags);
+ 	return IRQ_RETVAL(handled);
+@@ -965,11 +989,11 @@
+ 
+ 	wmb();
+ 
+-	bw32(bp, B44_DMATX_PTR, entry * sizeof(struct dma_desc));
++	bw32(B44_DMATX_PTR, entry * sizeof(struct dma_desc));
+ 	if (bp->flags & B44_FLAG_BUGGY_TXPTR)
+-		bw32(bp, B44_DMATX_PTR, entry * sizeof(struct dma_desc));
++		bw32(B44_DMATX_PTR, entry * sizeof(struct dma_desc));
+ 	if (bp->flags & B44_FLAG_REORDER_BUG)
+-		br32(bp, B44_DMATX_PTR);
++		br32(B44_DMATX_PTR);
+ 
+ 	if (TX_BUFFS_AVAIL(bp) < 1)
+ 		netif_stop_queue(dev);
+@@ -1137,32 +1161,35 @@
+ {
+ 	unsigned long reg;
+ 
+-	bw32(bp, B44_MIB_CTRL, MIB_CTRL_CLR_ON_READ);
++	bw32(B44_MIB_CTRL, MIB_CTRL_CLR_ON_READ);
+ 	for (reg = B44_TX_GOOD_O; reg <= B44_TX_PAUSE; reg += 4UL)
+-		br32(bp, reg);
++		br32(reg);
+ 	for (reg = B44_RX_GOOD_O; reg <= B44_RX_NPAUSE; reg += 4UL)
+-		br32(bp, reg);
++		br32(reg);
+ }
+ 
+ /* bp->lock is held. */
+ static void b44_chip_reset(struct b44 *bp)
+ {
++	unsigned int sb_clock;
++
+ 	if (ssb_is_core_up(bp)) {
+-		bw32(bp, B44_RCV_LAZY, 0);
+-		bw32(bp, B44_ENET_CTRL, ENET_CTRL_DISABLE);
++		bw32(B44_RCV_LAZY, 0);
++		bw32(B44_ENET_CTRL, ENET_CTRL_DISABLE);
+ 		b44_wait_bit(bp, B44_ENET_CTRL, ENET_CTRL_DISABLE, 100, 1);
+-		bw32(bp, B44_DMATX_CTRL, 0);
++		bw32(B44_DMATX_CTRL, 0);
+ 		bp->tx_prod = bp->tx_cons = 0;
+-		if (br32(bp, B44_DMARX_STAT) & DMARX_STAT_EMASK) {
++		if (br32(B44_DMARX_STAT) & DMARX_STAT_EMASK) {
+ 			b44_wait_bit(bp, B44_DMARX_STAT, DMARX_STAT_SIDLE,
+ 				     100, 0);
+ 		}
+-		bw32(bp, B44_DMARX_CTRL, 0);
++		bw32(B44_DMARX_CTRL, 0);
+ 		bp->rx_prod = bp->rx_cons = 0;
+ 	} else {
+-		ssb_pci_setup(bp, (bp->core_unit == 0 ?
+-				   SBINTVEC_ENET0 :
+-				   SBINTVEC_ENET1));
++		if (bp->pdev->device != PCI_DEVICE_ID_BCM4713)
++			ssb_pci_setup(bp, (bp->core_unit == 0 ?
++					   SBINTVEC_ENET0 :
++					   SBINTVEC_ENET1));
+ 	}
+ 
+ 	ssb_core_reset(bp);
+@@ -1170,20 +1197,26 @@
+ 	b44_clear_stats(bp);
+ 
+ 	/* Make PHY accessible. */
+-	bw32(bp, B44_MDIO_CTRL, (MDIO_CTRL_PREAMBLE |
+-			     (0x0d & MDIO_CTRL_MAXF_MASK)));
+-	br32(bp, B44_MDIO_CTRL);
+-
+-	if (!(br32(bp, B44_DEVCTRL) & DEVCTRL_IPP)) {
+-		bw32(bp, B44_ENET_CTRL, ENET_CTRL_EPSEL);
+-		br32(bp, B44_ENET_CTRL);
++	if (bp->pdev->device == PCI_DEVICE_ID_BCM4713)
++		sb_clock = 100000000; /* 100 MHz */
++	else
++		sb_clock = 62500000; /* 62.5 MHz */
++
++	bw32(B44_MDIO_CTRL, (MDIO_CTRL_PREAMBLE |
++			     (((sb_clock + (B44_MDC_RATIO / 2)) / B44_MDC_RATIO)
++			     & MDIO_CTRL_MAXF_MASK)));
++	br32(B44_MDIO_CTRL);
++
++	if (!(br32(B44_DEVCTRL) & DEVCTRL_IPP)) {
++		bw32(B44_ENET_CTRL, ENET_CTRL_EPSEL);
++		br32(B44_ENET_CTRL);
+ 		bp->flags &= ~B44_FLAG_INTERNAL_PHY;
+ 	} else {
+-		u32 val = br32(bp, B44_DEVCTRL);
++		u32 val = br32(B44_DEVCTRL);
+ 
+ 		if (val & DEVCTRL_EPR) {
+-			bw32(bp, B44_DEVCTRL, (val & ~DEVCTRL_EPR));
+-			br32(bp, B44_DEVCTRL);
++			bw32(B44_DEVCTRL, (val & ~DEVCTRL_EPR));
++			br32(B44_DEVCTRL);
+ 			udelay(100);
+ 		}
+ 		bp->flags |= B44_FLAG_INTERNAL_PHY;
+@@ -1200,13 +1233,13 @@
+ /* bp->lock is held. */
+ static void __b44_set_mac_addr(struct b44 *bp)
+ {
+-	bw32(bp, B44_CAM_CTRL, 0);
++	bw32(B44_CAM_CTRL, 0);
+ 	if (!(bp->dev->flags & IFF_PROMISC)) {
+ 		u32 val;
+ 
+ 		__b44_cam_write(bp, bp->dev->dev_addr, 0);
+-		val = br32(bp, B44_CAM_CTRL);
+-		bw32(bp, B44_CAM_CTRL, val | CAM_CTRL_ENABLE);
++		val = br32(B44_CAM_CTRL);
++		bw32(B44_CAM_CTRL, val | CAM_CTRL_ENABLE);
+ 	}
+ }
+ 
+@@ -1240,30 +1273,30 @@
+ 	b44_setup_phy(bp);
+ 
+ 	/* Enable CRC32, set proper LED modes and power on PHY */
+-	bw32(bp, B44_MAC_CTRL, MAC_CTRL_CRC32_ENAB | MAC_CTRL_PHY_LEDCTRL);
+-	bw32(bp, B44_RCV_LAZY, (1 << RCV_LAZY_FC_SHIFT));
++	bw32(B44_MAC_CTRL, MAC_CTRL_CRC32_ENAB | MAC_CTRL_PHY_LEDCTRL);
++	bw32(B44_RCV_LAZY, (1 << RCV_LAZY_FC_SHIFT));
+ 
+ 	/* This sets the MAC address too.  */
+ 	__b44_set_rx_mode(bp->dev);
+ 
+ 	/* MTU + eth header + possible VLAN tag + struct rx_header */
+-	bw32(bp, B44_RXMAXLEN, bp->dev->mtu + ETH_HLEN + 8 + RX_HEADER_LEN);
+-	bw32(bp, B44_TXMAXLEN, bp->dev->mtu + ETH_HLEN + 8 + RX_HEADER_LEN);
++	bw32(B44_RXMAXLEN, bp->dev->mtu + ETH_HLEN + 8 + RX_HEADER_LEN);
++	bw32(B44_TXMAXLEN, bp->dev->mtu + ETH_HLEN + 8 + RX_HEADER_LEN);
+ 
+-	bw32(bp, B44_TX_WMARK, 56); /* XXX magic */
+-	bw32(bp, B44_DMATX_CTRL, DMATX_CTRL_ENABLE);
+-	bw32(bp, B44_DMATX_ADDR, bp->tx_ring_dma + bp->dma_offset);
+-	bw32(bp, B44_DMARX_CTRL, (DMARX_CTRL_ENABLE |
++	bw32(B44_TX_WMARK, 56); /* XXX magic */
++	bw32(B44_DMATX_CTRL, DMATX_CTRL_ENABLE);
++	bw32(B44_DMATX_ADDR, bp->tx_ring_dma + bp->dma_offset);
++	bw32(B44_DMARX_CTRL, (DMARX_CTRL_ENABLE |
+ 			      (bp->rx_offset << DMARX_CTRL_ROSHIFT)));
+-	bw32(bp, B44_DMARX_ADDR, bp->rx_ring_dma + bp->dma_offset);
++	bw32(B44_DMARX_ADDR, bp->rx_ring_dma + bp->dma_offset);
+ 
+-	bw32(bp, B44_DMARX_PTR, bp->rx_pending);
++	bw32(B44_DMARX_PTR, bp->rx_pending);
+ 	bp->rx_prod = bp->rx_pending;	
+ 
+-	bw32(bp, B44_MIB_CTRL, MIB_CTRL_CLR_ON_READ);
++	bw32(B44_MIB_CTRL, MIB_CTRL_CLR_ON_READ);
+ 
+-	val = br32(bp, B44_ENET_CTRL);
+-	bw32(bp, B44_ENET_CTRL, (val | ENET_CTRL_ENABLE));
++	val = br32(B44_ENET_CTRL);
++	bw32(B44_ENET_CTRL, (val | ENET_CTRL_ENABLE));
+ }
+ 
+ static int b44_open(struct net_device *dev)
+@@ -1416,11 +1449,11 @@
+ 	int i=0;
+ 	unsigned char zero[6] = {0,0,0,0,0,0};
+ 
+-	val = br32(bp, B44_RXCONFIG);
++	val = br32(B44_RXCONFIG);
+ 	val &= ~(RXCONFIG_PROMISC | RXCONFIG_ALLMULTI);
+ 	if (dev->flags & IFF_PROMISC) {
+ 		val |= RXCONFIG_PROMISC;
+-		bw32(bp, B44_RXCONFIG, val);
++		bw32(B44_RXCONFIG, val);
+ 	} else {
+ 		__b44_set_mac_addr(bp);
+ 
+@@ -1432,9 +1465,9 @@
+ 		for(;i<64;i++) {
+ 			__b44_cam_write(bp, zero, i);			
+ 		}
+-		bw32(bp, B44_RXCONFIG, val);
+-        	val = br32(bp, B44_CAM_CTRL);
+-	        bw32(bp, B44_CAM_CTRL, val | CAM_CTRL_ENABLE);
++		bw32(B44_RXCONFIG, val);
++        	val = br32(B44_CAM_CTRL);
++	        bw32(B44_CAM_CTRL, val | CAM_CTRL_ENABLE);
+ 	}
+ }
+ 
+@@ -1704,19 +1737,41 @@
+ {
+ 	u8 eeprom[128];
+ 	int err;
++	unsigned long flags;
+ 
+-	err = b44_read_eeprom(bp, &eeprom[0]);
+-	if (err)
+-		goto out;
+-
+-	bp->dev->dev_addr[0] = eeprom[79];
+-	bp->dev->dev_addr[1] = eeprom[78];
+-	bp->dev->dev_addr[2] = eeprom[81];
+-	bp->dev->dev_addr[3] = eeprom[80];
+-	bp->dev->dev_addr[4] = eeprom[83];
+-	bp->dev->dev_addr[5] = eeprom[82];
+-
+-	bp->phy_addr = eeprom[90] & 0x1f;
++	if (bp->pdev->device == PCI_DEVICE_ID_BCM4713) {
++		/* 
++		 * BCM47xx boards don't have a EEPROM. The MAC is stored in
++		 * a NVRAM area somewhere in the flash memory. As we don't
++		 * know the location and/or the format of the NVRAM area
++		 * here, we simply rely on the bootloader to write the
++		 * MAC into the CAM.
++		 */
++		spin_lock_irqsave(&bp->lock, flags);
++		__b44_cam_read(bp, bp->dev->dev_addr, 0);
++		spin_unlock_irqrestore(&bp->lock, flags);
++
++		/* 
++		 * BCM47xx boards don't have a PHY. Usually there is a switch
++		 * chip with multiple PHYs connected to the PHY port.
++		 */
++		bp->phy_addr = B44_PHY_ADDR_NO_PHY;
++		bp->dma_offset = 0;
++	} else {
++		err = b44_read_eeprom(bp, &eeprom[0]);
++		if (err)
++			return err;
++
++		bp->dev->dev_addr[0] = eeprom[79];
++		bp->dev->dev_addr[1] = eeprom[78];
++		bp->dev->dev_addr[2] = eeprom[81];
++		bp->dev->dev_addr[3] = eeprom[80];
++		bp->dev->dev_addr[4] = eeprom[83];
++		bp->dev->dev_addr[5] = eeprom[82];
++
++		bp->phy_addr = eeprom[90] & 0x1f;
++		bp->dma_offset = SB_PCI_DMA;
++	} 
+ 
+ 	/* With this, plus the rx_header prepended to the data by the
+ 	 * hardware, we'll land the ethernet header on a 2-byte boundary.
+@@ -1726,13 +1781,12 @@
+ 	bp->imask = IMASK_DEF;
+ 
+ 	bp->core_unit = ssb_core_unit(bp);
+-	bp->dma_offset = SB_PCI_DMA;
+ 
+ 	/* XXX - really required? 
+ 	   bp->flags |= B44_FLAG_BUGGY_TXPTR;
+          */
+-out:
+-	return err;
++
++	return 0;
+ }
+ 
+ static int __devinit b44_init_one(struct pci_dev *pdev,
+@@ -1810,7 +1864,7 @@
+ 
+ 	spin_lock_init(&bp->lock);
+ 
+-	bp->regs = ioremap(b44reg_base, b44reg_len);
++	bp->regs = (unsigned long) ioremap(b44reg_base, b44reg_len);
+ 	if (bp->regs == 0UL) {
+ 		printk(KERN_ERR PFX "Cannot map device registers, "
+ 		       "aborting.\n");
+@@ -1871,7 +1925,8 @@
+ 
+ 	pci_save_state(bp->pdev);
+ 
+-	printk(KERN_INFO "%s: Broadcom 4400 10/100BaseT Ethernet ", dev->name);
++	printk(KERN_INFO "%s: Broadcom %s 10/100BaseT Ethernet ", dev->name,
++		(pdev->device == PCI_DEVICE_ID_BCM4713) ? "47xx" : "4400");
+ 	for (i = 0; i < 6; i++)
+ 		printk("%2.2x%c", dev->dev_addr[i],
+ 		       i == 5 ? '\n' : ':');
+@@ -1879,7 +1934,7 @@
+ 	return 0;
+ 
+ err_out_iounmap:
+-	iounmap(bp->regs);
++	iounmap((void *) bp->regs);
+ 
+ err_out_free_dev:
+ 	free_netdev(dev);
+@@ -1901,7 +1956,7 @@
+ 		struct b44 *bp = netdev_priv(dev);
+ 
+ 		unregister_netdev(dev);
+-		iounmap(bp->regs);
++		iounmap((void *) bp->regs);
+ 		free_netdev(dev);
+ 		pci_release_regions(pdev);
+ 		pci_disable_device(pdev);
+diff -Nur linux-2.6.12.5/drivers/net/b44.h linux-2.6.12.5-b44/drivers/net/b44.h
+--- linux-2.6.12.5/drivers/net/b44.h	2005-08-15 02:20:18.000000000 +0200
++++ linux-2.6.12.5-b44/drivers/net/b44.h	2005-09-16 11:06:16.393533960 +0200
+@@ -292,6 +292,9 @@
+ #define SSB_PCI_MASK1		0xfc000000
+ #define SSB_PCI_MASK2		0xc0000000
+ 
++#define br32(REG)	readl((void *)bp->regs + (REG))
++#define bw32(REG,VAL)	writel((VAL), (void *)bp->regs + (REG))
++
+ /* 4400 PHY registers */
+ #define B44_MII_AUXCTRL		24	/* Auxiliary Control */
+ #define  MII_AUXCTRL_DUPLEX	0x0001  /* Full Duplex */
+@@ -345,6 +348,8 @@
+ };
+ 
+ #define B44_MCAST_TABLE_SIZE	32
++#define B44_PHY_ADDR_NO_PHY	30
++#define B44_MDC_RATIO		5000000
+ 
+ /* SW copy of device statistics, kept up to date by periodic timer
+  * which probes HW values.  Must have same relative layout as HW
+@@ -410,7 +415,7 @@
+ 	struct net_device_stats	stats;
+ 	struct b44_hw_stats	hw_stats;
+ 
+-	void __iomem		*regs;
++	unsigned long		regs;
+ 	struct pci_dev		*pdev;
+ 	struct net_device	*dev;
+