2007-02-14 10:39:58

by Mark Brown

Subject: [patch 2/2] natsemi: Support Aculab E1/T1 PMXc cPCI carrier cards

Aculab E1/T1 PMXc cPCI carrier card cards present a natsemi on the cPCI
bus with an oversized EEPROM using a direct MII<->MII connection with no
PHY. This patch adds a new device table entry supporting these cards.

Signed-Off-By: Mark Brown <[email protected]>

Index: linux/drivers/net/natsemi.c
===================================================================
--- linux.orig/drivers/net/natsemi.c 2007-02-12 18:09:44.000000000 +0000
+++ linux/drivers/net/natsemi.c 2007-02-12 18:09:59.000000000 +0000
@@ -244,6 +244,9 @@
MII_EN_SCRM = 0x0004, /* enable scrambler (tp) */
};

+enum {
+ NATSEMI_FLAG_IGNORE_PHY = 0x1,
+};

/* array of board data directly indexed by pci_tbl[x].driver_data */
static const struct {
@@ -251,10 +254,12 @@
unsigned long flags;
unsigned int eeprom_size;
} natsemi_pci_info[] __devinitdata = {
+ { "Aculab E1/T1 PMXc cPCI carrier card", NATSEMI_FLAG_IGNORE_PHY, 128 },
{ "NatSemi DP8381[56]", 0, 24 },
};

static const struct pci_device_id natsemi_pci_tbl[] __devinitdata = {
+ { PCI_VENDOR_ID_NS, 0x0020, 0x12d9, 0x000c, 0, 0, 0 },
{ PCI_VENDOR_ID_NS, 0x0020, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
{ } /* terminate list */
};
@@ -811,7 +816,11 @@
np->hands_off = 0;
np->intr_status = 0;
np->eeprom_size = natsemi_pci_info[chip_idx].eeprom_size;
- np->ignore_phy = 0;
+ if (natsemi_pci_info[chip_idx].flags & NATSEMI_FLAG_IGNORE_PHY) {
+ np->ignore_phy = 1;
+ } else {
+ np->ignore_phy = 0;
+ }

/* Initial port:
* - If configured to ignore the PHY set up for external.

--
"You grabbed my hand and we fell into it, like a daydream - or a fever."

2007-02-17 20:22:34

by Jeff Garzik

Subject: Re: [patch 2/2] natsemi: Support Aculab E1/T1 PMXc cPCI carrier cards

Mark Brown wrote:
> Aculab E1/T1 PMXc cPCI carrier card cards present a natsemi on the cPCI
> bus with an oversized EEPROM using a direct MII<->MII connection with no
> PHY. This patch adds a new device table entry supporting these cards.
>
> Signed-Off-By: Mark Brown <[email protected]>

> @@ -811,7 +816,11 @@
> np->hands_off = 0;
> np->intr_status = 0;
> np->eeprom_size = natsemi_pci_info[chip_idx].eeprom_size;
> - np->ignore_phy = 0;
> + if (natsemi_pci_info[chip_idx].flags & NATSEMI_FLAG_IGNORE_PHY) {
> + np->ignore_phy = 1;
> + } else {
> + np->ignore_phy = 0;
> + }


I ACK the patch itself, but since you have to resend anyway, please kill
the braces surrounding the above single-C-stmt lines.