diff mbox

[GIT,PULL,FOR,2.6.40] PCTV nanoStick T2 290e (Sony CXD2820R DVB-T/T2/C)

Message ID 4DE63E43.1090208@redhat.com (mailing list archive)
State Not Applicable
Headers show

Commit Message

Mauro Carvalho Chehab June 1, 2011, 1:27 p.m. UTC 
Em 25-05-2011 17:42, Antti Palosaari escreveu:
> Moikka Mauro,
> 
> Fixes...
> 
> 
> The following changes since commit 87cf028f3aa1ed51fe29c36df548aa714dc7438f:
> 
>   [media] dm1105: GPIO handling added, I2C on GPIO added, LNB control through GPIO reworked (2011-05-21 11:10:28 -0300)
> 
> are available in the git repository at:
>   git://linuxtv.org/anttip/media_tree.git pctv_290e
> 
> Antti Palosaari (7):
>       em28xx-dvb: add module param "options" and use it for LNA

That patch is ugly, for several reasons:

1) we don't want a generic "options" parameter, whose meaning changes from
   device to devices;
2) what happens if someone has two em28xx devices plugged?
3) the better would be to detect if LNA is needed, or to add a DVBS2API
   call to enable/disable LNA.

>       cxd2820r: malloc buffers instead of stack
>       cxd2820r: fix bitfields
>       em28xx: EM28174 remote support
>       em28xx: add remote for PCTV nanoStick T2 290e
>       em28xx: correct PCTV nanoStick T2 290e device name
>       cxd2820r: correct missing error checks

The others are OK. Applied, thanks!

While here, I've updated the CARDLIST.* stuff, with the two patches
bellow, and running the old -hg scripts that auto-generat the cardlists.

Cheers,
Mauro

-


commit 9b5a38d2e549f3f66ce10ee6b669a401bb5f186b
Author: Mauro Carvalho Chehab <mchehab@redhat.com>
Date:   Wed Jun 1 10:16:25 2011 -0300

    [media] em28xx: use the proper prefix for board names
    
    All boards use EM28xxx_BOARD, to identify that the macro
    refers to a card entry. So:
    
    EM2874_LEADERSHIP_ISDBT -> EM2874_BOARD_LEADERSHIP_ISDBT
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>


--
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

Comments

Antti Palosaari June 3, 2011, 12:34 p.m. UTC | #1 
On 06/01/2011 04:27 PM, Mauro Carvalho Chehab wrote:
> Em 25-05-2011 17:42, Antti Palosaari escreveu:
>> Antti Palosaari (7):
>>        em28xx-dvb: add module param "options" and use it for LNA
>
> That patch is ugly, for several reasons:
>
> 1) we don't want a generic "options" parameter, whose meaning changes from
>     device to devices;

I agree it is not proper solution, but in my mind it is better to offer 
some solution than no solution at all.

> 2) what happens if someone has two em28xx devices plugged?

It depends depends devices, currently only nanoStick T2 only looks that 
param, other just ignore. If there is two nanoStics then both have same 
LNA settings.

That's just like same behaviour as for example remote controller 
polling. Or for example DiBcom driver LNA, since it does have similar 
module param already. Will you you commit it if I rename it similarly as 
DiBcom?

> 3) the better would be to detect if LNA is needed, or to add a DVBS2API
>     call to enable/disable LNA.

True, but it needs some research. There is many hardware which gets 
signal input from demod or tuner and makes some fine tune according to 
that. We need to define some new callbacks for demod and tuner in order 
to do this kind of actions.
Or just add new LNA param to API use it manually.


regards,
Antti
Bjørn Mork June 3, 2011, 1:29 p.m. UTC | #2 
Antti Palosaari <crope@iki.fi> writes:
> On 06/01/2011 04:27 PM, Mauro Carvalho Chehab wrote:
>> Em 25-05-2011 17:42, Antti Palosaari escreveu:
>>> Antti Palosaari (7):
>>>        em28xx-dvb: add module param "options" and use it for LNA
>>
>> That patch is ugly, for several reasons:
>>
>> 1) we don't want a generic "options" parameter, whose meaning changes from
>>     device to devices;
>
> I agree it is not proper solution, but in my mind it is better to
> offer some solution than no solution at all.
>
>> 2) what happens if someone has two em28xx devices plugged?
>
> It depends depends devices, currently only nanoStick T2 only looks
> that param, other just ignore. If there is two nanoStics then both
> have same LNA settings.
>
> That's just like same behaviour as for example remote controller
> polling. Or for example DiBcom driver LNA, since it does have similar
> module param already. Will you you commit it if I rename it similarly
> as DiBcom?
>
>> 3) the better would be to detect if LNA is needed, or to add a DVBS2API
>>     call to enable/disable LNA.
>
> True, but it needs some research. There is many hardware which gets
> signal input from demod or tuner and makes some fine tune according to
> that. We need to define some new callbacks for demod and tuner in
> order to do this kind of actions.
> Or just add new LNA param to API use it manually.


