Commit 96bf2f2b authored by Andrew de Quincey's avatar Andrew de Quincey Committed by Linus Torvalds

[PATCH] dvb: ttpci: add support for Technotrend/Hauppauge DVB-S SE

Add support for s5h1420 frontend (new Technotrend/Hauppauge DVB-S SE).
Signed-off-by: default avatarAndrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: default avatarJohannes Stezenbach <js@linuxtv.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 771e7157
...@@ -40,6 +40,12 @@ config DVB_VES1X93 ...@@ -40,6 +40,12 @@ config DVB_VES1X93
help help
A DVB-S tuner module. Say Y when you want to support this frontend. A DVB-S tuner module. Say Y when you want to support this frontend.
config DVB_S5H1420
tristate "Samsung S5H1420 based"
depends on DVB_CORE
help
A DVB-S tuner module. Say Y when you want to support this frontend.
comment "DVB-T (terrestrial) frontends" comment "DVB-T (terrestrial) frontends"
depends on DVB_CORE depends on DVB_CORE
......
...@@ -29,3 +29,4 @@ obj-$(CONFIG_DVB_NXT2002) += nxt2002.o ...@@ -29,3 +29,4 @@ obj-$(CONFIG_DVB_NXT2002) += nxt2002.o
obj-$(CONFIG_DVB_OR51211) += or51211.o obj-$(CONFIG_DVB_OR51211) += or51211.o
obj-$(CONFIG_DVB_OR51132) += or51132.o obj-$(CONFIG_DVB_OR51132) += or51132.o
obj-$(CONFIG_DVB_BCM3510) += bcm3510.o obj-$(CONFIG_DVB_BCM3510) += bcm3510.o
obj-$(CONFIG_DVB_S5H1420) += s5h1420.o
This diff is collapsed.
/*
Driver for S5H1420 QPSK Demodulators
Copyright (C) 2005 Andrew de Quincey <adq_dvb@lidskialf.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#ifndef S5H1420_H
#define S5H1420_H
#include <linux/dvb/frontend.h>
struct s5h1420_config
{
/* the demodulator's i2c address */
u8 demod_address;
/* PLL maintenance */
int (*pll_init)(struct dvb_frontend* fe);
int (*pll_set)(struct dvb_frontend* fe, struct dvb_frontend_parameters* params, u32* freqout);
};
extern struct dvb_frontend* s5h1420_attach(const struct s5h1420_config* config,
struct i2c_adapter* i2c);
#endif // S5H1420_H
...@@ -12,7 +12,7 @@ config DVB_AV7110 ...@@ -12,7 +12,7 @@ config DVB_AV7110
select DVB_STV0297 select DVB_STV0297
select DVB_L64781 select DVB_L64781
help help
Support for SAA7146 and AV7110 based DVB cards as produced Support for SAA7146 and AV7110 based DVB cards as produced
by Fujitsu-Siemens, Technotrend, Hauppauge and others. by Fujitsu-Siemens, Technotrend, Hauppauge and others.
This driver only supports the fullfeatured cards with This driver only supports the fullfeatured cards with
...@@ -33,7 +33,7 @@ config DVB_AV7110_FIRMWARE ...@@ -33,7 +33,7 @@ config DVB_AV7110_FIRMWARE
If you want to compile the firmware into the driver you need to say If you want to compile the firmware into the driver you need to say
Y here and provide the correct path of the firmware. You need this Y here and provide the correct path of the firmware. You need this
option if you want to compile the whole driver statically into the option if you want to compile the whole driver statically into the
kernel. kernel.
All other people say N. All other people say N.
...@@ -66,6 +66,7 @@ config DVB_BUDGET ...@@ -66,6 +66,7 @@ config DVB_BUDGET
select DVB_L64781 select DVB_L64781
select DVB_TDA8083 select DVB_TDA8083
select DVB_TDA10021 select DVB_TDA10021
select DVB_S5H1420
help help
Support for simple SAA7146 based DVB cards Support for simple SAA7146 based DVB cards
(so called Budget- or Nova-PCI cards) without onboard (so called Budget- or Nova-PCI cards) without onboard
...@@ -119,9 +120,9 @@ config DVB_BUDGET_PATCH ...@@ -119,9 +120,9 @@ config DVB_BUDGET_PATCH
select DVB_VES1X93 select DVB_VES1X93
select DVB_TDA8083 select DVB_TDA8083
help help
Support for Budget Patch (full TS) modification on Support for Budget Patch (full TS) modification on
SAA7146+AV7110 based cards (DVB-S cards). This SAA7146+AV7110 based cards (DVB-S cards). This
driver doesn't use onboard MPEG2 decoder. The driver doesn't use onboard MPEG2 decoder. The
card is driven in Budget-only mode. Card is card is driven in Budget-only mode. Card is
required to have loaded firmware to tune properly. required to have loaded firmware to tune properly.
Firmware can be loaded by insertion and removal of Firmware can be loaded by insertion and removal of
......
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
#include "ves1820.h" #include "ves1820.h"
#include "l64781.h" #include "l64781.h"
#include "tda8083.h" #include "tda8083.h"
#include "s5h1420.h"
static void Set22K (struct budget *budget, int state) static void Set22K (struct budget *budget, int state)
{ {
...@@ -177,6 +178,62 @@ static int budget_diseqc_send_burst(struct dvb_frontend* fe, fe_sec_mini_cmd_t m ...@@ -177,6 +178,62 @@ static int budget_diseqc_send_burst(struct dvb_frontend* fe, fe_sec_mini_cmd_t m
return 0; return 0;
} }
static int lnbp21_set_voltage(struct dvb_frontend* fe, fe_sec_voltage_t voltage)
{
struct budget* budget = (struct budget*) fe->dvb->priv;
u8 buf;
struct i2c_msg msg = { .addr = 0x08, .flags = I2C_M_RD, .buf = &buf, .len = sizeof(buf) };
if (i2c_transfer (&budget->i2c_adap, &msg, 1) != 1) return -EIO;
switch(voltage) {
case SEC_VOLTAGE_13:
buf = (buf & 0xf7) | 0x04;
break;
case SEC_VOLTAGE_18:
buf = (buf & 0xf7) | 0x0c;
break;
case SEC_VOLTAGE_OFF:
buf = buf & 0xf0;
break;
}
msg.flags = 0;
if (i2c_transfer (&budget->i2c_adap, &msg, 1) != 1) return -EIO;
return 0;
}
static int lnbp21_enable_high_lnb_voltage(struct dvb_frontend* fe, int arg)
{
struct budget* budget = (struct budget*) fe->dvb->priv;
u8 buf;
struct i2c_msg msg = { .addr = 0x08, .flags = I2C_M_RD, .buf = &buf, .len = sizeof(buf) };
if (i2c_transfer (&budget->i2c_adap, &msg, 1) != 1) return -EIO;
if (arg) {
buf = buf | 0x10;
} else {
buf = buf & 0xef;
}
msg.flags = 0;
if (i2c_transfer (&budget->i2c_adap, &msg, 1) != 1) return -EIO;
return 0;
}
static void lnbp21_init(struct budget* budget)
{
u8 buf = 0x00;
struct i2c_msg msg = { .addr = 0x08, .flags = 0, .buf = &buf, .len = sizeof(buf) };
i2c_transfer (&budget->i2c_adap, &msg, 1);
}
static int alps_bsrv2_pll_set(struct dvb_frontend* fe, struct dvb_frontend_parameters* params) static int alps_bsrv2_pll_set(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)
{ {
struct budget* budget = (struct budget*) fe->dvb->priv; struct budget* budget = (struct budget*) fe->dvb->priv;
...@@ -395,6 +452,38 @@ static struct tda8083_config grundig_29504_451_config = { ...@@ -395,6 +452,38 @@ static struct tda8083_config grundig_29504_451_config = {
.pll_set = grundig_29504_451_pll_set, .pll_set = grundig_29504_451_pll_set,
}; };
static int s5h1420_pll_set(struct dvb_frontend* fe, struct dvb_frontend_parameters* params, u32* freqout)
{
struct budget* budget = (struct budget*) fe->dvb->priv;
u32 div;
u8 data[4];
struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = data, .len = sizeof(data) };
div = params->frequency / 1000;
data[0] = (div >> 8) & 0x7f;
data[1] = div & 0xff;
data[2] = 0xc2;
if (div < 1450)
data[3] = 0x00;
else if (div < 1850)
data[3] = 0x40;
else if (div < 2000)
data[3] = 0x80;
else
data[3] = 0xc0;
if (i2c_transfer (&budget->i2c_adap, &msg, 1) != 1) return -EIO;
*freqout = div * 1000;
return 0;
}
static struct s5h1420_config s5h1420_config = {
.demod_address = 0x53,
.pll_set = s5h1420_pll_set,
};
static u8 read_pwm(struct budget* budget) static u8 read_pwm(struct budget* budget)
{ {
u8 b = 0xff; u8 b = 0xff;
...@@ -459,6 +548,15 @@ static void frontend_init(struct budget *budget) ...@@ -459,6 +548,15 @@ static void frontend_init(struct budget *budget)
break; break;
} }
break; break;
case 0x1016: // Hauppauge/TT Nova-S SE (samsung s5h1420/????(tda8260))
budget->dvb_frontend = s5h1420_attach(&s5h1420_config, &budget->i2c_adap);
if (budget->dvb_frontend) {
budget->dvb_frontend->ops->set_voltage = lnbp21_set_voltage;
budget->dvb_frontend->ops->enable_high_lnb_voltage = lnbp21_enable_high_lnb_voltage;
lnbp21_init(budget);
break;
}
} }
if (budget->dvb_frontend == NULL) { if (budget->dvb_frontend == NULL) {
...@@ -532,6 +630,7 @@ static struct pci_device_id pci_tbl[] = { ...@@ -532,6 +630,7 @@ static struct pci_device_id pci_tbl[] = {
MAKE_EXTENSION_PCI(ttbc, 0x13c2, 0x1004), MAKE_EXTENSION_PCI(ttbc, 0x13c2, 0x1004),
MAKE_EXTENSION_PCI(ttbt, 0x13c2, 0x1005), MAKE_EXTENSION_PCI(ttbt, 0x13c2, 0x1005),
MAKE_EXTENSION_PCI(satel, 0x13c2, 0x1013), MAKE_EXTENSION_PCI(satel, 0x13c2, 0x1013),
MAKE_EXTENSION_PCI(ttbs, 0x13c2, 0x1016),
MAKE_EXTENSION_PCI(fsacs1,0x1131, 0x4f60), MAKE_EXTENSION_PCI(fsacs1,0x1131, 0x4f60),
MAKE_EXTENSION_PCI(fsacs0,0x1131, 0x4f61), MAKE_EXTENSION_PCI(fsacs0,0x1131, 0x4f61),
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment