Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932627AbXBSUXc (ORCPT ); Mon, 19 Feb 2007 15:23:32 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932624AbXBSUXc (ORCPT ); Mon, 19 Feb 2007 15:23:32 -0500 Received: from cassiel.sirena.org.uk ([80.68.93.111]:1560 "EHLO cassiel.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932613AbXBSUX2 (ORCPT ); Mon, 19 Feb 2007 15:23:28 -0500 Message-Id: <20070219201859.523199000@sirena.org.uk> References: <20070219201538.420238000@sirena.org.uk> User-Agent: quilt/0.45-1 Date: Mon, 19 Feb 2007 20:15:40 +0000 From: Mark Brown To: Tim Hockin , Jeff Garzik Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, akpm@linux-foundation.org Subject: [patch 2/2] natsemi: Support Aculab E1/T1 PMXc cPCI carrier cards Content-Disposition: inline; filename=natsemi-aculab-cpci-carrier.patch X-Spam-Score: -3.7 (---) Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1928 Lines: 57 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 --- This revision removes extra braces from the previous version. Index: linux/drivers/net/natsemi.c =================================================================== --- linux.orig/drivers/net/natsemi.c 2007-02-19 10:16:50.000000000 +0000 +++ linux/drivers/net/natsemi.c 2007-02-19 10:18:25.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,10 @@ 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." - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/