* [PATCH] com20020-pci: add support for eae single card
@ 2015-02-13 12:03 Michael Grzeschik
2015-02-15 16:22 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Michael Grzeschik @ 2015-02-13 12:03 UTC (permalink / raw)
To: netdev; +Cc: linux-kernel, davem, kernel
Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
---
drivers/net/arcnet/com20020-pci.c | 21 ++++++++++++++++++---
1 file changed, 18 insertions(+), 3 deletions(-)
diff --git a/drivers/net/arcnet/com20020-pci.c b/drivers/net/arcnet/com20020-pci.c
index 945f532..96edc13 100644
--- a/drivers/net/arcnet/com20020-pci.c
+++ b/drivers/net/arcnet/com20020-pci.c
@@ -214,8 +214,17 @@ static struct com20020_pci_card_info card_info_sohard = {
.flags = ARC_CAN_10MBIT,
};
-static struct com20020_pci_card_info card_info_eae = {
- .name = "EAE PLX-PCI",
+static struct com20020_pci_card_info card_info_eae_arc1 = {
+ .name = "EAE PLX-PCI ARC1",
+ .devcount = 1,
+ .chan_map_tbl = {
+ { 2, 0x00, 0x08 },
+ },
+ .flags = ARC_CAN_10MBIT,
+};
+
+static struct com20020_pci_card_info card_info_eae_ma1 = {
+ .name = "EAE PLX-PCI MA1",
.devcount = 2,
.chan_map_tbl = {
{ 2, 0x00, 0x08 },
@@ -359,9 +368,15 @@ static const struct pci_device_id com20020pci_id_table[] = {
},
{
0x10B5, 0x9050,
+ 0x10B5, 0x3263,
+ 0, 0,
+ (kernel_ulong_t)&card_info_eae_arc1
+ },
+ {
+ 0x10B5, 0x9050,
0x10B5, 0x3292,
0, 0,
- (kernel_ulong_t)&card_info_eae
+ (kernel_ulong_t)&card_info_eae_ma1
},
{
0x14BA, 0x6000,
--
2.1.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] com20020-pci: add support for eae single card
2015-02-13 12:03 [PATCH] com20020-pci: add support for eae single card Michael Grzeschik
@ 2015-02-15 16:22 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2015-02-15 16:22 UTC (permalink / raw)
To: m.grzeschik; +Cc: netdev, linux-kernel, kernel
From: Michael Grzeschik <m.grzeschik@pengutronix.de>
Date: Fri, 13 Feb 2015 13:03:50 +0100
> Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
Applied, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-02-15 16:22 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-02-13 12:03 [PATCH] com20020-pci: add support for eae single card Michael Grzeschik
2015-02-15 16:22 ` David Miller
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).