diff options
| author | Shaun Ruffell <sruffell@digium.com> | 2009-11-12 21:48:17 +0000 |
|---|---|---|
| committer | Shaun Ruffell <sruffell@digium.com> | 2009-11-12 21:48:17 +0000 |
| commit | 6d0c73733bb48f2807b2bec600016c25f195ec5e (patch) | |
| tree | f9c0326d06a5cfde715e9a42762255aab693d04e /drivers/dahdi/wcb4xxp | |
| parent | 0a371724c5489edcf30c102bf4539a518270f0a2 (diff) | |
wcb4xxp: More hw ids for HFC-4S & HFC-8S
Solves a typo in Junghanns 8 ports card hw id & adds more hardware ids
(Beronet mainly). All tested ok in asterisk-es group.
(issue #15446)
Reported by: Odicha
Patches:
wcb4xxp dahdi-linux.patch uploaded by Odicha (license 700)
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@7576 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'drivers/dahdi/wcb4xxp')
| -rw-r--r-- | drivers/dahdi/wcb4xxp/base.c | 21 | ||||
| -rw-r--r-- | drivers/dahdi/wcb4xxp/wcb4xxp.h | 1 |
2 files changed, 15 insertions, 7 deletions
diff --git a/drivers/dahdi/wcb4xxp/base.c b/drivers/dahdi/wcb4xxp/base.c index d0eed55..b6d1c8c 100644 --- a/drivers/dahdi/wcb4xxp/base.c +++ b/drivers/dahdi/wcb4xxp/base.c @@ -137,6 +137,8 @@ static struct devtype hfc8s_OV = {"OpenVox B800P", .ports = 8, .card_type = B800 static struct devtype hfc2s_BN = {"BeroNet BN2S0", .ports = 2, .card_type = BN2S0 }; static struct devtype hfc4s_BN = {"BeroNet BN4S0", .ports = 4, .card_type = BN4S0 }; static struct devtype hfc8s_BN = {"BeroNet BN8S0", .ports = 8, .card_type = BN8S0 }; +static struct devtype hfc4s_EV = {"CCD HFC-4S Eval. Board", .ports = 4, + .card_type = QUADBRI_EVAL }; #define CARD_HAS_EC(card) ((card)->card_type == B410P) @@ -1828,13 +1830,14 @@ static void b4xxp_init_stage1(struct b4xxp *b4) b4xxp_setreg8(b4, R_SCI_MSK, 0x00); /* mask off all S/T interrupts */ b4xxp_setreg8(b4, R_IRQMSK_MISC, 0x00); /* nothing else can generate an interrupt */ -/* - * set up the clock controller - * B410P has a 24.576MHz crystal, so the PCM clock is 2x the incoming clock. - * Other cards have a 49.152Mhz crystal, so the PCM clock equals incoming clock. - */ + /* + * set up the clock controller B410P & Cologne Eval Board have a + * 24.576MHz crystal, so the PCM clock is 2x the incoming clock. + * Other cards have a 49.152Mhz crystal, so the PCM clock equals + * incoming clock. + */ - if (b4->card_type == B410P) + if ((b4->card_type == B410P) || (b4->card_type == QUADBRI_EVAL)) b4xxp_setreg8(b4, R_BRG_PCM_CFG, 0x02); else b4xxp_setreg8(b4, R_BRG_PCM_CFG, V_PCM_CLK); @@ -2876,15 +2879,19 @@ static void __devexit b4xxp_remove(struct pci_dev *pdev) static struct pci_device_id b4xx_ids[] __devinitdata = { { 0xd161, 0xb410, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long)&wcb4xxp }, - { 0x1397, 0x16b8, 0x1397, 0xe552, 0, 0, (unsigned long)&hfc8s }, + { 0x1397, 0x16b8, 0x1397, 0xb552, 0, 0, (unsigned long)&hfc8s }, { 0x1397, 0x08b4, 0x1397, 0xb520, 0, 0, (unsigned long)&hfc4s }, { 0x1397, 0x08b4, 0x1397, 0xb556, 0, 0, (unsigned long)&hfc2s }, { 0x1397, 0x08b4, 0x1397, 0xe884, 0, 0, (unsigned long)&hfc2s_OV }, { 0x1397, 0x08b4, 0x1397, 0xe888, 0, 0, (unsigned long)&hfc4s_OV }, { 0x1397, 0x16b8, 0x1397, 0xe998, 0, 0, (unsigned long)&hfc8s_OV }, { 0x1397, 0x08b4, 0x1397, 0xb566, 0, 0, (unsigned long)&hfc2s_BN }, + { 0x1397, 0x08b4, 0x1397, 0xb761, 0, 0, (unsigned long)&hfc2s_BN }, { 0x1397, 0x08b4, 0x1397, 0xb560, 0, 0, (unsigned long)&hfc4s_BN }, + { 0x1397, 0x08b4, 0x1397, 0xb550, 0, 0, (unsigned long)&hfc4s_BN }, { 0x1397, 0x16b8, 0x1397, 0xb562, 0, 0, (unsigned long)&hfc8s_BN }, + { 0x1397, 0x16b8, 0x1397, 0xb56b, 0, 0, (unsigned long)&hfc8s_BN }, + { 0x1397, 0x08b4, 0x1397, 0x08b4, 0, 0, (unsigned long)&hfc4s_EV }, {0, } }; diff --git a/drivers/dahdi/wcb4xxp/wcb4xxp.h b/drivers/dahdi/wcb4xxp/wcb4xxp.h index 448275c..3441437 100644 --- a/drivers/dahdi/wcb4xxp/wcb4xxp.h +++ b/drivers/dahdi/wcb4xxp/wcb4xxp.h @@ -425,6 +425,7 @@ enum cards_ids { /* Cards ==> Brand & Model */ BN2S0, /* BeroNet BN2S0 */ BN4S0, /* Beronet BN4S0 */ BN8S0 /* BeroNet BN8S0 */ + QUADBRI_EVAL /* HFC-4S CCD Eval. Board */ }; /* This structure exists one per card */ |