* [PATCH]Omicom S2 PCI support
@ 2012-07-14 21:40 CrazyCat
2012-08-10 22:29 ` Mauro Carvalho Chehab
0 siblings, 1 reply; 3+ messages in thread
From: CrazyCat @ 2012-07-14 21:40 UTC (permalink / raw)
To: linux-media
Support for yet another SAA7146-based budget card (very similar to TT S2-1600, but use LNBH23 instead ISL6423).
diff --git a/drivers/media/dvb/ttpci/budget.c b/drivers/media/dvb/ttpci/budget.c
index b21bcce..1774c53 100644
--- a/drivers/media/dvb/ttpci/budget.c
+++ b/drivers/media/dvb/ttpci/budget.c
@@ -50,6 +50,8 @@
#include "stv6110x.h"
#include "stv090x.h"
#include "isl6423.h"
+#include "lnbh24.h"
+
static int diseqc_method;
module_param(diseqc_method, int, 0444);
@@ -679,6 +681,63 @@ static void frontend_init(struct budget *budget)
}
}
break;
+
+ case 0x1020: { /* Omicom S2 */
+ struct stv6110x_devctl *ctl;
+ saa7146_setgpio(budget->dev, 2, SAA7146_GPIO_OUTLO);
+ msleep(50);
+ saa7146_setgpio(budget->dev, 2, SAA7146_GPIO_OUTHI);
+ msleep(250);
+
+ budget->dvb_frontend = dvb_attach(stv090x_attach,
+ &tt1600_stv090x_config,
+ &budget->i2c_adap,
+ STV090x_DEMODULATOR_0);
+
+ if (budget->dvb_frontend) {
+ printk(KERN_INFO "budget: Omicom S2 detected\n");
+
+ ctl = dvb_attach(stv6110x_attach,
+ budget->dvb_frontend,
+ &tt1600_stv6110x_config,
+ &budget->i2c_adap);
+
+ if (ctl) {
+ tt1600_stv090x_config.tuner_init = ctl->tuner_init;
+ tt1600_stv090x_config.tuner_sleep = ctl->tuner_sleep;
+ tt1600_stv090x_config.tuner_set_mode = ctl->tuner_set_mode;
+ tt1600_stv090x_config.tuner_set_frequency = ctl->tuner_set_frequency;
+ tt1600_stv090x_config.tuner_get_frequency = ctl->tuner_get_frequency;
+ tt1600_stv090x_config.tuner_set_bandwidth = ctl->tuner_set_bandwidth;
+ tt1600_stv090x_config.tuner_get_bandwidth = ctl->tuner_get_bandwidth;
+ tt1600_stv090x_config.tuner_set_bbgain = ctl->tuner_set_bbgain;
+ tt1600_stv090x_config.tuner_get_bbgain = ctl->tuner_get_bbgain;
+ tt1600_stv090x_config.tuner_set_refclk = ctl->tuner_set_refclk;
+ tt1600_stv090x_config.tuner_get_status = ctl->tuner_get_status;
+
+ /* call the init function once to initialize
+ tuner's clock output divider and demod's
+ master clock */
+ if (budget->dvb_frontend->ops.init)
+ budget->dvb_frontend->ops.init(budget->dvb_frontend);
+
+ if (dvb_attach(lnbh24_attach,
+ budget->dvb_frontend,
+ &budget->i2c_adap,
+ LNBH24_PCL | LNBH24_TTX,
+ LNBH24_TEN, 0x14>>1) == NULL)
+ {
+ printk(KERN_ERR
+ "No LNBH24 found!\n");
+ goto error_out;
+ }
+ } else {
+ printk(KERN_ERR "%s: No STV6110(A) Silicon Tuner found!\n", __func__);
+ goto error_out;
+ }
+ }
+ }
+ break;
}
if (budget->dvb_frontend == NULL) {
@@ -759,6 +818,7 @@ MAKE_BUDGET_INFO(fsacs0, "Fujitsu Siemens Activy Budget-S PCI (rev GR/grundig fr
MAKE_BUDGET_INFO(fsacs1, "Fujitsu Siemens Activy Budget-S PCI (rev AL/alps frontend)", BUDGET_FS_ACTIVY);
MAKE_BUDGET_INFO(fsact, "Fujitsu Siemens Activy Budget-T PCI (rev GR/Grundig frontend)", BUDGET_FS_ACTIVY);
MAKE_BUDGET_INFO(fsact1, "Fujitsu Siemens Activy Budget-T PCI (rev AL/ALPS TDHD1-204A)", BUDGET_FS_ACTIVY);
+MAKE_BUDGET_INFO(omicom, "Omicom S2 PCI", BUDGET_TT);
static struct pci_device_id pci_tbl[] = {
MAKE_EXTENSION_PCI(ttbs, 0x13c2, 0x1003),
@@ -772,6 +832,7 @@ static struct pci_device_id pci_tbl[] = {
MAKE_EXTENSION_PCI(fsacs0,0x1131, 0x4f61),
MAKE_EXTENSION_PCI(fsact1, 0x1131, 0x5f60),
MAKE_EXTENSION_PCI(fsact, 0x1131, 0x5f61),
+ MAKE_EXTENSION_PCI(omicom, 0x14c4, 0x1020),
{
.vendor = 0,
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH]Omicom S2 PCI support
2012-07-14 21:40 [PATCH]Omicom S2 PCI support CrazyCat
@ 2012-08-10 22:29 ` Mauro Carvalho Chehab
2012-08-11 22:48 ` CrazyCat
0 siblings, 1 reply; 3+ messages in thread
From: Mauro Carvalho Chehab @ 2012-08-10 22:29 UTC (permalink / raw)
To: CrazyCat; +Cc: linux-media
Em 14-07-2012 18:40, CrazyCat escreveu:
> Support for yet another SAA7146-based budget card (very similar to TT S2-1600, but use LNBH23 instead ISL6423).
> diff --git a/drivers/media/dvb/ttpci/budget.c b/drivers/media/dvb/ttpci/budget.c
...
WARNING: Prefer pr_err(... to printk(KERN_ERR, ...
#86: FILE: drivers/media/dvb/ttpci/budget.c:735:
+ printk(KERN_ERR "%s: No STV6110(A) Silicon Tuner found!\n", __func__);
ERROR: Missing Signed-off-by: line(s)
total: 2 errors, 21 warnings, 85 lines checked
Again, missing to check it against checkpatch and to add your SOB.
Regards,
Mauro
> index b21bcce..1774c53 100644
> --- a/drivers/media/dvb/ttpci/budget.c
> +++ b/drivers/media/dvb/ttpci/budget.c
> @@ -50,6 +50,8 @@
> #include "stv6110x.h"
> #include "stv090x.h"
> #include "isl6423.h"
> +#include "lnbh24.h"
> +
>
> static int diseqc_method;
> module_param(diseqc_method, int, 0444);
> @@ -679,6 +681,63 @@ static void frontend_init(struct budget *budget)
> }
> }
> break;
> +
> + case 0x1020: { /* Omicom S2 */
> + struct stv6110x_devctl *ctl;
> + saa7146_setgpio(budget->dev, 2, SAA7146_GPIO_OUTLO);
> + msleep(50);
> + saa7146_setgpio(budget->dev, 2, SAA7146_GPIO_OUTHI);
> + msleep(250);
> +
> + budget->dvb_frontend = dvb_attach(stv090x_attach,
> + &tt1600_stv090x_config,
> + &budget->i2c_adap,
> + STV090x_DEMODULATOR_0);
> +
> + if (budget->dvb_frontend) {
> + printk(KERN_INFO "budget: Omicom S2 detected\n");
> +
> + ctl = dvb_attach(stv6110x_attach,
> + budget->dvb_frontend,
> + &tt1600_stv6110x_config,
> + &budget->i2c_adap);
> +
> + if (ctl) {
> + tt1600_stv090x_config.tuner_init = ctl->tuner_init;
> + tt1600_stv090x_config.tuner_sleep = ctl->tuner_sleep;
> + tt1600_stv090x_config.tuner_set_mode = ctl->tuner_set_mode;
> + tt1600_stv090x_config.tuner_set_frequency = ctl->tuner_set_frequency;
> + tt1600_stv090x_config.tuner_get_frequency = ctl->tuner_get_frequency;
> + tt1600_stv090x_config.tuner_set_bandwidth = ctl->tuner_set_bandwidth;
> + tt1600_stv090x_config.tuner_get_bandwidth = ctl->tuner_get_bandwidth;
> + tt1600_stv090x_config.tuner_set_bbgain = ctl->tuner_set_bbgain;
> + tt1600_stv090x_config.tuner_get_bbgain = ctl->tuner_get_bbgain;
> + tt1600_stv090x_config.tuner_set_refclk = ctl->tuner_set_refclk;
> + tt1600_stv090x_config.tuner_get_status = ctl->tuner_get_status;
> +
> + /* call the init function once to initialize
> + tuner's clock output divider and demod's
> + master clock */
> + if (budget->dvb_frontend->ops.init)
> + budget->dvb_frontend->ops.init(budget->dvb_frontend);
> +
> + if (dvb_attach(lnbh24_attach,
> + budget->dvb_frontend,
> + &budget->i2c_adap,
> + LNBH24_PCL | LNBH24_TTX,
> + LNBH24_TEN, 0x14>>1) == NULL)
> + {
> + printk(KERN_ERR
> + "No LNBH24 found!\n");
> + goto error_out;
> + }
> + } else {
> + printk(KERN_ERR "%s: No STV6110(A) Silicon Tuner found!\n", __func__);
> + goto error_out;
> + }
> + }
> + }
> + break;
> }
>
> if (budget->dvb_frontend == NULL) {
> @@ -759,6 +818,7 @@ MAKE_BUDGET_INFO(fsacs0, "Fujitsu Siemens Activy Budget-S PCI (rev GR/grundig fr
> MAKE_BUDGET_INFO(fsacs1, "Fujitsu Siemens Activy Budget-S PCI (rev AL/alps frontend)", BUDGET_FS_ACTIVY);
> MAKE_BUDGET_INFO(fsact, "Fujitsu Siemens Activy Budget-T PCI (rev GR/Grundig frontend)", BUDGET_FS_ACTIVY);
> MAKE_BUDGET_INFO(fsact1, "Fujitsu Siemens Activy Budget-T PCI (rev AL/ALPS TDHD1-204A)", BUDGET_FS_ACTIVY);
> +MAKE_BUDGET_INFO(omicom, "Omicom S2 PCI", BUDGET_TT);
>
> static struct pci_device_id pci_tbl[] = {
> MAKE_EXTENSION_PCI(ttbs, 0x13c2, 0x1003),
> @@ -772,6 +832,7 @@ static struct pci_device_id pci_tbl[] = {
> MAKE_EXTENSION_PCI(fsacs0,0x1131, 0x4f61),
> MAKE_EXTENSION_PCI(fsact1, 0x1131, 0x5f60),
> MAKE_EXTENSION_PCI(fsact, 0x1131, 0x5f61),
> + MAKE_EXTENSION_PCI(omicom, 0x14c4, 0x1020),
> {
> .vendor = 0,
> }
> --
> To unsubscribe from this list: send the line "unsubscribe linux-media" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH]Omicom S2 PCI support
2012-08-10 22:29 ` Mauro Carvalho Chehab
@ 2012-08-11 22:48 ` CrazyCat
0 siblings, 0 replies; 3+ messages in thread
From: CrazyCat @ 2012-08-11 22:48 UTC (permalink / raw)
To: Mauro Carvalho Chehab; +Cc: linux-media
Ok, fixed patch.
Signed-off-by: Evgeny Plehov <EvgenyPlehov@ukr.net>
diff --git a/drivers/media/dvb/ttpci/budget.c b/drivers/media/dvb/ttpci/budget.c
index b21bcce..7e6e43a 100644
--- a/drivers/media/dvb/ttpci/budget.c
+++ b/drivers/media/dvb/ttpci/budget.c
@@ -50,6 +50,8 @@
#include "stv6110x.h"
#include "stv090x.h"
#include "isl6423.h"
+#include "lnbh24.h"
+
static int diseqc_method;
module_param(diseqc_method, int, 0444);
@@ -679,6 +681,62 @@ static void frontend_init(struct budget *budget)
}
}
break;
+
+ case 0x1020: { /* Omicom S2 */
+ struct stv6110x_devctl *ctl;
+ saa7146_setgpio(budget->dev, 2, SAA7146_GPIO_OUTLO);
+ msleep(50);
+ saa7146_setgpio(budget->dev, 2, SAA7146_GPIO_OUTHI);
+ msleep(250);
+
+ budget->dvb_frontend = dvb_attach(stv090x_attach,
+ &tt1600_stv090x_config,
+ &budget->i2c_adap,
+ STV090x_DEMODULATOR_0);
+
+ if (budget->dvb_frontend) {
+ printk(KERN_INFO "budget: Omicom S2 detected\n");
+
+ ctl = dvb_attach(stv6110x_attach,
+ budget->dvb_frontend,
+ &tt1600_stv6110x_config,
+ &budget->i2c_adap);
+
+ if (ctl) {
+ tt1600_stv090x_config.tuner_init = ctl->tuner_init;
+ tt1600_stv090x_config.tuner_sleep = ctl->tuner_sleep;
+ tt1600_stv090x_config.tuner_set_mode = ctl->tuner_set_mode;
+ tt1600_stv090x_config.tuner_set_frequency = ctl->tuner_set_frequency;
+ tt1600_stv090x_config.tuner_get_frequency = ctl->tuner_get_frequency;
+ tt1600_stv090x_config.tuner_set_bandwidth = ctl->tuner_set_bandwidth;
+ tt1600_stv090x_config.tuner_get_bandwidth = ctl->tuner_get_bandwidth;
+ tt1600_stv090x_config.tuner_set_bbgain = ctl->tuner_set_bbgain;
+ tt1600_stv090x_config.tuner_get_bbgain = ctl->tuner_get_bbgain;
+ tt1600_stv090x_config.tuner_set_refclk = ctl->tuner_set_refclk;
+ tt1600_stv090x_config.tuner_get_status = ctl->tuner_get_status;
+
+ /* call the init function once to initialize
+ tuner's clock output divider and demod's
+ master clock */
+ if (budget->dvb_frontend->ops.init)
+ budget->dvb_frontend->ops.init(budget->dvb_frontend);
+
+ if (dvb_attach(lnbh24_attach,
+ budget->dvb_frontend,
+ &budget->i2c_adap,
+ LNBH24_PCL | LNBH24_TTX,
+ LNBH24_TEN, 0x14>>1) == NULL) {
+ printk(KERN_ERR
+ "No LNBH24 found!\n");
+ goto error_out;
+ }
+ } else {
+ printk(KERN_ERR "%s: No STV6110(A) Silicon Tuner found!\n", __func__);
+ goto error_out;
+ }
+ }
+ }
+ break;
}
if (budget->dvb_frontend == NULL) {
@@ -759,6 +817,7 @@ MAKE_BUDGET_INFO(fsacs0, "Fujitsu Siemens Activy Budget-S PCI (rev GR/grundig fr
MAKE_BUDGET_INFO(fsacs1, "Fujitsu Siemens Activy Budget-S PCI (rev AL/alps frontend)", BUDGET_FS_ACTIVY);
MAKE_BUDGET_INFO(fsact, "Fujitsu Siemens Activy Budget-T PCI (rev GR/Grundig frontend)", BUDGET_FS_ACTIVY);
MAKE_BUDGET_INFO(fsact1, "Fujitsu Siemens Activy Budget-T PCI (rev AL/ALPS TDHD1-204A)", BUDGET_FS_ACTIVY);
+MAKE_BUDGET_INFO(omicom, "Omicom S2 PCI", BUDGET_TT);
static struct pci_device_id pci_tbl[] = {
MAKE_EXTENSION_PCI(ttbs, 0x13c2, 0x1003),
@@ -772,6 +831,7 @@ static struct pci_device_id pci_tbl[] = {
MAKE_EXTENSION_PCI(fsacs0,0x1131, 0x4f61),
MAKE_EXTENSION_PCI(fsact1, 0x1131, 0x5f60),
MAKE_EXTENSION_PCI(fsact, 0x1131, 0x5f61),
+ MAKE_EXTENSION_PCI(omicom, 0x14c4, 0x1020),
{
.vendor = 0,
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-08-11 22:48 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-07-14 21:40 [PATCH]Omicom S2 PCI support CrazyCat
2012-08-10 22:29 ` Mauro Carvalho Chehab
2012-08-11 22:48 ` CrazyCat
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).