Or option 
4) just enable the LNA unconditionally.  

I did some testing in my environment, and I was unable to tune anything
on either DVB-T or DVB-C without the LNA enabled.  I'm of course aware
that this depends on your signal, but have you actually seen a real life
signal where tuning fails with the LNA enabled and works without it?

I do believe that my DVB-C signal at least is pretty strong.



Bjørn

--
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
Steve Kerrison June 3, 2011, 1:33 p.m. UTC | #3 
Here in the UK the mux strengths and parameters are all over the place.

I have had situations in the past (with dib0700 I think) where I've had
to twiddle the force_lna setting one way or the other depending on how
they've decided to reconfigure my local transmitter.

So I'd be cautious about flat-out enabling it the whole time.
Mauro Carvalho Chehab June 3, 2011, 2:04 p.m. UTC | #4 
Em 03-06-2011 09:34, Antti Palosaari escreveu:
> On 06/01/2011 04:27 PM, Mauro Carvalho Chehab wrote:
>> Em 25-05-2011 17:42, Antti Palosaari escreveu:
>>> Antti Palosaari (7):
>>>        em28xx-dvb: add module param "options" and use it for LNA
>>
>> That patch is ugly, for several reasons:
>>
>> 1) we don't want a generic "options" parameter, whose meaning changes from
>>     device to devices;
> 
> I agree it is not proper solution, but in my mind it is better to offer some solution than no solution at all.
> 
>> 2) what happens if someone has two em28xx devices plugged?
> 
> It depends depends devices, currently only nanoStick T2 only looks that param, other just ignore. If there is two nanoStics then both have same LNA settings.
> 
> That's just like same behaviour as for example remote controller polling. Or for example DiBcom driver LNA, since it does have similar module param already. Will you you commit it if I rename it similarly as DiBcom?
> 
>> 3) the better would be to detect if LNA is needed, or to add a DVBS2API
>>     call to enable/disable LNA.
> 
> True, but it needs some research. There is many hardware which gets signal input from demod or tuner and makes some fine tune according to that. We need to define some new callbacks for demod and tuner in order to do this kind of actions.
> Or just add new LNA param to API use it manually.

I would then just add a LNA option via DVBS2API to allow enabling/disabling it.
(LNA enabled seems to be the better default).

Modprobe parameters for things like that sucks.

Cheers,
Mauro
--
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
diff mbox

Patch

diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index f15c734..7635a45 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -1259,7 +1259,7 @@  struct em28xx_board em28xx_boards[] = {
 		} },
 	},
 
