* [PATCH] ISDN: Add PCI ID for HFC-2S/4S Beronet Card PCIe
@ 2010-03-15 13:18 Karsten Keil
2010-03-15 13:18 ` [PATCH V2] " Karsten Keil
2010-03-15 23:01 ` [PATCH] " David Miller
0 siblings, 2 replies; 6+ messages in thread
From: Karsten Keil @ 2010-03-15 13:18 UTC (permalink / raw)
To: Linus Torvalds
Cc: Lars Ellenberg, netdev, Andreas Eversberg, Andrew Morton,
linux-kernel
A few subdevice IDs seem to have been dropped when hfc_multi was
included upstream, just compare the list at
http://www.openvox.cn/viewvc/misdn/trunk/hfc_multi.c?revision=75&view=annotate#l175
with the IDs in drivers/isdn/hardware/mISDN/hfcmulti.c
Added PCIe 2 Port card and LED settings (same as PCI) /KKe
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Signed-off-by: Karsten Keil <keil@b1-systems.de>
---
drivers/isdn/hardware/mISDN/hfcmulti.c | 6 ++++++
include/linux/pci_ids.h | 2 ++
2 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/drivers/isdn/hardware/mISDN/hfcmulti.c b/drivers/isdn/hardware/mISDN/hfcmulti.c
index ad36df9..751b34c 100644
--- a/drivers/isdn/hardware/mISDN/hfcmulti.c
+++ b/drivers/isdn/hardware/mISDN/hfcmulti.c
@@ -5265,6 +5265,8 @@ static const struct hm_map hfcm_map[] = {
/*31*/ {VENDOR_CCD, "XHFC-4S Speech Design", 5, 4, 0, 0, 0, 0,
HFC_IO_MODE_EMBSD, XHFC_IRQ},
/*32*/ {VENDOR_JH, "HFC-8S (junghanns)", 8, 8, 1, 0, 0, 0, 0, 0},
+/*33*/ {VENDOR_BN, "HFC-2S Beronet Card PCIe", 4, 2, 1, 3, 0, DIP_4S, 0, 0},
+/*34*/ {VENDOR_BN, "HFC-4S Beronet Card PCIe", 4, 4, 1, 2, 0, DIP_4S, 0, 0},
};
#undef H
@@ -5300,6 +5302,10 @@ static struct pci_device_id hfmultipci_ids[] __devinitdata = {
PCI_SUBDEVICE_ID_CCD_OV4S, 0, 0, H(28)}, /* OpenVox 4 */
{ PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_HFC4S, PCI_VENDOR_ID_CCD,
PCI_SUBDEVICE_ID_CCD_OV2S, 0, 0, H(29)}, /* OpenVox 2 */
+ { PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_HFC4S, PCI_VENDOR_ID_CCD,
+ PCI_SUBDEVICE_ID_CCD_BN2SE, 0, 0, H(33)}, /* BN2S PCIe */
+ { PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_HFC4S, PCI_VENDOR_ID_CCD,
+ PCI_SUBDEVICE_ID_CCD_BN4SE, 0, 0, H(34)}, /* BN4S PCIe */
/* Cards with HFC-8S Chip */
{ PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_HFC8S, PCI_VENDOR_ID_CCD,
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 9f688d2..a5cc675 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1923,6 +1923,8 @@
#define PCI_SUBDEVICE_ID_CCD_HFC8S 0xB622
#define PCI_DEVICE_ID_CCD_B700 0xb700
#define PCI_DEVICE_ID_CCD_B701 0xb701
+#define PCI_SUBDEVICE_ID_CCD_BN2SE 0xb761
+#define PCI_SUBDEVICE_ID_CCD_BN4SE 0xb762
#define PCI_SUBDEVICE_ID_CCD_HFCE1 0xC523
#define PCI_SUBDEVICE_ID_CCD_OV2S 0xE884
#define PCI_SUBDEVICE_ID_CCD_OV4S 0xE888
--
1.6.0.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH V2] ISDN: Add PCI ID for HFC-2S/4S Beronet Card PCIe
2010-03-15 13:18 [PATCH] ISDN: Add PCI ID for HFC-2S/4S Beronet Card PCIe Karsten Keil
@ 2010-03-15 13:18 ` Karsten Keil
2010-03-16 2:09 ` David Miller
2010-03-15 23:01 ` [PATCH] " David Miller
1 sibling, 1 reply; 6+ messages in thread
From: Karsten Keil @ 2010-03-15 13:18 UTC (permalink / raw)
To: Linus Torvalds
Cc: Lars Ellenberg, netdev, Andreas Eversberg, Andrew Morton,
linux-kernel
From: Lars Ellenberg <lars.ellenberg@linbit.com>
A few subdevice IDs seem to have been dropped when hfc_multi was
included upstream, just compare the list at
http://www.openvox.cn/viewvc/misdn/trunk/hfc_multi.c?revision=75&view=annotate#l175
with the IDs in drivers/isdn/hardware/mISDN/hfcmulti.c
Added PCIe 2 Port card and LED settings (same as PCI)
Do not use <linux/pci_ids.h> /KKe
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Signed-off-by: Karsten Keil <keil@b1-systems.de>
---
drivers/isdn/hardware/mISDN/hfcmulti.c | 6 ++++++
include/linux/pci_ids.h | 2 ++
2 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/drivers/isdn/hardware/mISDN/hfcmulti.c b/drivers/isdn/hardware/mISDN/hfcmulti.c
index ad36df9..751b34c 100644
--- a/drivers/isdn/hardware/mISDN/hfcmulti.c
+++ b/drivers/isdn/hardware/mISDN/hfcmulti.c
@@ -5265,6 +5265,8 @@ static const struct hm_map hfcm_map[] = {
/*31*/ {VENDOR_CCD, "XHFC-4S Speech Design", 5, 4, 0, 0, 0, 0,
HFC_IO_MODE_EMBSD, XHFC_IRQ},
/*32*/ {VENDOR_JH, "HFC-8S (junghanns)", 8, 8, 1, 0, 0, 0, 0, 0},
+/*33*/ {VENDOR_BN, "HFC-2S Beronet Card PCIe", 4, 2, 1, 3, 0, DIP_4S, 0, 0},
+/*34*/ {VENDOR_BN, "HFC-4S Beronet Card PCIe", 4, 4, 1, 2, 0, DIP_4S, 0, 0},
};
#undef H
@@ -5300,6 +5302,10 @@ static struct pci_device_id hfmultipci_ids[] __devinitdata = {
PCI_SUBDEVICE_ID_CCD_OV4S, 0, 0, H(28)}, /* OpenVox 4 */
{ PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_HFC4S, PCI_VENDOR_ID_CCD,
PCI_SUBDEVICE_ID_CCD_OV2S, 0, 0, H(29)}, /* OpenVox 2 */
+ { PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_HFC4S, PCI_VENDOR_ID_CCD,
+ 0xb761, 0, 0, H(33)}, /* BN2S PCIe */
+ { PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_HFC4S, PCI_VENDOR_ID_CCD,
+ 0xb762, 0, 0, H(34)}, /* BN4S PCIe */
/* Cards with HFC-8S Chip */
{ PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_HFC8S, PCI_VENDOR_ID_CCD,
--
1.6.0.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] ISDN: Add PCI ID for HFC-2S/4S Beronet Card PCIe
2010-03-15 13:18 [PATCH] ISDN: Add PCI ID for HFC-2S/4S Beronet Card PCIe Karsten Keil
2010-03-15 13:18 ` [PATCH V2] " Karsten Keil
@ 2010-03-15 23:01 ` David Miller
2010-03-16 1:08 ` Karsten Keil
1 sibling, 1 reply; 6+ messages in thread
From: David Miller @ 2010-03-15 23:01 UTC (permalink / raw)
To: keil; +Cc: torvalds, lars.ellenberg, netdev, andreas, akpm, linux-kernel
From: Karsten Keil <keil@b1-systems.de>
Date: Mon, 15 Mar 2010 14:18:41 +0100
> A few subdevice IDs seem to have been dropped when hfc_multi was
> included upstream, just compare the list at
> http://www.openvox.cn/viewvc/misdn/trunk/hfc_multi.c?revision=75&view=annotate#l175
> with the IDs in drivers/isdn/hardware/mISDN/hfcmulti.c
>
> Added PCIe 2 Port card and LED settings (same as PCI) /KKe
>
> Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
> Signed-off-by: Karsten Keil <keil@b1-systems.de>
We don't add new defines to linux/pci_ids.h, it is deprecated.
Simply add the device ID constants to the table.
The only exception is the case where a device ID is used in
more than one driver, but even that scenerio is heavily
discouraged.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] ISDN: Add PCI ID for HFC-2S/4S Beronet Card PCIe
2010-03-15 23:01 ` [PATCH] " David Miller
@ 2010-03-16 1:08 ` Karsten Keil
2010-03-16 2:06 ` David Miller
0 siblings, 1 reply; 6+ messages in thread
From: Karsten Keil @ 2010-03-16 1:08 UTC (permalink / raw)
To: David Miller
Cc: torvalds, lars.ellenberg, netdev, andreas, akpm, linux-kernel
On Dienstag, 16. März 2010 00:01:33 David Miller wrote:
> From: Karsten Keil <keil@b1-systems.de>
> Date: Mon, 15 Mar 2010 14:18:41 +0100
>
> > A few subdevice IDs seem to have been dropped when hfc_multi was
> > included upstream, just compare the list at
> > http://www.openvox.cn/viewvc/misdn/trunk/hfc_multi.c?revision=75&view=ann
> >otate#l175 with the IDs in drivers/isdn/hardware/mISDN/hfcmulti.c
> >
> > Added PCIe 2 Port card and LED settings (same as PCI) /KKe
> >
> > Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
> > Signed-off-by: Karsten Keil <keil@b1-systems.de>
>
> We don't add new defines to linux/pci_ids.h, it is deprecated.
> Simply add the device ID constants to the table.
Good policy, makes sense. Will send a new version.
May a check for adding defines to <linux/pci_ids> would help to enforce it.
>
> The only exception is the case where a device ID is used in
> more than one driver, but even that scenerio is heavily
> discouraged.
>
Is here some plan to cleanup drivers for -next and remove IDs from pci_ids.h,
or should it not changed for old entries ?
Karsten
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2010-03-16 2:09 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-03-15 13:18 [PATCH] ISDN: Add PCI ID for HFC-2S/4S Beronet Card PCIe Karsten Keil
2010-03-15 13:18 ` [PATCH V2] " Karsten Keil
2010-03-16 2:09 ` David Miller
2010-03-15 23:01 ` [PATCH] " David Miller
2010-03-16 1:08 ` Karsten Keil
2010-03-16 2:06 ` 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).