-	[EM2874_LEADERSHIP_ISDBT] = {
+	[EM2874_BOARD_LEADERSHIP_ISDBT] = {
 		.i2c_speed      = EM2874_I2C_SECONDARY_BUS_SELECT |
 				  EM28XX_I2C_CLK_WAIT_ENABLE |
 				  EM28XX_I2C_FREQ_100_KHZ,
@@ -1937,7 +1937,7 @@  static struct em28xx_hash_table em28xx_i2c_hash[] = {
 	{0x77800080, EM2860_BOARD_TVP5150_REFERENCE_DESIGN, TUNER_ABSENT},
 	{0xc51200e3, EM2820_BOARD_GADMEI_TVR200, TUNER_LG_PAL_NEW_TAPC},
 	{0x4ba50080, EM2861_BOARD_GADMEI_UTV330PLUS, TUNER_TNF_5335MF},
-	{0x6b800080, EM2874_LEADERSHIP_ISDBT, TUNER_ABSENT},
+	{0x6b800080, EM2874_BOARD_LEADERSHIP_ISDBT, TUNER_ABSENT},
 };
 
 /* I2C possible address to saa7115, tvp5150, msp3400, tvaudio */
diff --git a/drivers/media/video/em28xx/em28xx-dvb.c b/drivers/media/video/em28xx/em28xx-dvb.c
index 7904ca4..012ab8e 100644
--- a/drivers/media/video/em28xx/em28xx-dvb.c
+++ b/drivers/media/video/em28xx/em28xx-dvb.c
@@ -546,7 +546,7 @@  static int dvb_init(struct em28xx *dev)
 	em28xx_set_mode(dev, EM28XX_DIGITAL_MODE);
 	/* init frontend */
 	switch (dev->model) {
-	case EM2874_LEADERSHIP_ISDBT:
+	case EM2874_BOARD_LEADERSHIP_ISDBT:
 		dvb->fe[0] = dvb_attach(s921_attach,
 				&sharp_isdbt, &dev->i2c_adap);
 
diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h
index 3cca331..28b9954 100644
--- a/drivers/media/video/em28xx/em28xx.h
+++ b/drivers/media/video/em28xx/em28xx.h
@@ -117,7 +117,7 @@ 
 #define EM2800_BOARD_VC211A			  74
 #define EM2882_BOARD_DIKOM_DK300		  75
 #define EM2870_BOARD_KWORLD_A340		  76
-#define EM2874_LEADERSHIP_ISDBT			  77
+#define EM2874_BOARD_LEADERSHIP_ISDBT			  77
 #define EM28174_BOARD_PCTV_290E                   78


commit 8d01aee82b8d2b30507a181609ba190bf192fcb0
Author: Mauro Carvalho Chehab <mchehab@redhat.com>
Date:   Wed Jun 1 10:23:53 2011 -0300

    [media] Update several cardlists
    
    Several cardlist entries are missed. Fix them by running some
    script magic (about the same scripts we used to have at -hg tree).
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/Documentation/video4linux/CARDLIST.cx23885 b/Documentation/video4linux/CARDLIST.cx23885
index 87c4634..8910449 100644
--- a/Documentation/video4linux/CARDLIST.cx23885
+++ b/Documentation/video4linux/CARDLIST.cx23885
@@ -27,3 +27,5 @@ 
  26 -> Hauppauge WinTV-HVR1290                             [0070:8551]
  27 -> Mygica X8558 PRO DMB-TH                             [14f1:8578]
  28 -> LEADTEK WinFast PxTV1200                            [107d:6f22]
+ 29 -> GoTView X5 3D Hybrid                                [5654:2390]
+ 30 -> NetUP Dual DVB-T/C-CI RF                            [1b55:e2e4]
diff --git a/Documentation/video4linux/CARDLIST.cx88 b/Documentation/video4linux/CARDLIST.cx88
index 42517d9..d9c0f11 100644
--- a/Documentation/video4linux/CARDLIST.cx88
+++ b/Documentation/video4linux/CARDLIST.cx88
@@ -84,3 +84,4 @@ 
  83 -> Prof 7301 DVB-S/S2                                  [b034:3034]
  84 -> Samsung SMT 7020 DVB-S                              [18ac:dc00,18ac:dccd]
  85 -> Twinhan VP-1027 DVB-S                               [1822:0023]
+ 86 -> TeVii S464 DVB-S/S2                                 [d464:9022]
diff --git a/Documentation/video4linux/CARDLIST.em28xx b/Documentation/video4linux/CARDLIST.em28xx
index 9aae449..4a7b3df 100644
--- a/Documentation/video4linux/CARDLIST.em28xx
+++ b/Documentation/video4linux/CARDLIST.em28xx
@@ -74,3 +74,5 @@ 
  74 -> Actionmaster/LinXcel/Digitus VC211A      (em2800)
  75 -> Dikom DK300                              (em2882)
  76 -> KWorld PlusTV 340U or UB435-Q (ATSC)     (em2870)        [1b80:a340]
+ 77 -> EM2874 Leadership ISDBT                  (em2874)
+ 78 -> PCTV nanoStick T2 290e                   (em28174)
diff --git a/Documentation/video4linux/CARDLIST.saa7134 b/Documentation/video4linux/CARDLIST.saa7134
index 6b4c72d..7efae9b 100644
--- a/Documentation/video4linux/CARDLIST.saa7134
+++ b/Documentation/video4linux/CARDLIST.saa7134
@@ -182,3 +182,7 @@ 
 181 -> TechoTrend TT-budget T-3000              [13c2:2804]
 182 -> Kworld PCI SBTVD/ISDB-T Full-Seg Hybrid  [17de:b136]
 183 -> Compro VideoMate Vista M1F               [185b:c900]
+184 -> Encore ENLTV-FM 3                        [1a7f:2108]
+185 -> MagicPro ProHDTV Pro2 DMB-TH/Hybrid      [17de:d136]
+186 -> Beholder BeholdTV 501                    [5ace:5010]
+187 -> Beholder BeholdTV 503 FM                 [5ace:5030]
diff --git a/Documentation/video4linux/CARDLIST.tuner b/Documentation/video4linux/CARDLIST.tuner
index e67c1db..562d7fa 100644
--- a/Documentation/video4linux/CARDLIST.tuner
+++ b/Documentation/video4linux/CARDLIST.tuner
@@ -83,3 +83,4 @@  tuner=82 - Philips CU1216L
 tuner=83 - NXP TDA18271
 tuner=84 - Sony BTF-Pxn01Z
 tuner=85 - Philips FQ1236 MK5
+tuner=86 - Tena TNF5337 MFD
diff --git a/Documentation/video4linux/CARDLIST.usbvision b/Documentation/video4linux/CARDLIST.usbvision
index 0b72d3f..6fd1af3 100644
--- a/Documentation/video4linux/CARDLIST.usbvision
+++ b/Documentation/video4linux/CARDLIST.usbvision
@@ -63,3 +63,5 @@ 
  62 -> Pinnacle PCTV Bungee USB (PAL) FM                        [2304:0419]
  63 -> Hauppauge WinTv-USB                                      [2400:4200]
  64 -> Pinnacle Studio PCTV USB (NTSC) FM V3                    [2304:0113]
+ 65 -> Nogatech USB MicroCam NTSC (NV3000N)                     [0573:3000]
+ 66 -> Nogatech USB MicroCam PAL (NV3001P)                      [0573:3001]