diff mbox

[media] si2157: Improve support Si2158-A20 tuner

Message ID 1470297242-32129-1-git-send-email-oleg@kaa.org.ua (mailing list archive)
State Deferred
Headers show

Commit Message

Oleh Kravchenko Aug. 4, 2016, 7:54 a.m. UTC 
Signed-off-by: Oleh Kravchenko <oleg@kaa.org.ua>
---
 drivers/media/tuners/si2157.c      | 34 +++++++++++++++++++++++++++-------
 drivers/media/tuners/si2157_priv.h |  1 +
 2 files changed, 28 insertions(+), 7 deletions(-)

Comments

Oleh Kravchenko Aug. 4, 2016, 10:26 a.m. UTC | #1 
Hi Olli,

Looks like I miss something, what parameter do you mean?

On 04.08.16 13:08, Olli Salonen wrote:
> Hi Oleh,
>
> Do you have any idea of what this parameter change does? I have a gut
> feeling that this is an option that's not Si2158-specific, but a
> parameter that's valid for the other tuners as well.
>
> Do you know what this parameter will actually do? If so, it would be
> better to add this as a configuration option for the Si2157. Your
> patch will now change the behaviour even for devices that you probably
> have not tested.
>
> Cheers,
> -olli
>
> On 4 August 2016 at 10:54, Oleh Kravchenko <oleg@kaa.org.ua
> <mailto:oleg@kaa.org.ua>> wrote:
>
>     Signed-off-by: Oleh Kravchenko <oleg@kaa.org.ua
>     <mailto:oleg@kaa.org.ua>>
>     ---
>      drivers/media/tuners/si2157.c      | 34
>     +++++++++++++++++++++++++++-------
>      drivers/media/tuners/si2157_priv.h |  1 +
>      2 files changed, 28 insertions(+), 7 deletions(-)
>
>     diff --git a/drivers/media/tuners/si2157.c
>     b/drivers/media/tuners/si2157.c
>     index 57b2508..d7035a5 100644
>     --- a/drivers/media/tuners/si2157.c
>     +++ b/drivers/media/tuners/si2157.c
>     @@ -103,12 +103,21 @@ static int si2157_init(struct dvb_frontend *fe)
>                     goto warm;
>
>             /* power up */
>     -       if (dev->chiptype == SI2157_CHIPTYPE_SI2146) {
>     -               memcpy(cmd.args,
>     "\xc0\x05\x01\x00\x00\x0b\x00\x00\x01", 9);
>     -               cmd.wlen = 9;
>     -       } else {
>     -               memcpy(cmd.args,
>     "\xc0\x00\x0c\x00\x00\x01\x01\x01\x01\x01\x01\x02\x00\x00\x01", 15);
>     -               cmd.wlen = 15;
>     +       switch (dev->chiptype) {
>     +               case SI2157_CHIPTYPE_SI2146:
>     +                       memcpy(cmd.args,
>     "\xc0\x05\x01\x00\x00\x0b\x00\x00\x01", 9);
>     +                       cmd.wlen = 9;
>     +                       break;
>     +
>     +               case SI2157_CHIPTYPE_SI2158:
>     +                       memcpy(cmd.args,
>     "\xC0\x00\x00\x00\x00\x01\x01\x01\x01\x01\x01\x02\x00\x00\x01", 15);
>     +                       cmd.wlen = 15;
>     +                       break;
>     +
>     +               default:
>     +                       memcpy(cmd.args,
>     "\xc0\x00\x0c\x00\x00\x01\x01\x01\x01\x01\x01\x02\x00\x00\x01", 15);
>     +                       cmd.wlen = 15;
>     +                       break;
>             }
>             cmd.rlen = 1;
>             ret = si2157_cmd_execute(client, &cmd);
>     @@ -204,6 +213,16 @@ skip_fw_download:
>             if (ret)
>                     goto err;
>
>     +       /* start tuner? */
>     +       if (SI2157_CHIPTYPE_SI2158 == dev->chiptype) {
>     +               memcpy(cmd.args, "\xC0\x00\x0C", 3);
>     +               cmd.wlen = 3;
>     +               cmd.rlen = 1;
>     +               ret = si2157_cmd_execute(client, &cmd);
>     +               if (ret)
>     +                       goto err;
>     +       }
>     +
>             /* query firmware version */
>             memcpy(cmd.args, "\x11", 1);
>             cmd.wlen = 1;
>     @@ -506,8 +525,9 @@ static int si2157_remove(struct i2c_client
>     *client)
>      }
>
>      static const struct i2c_device_id si2157_id_table[] = {
>     -       {"si2157", SI2157_CHIPTYPE_SI2157},
>             {"si2146", SI2157_CHIPTYPE_SI2146},
>     +       {"si2157", SI2157_CHIPTYPE_SI2157},
>     +       {"si2158", SI2157_CHIPTYPE_SI2158},
>             {}
>      };
>      MODULE_DEVICE_TABLE(i2c, si2157_id_table);
>     diff --git a/drivers/media/tuners/si2157_priv.h
>     b/drivers/media/tuners/si2157_priv.h
>     index d6b2c7b..677fa00 100644
>     --- a/drivers/media/tuners/si2157_priv.h
>     +++ b/drivers/media/tuners/si2157_priv.h
>     @@ -42,6 +42,7 @@ struct si2157_dev {
>
>      #define SI2157_CHIPTYPE_SI2157 0
>      #define SI2157_CHIPTYPE_SI2146 1
>     +#define SI2157_CHIPTYPE_SI2158 2
>
>      /* firmware command struct */
>      #define SI2157_ARGLEN      30
>     --
>     2.7.3
>
>     --
>     To unsubscribe from this list: send the line "unsubscribe
>     linux-media" in
>     the body of a message to majordomo@vger.kernel.org
>     <mailto:majordomo@vger.kernel.org>
>     More majordomo info at  http://vger.kernel.org/majordomo-info.html
>
>
Oleh Kravchenko Aug. 4, 2016, 12:03 p.m. UTC | #2 
I got this from tracing I2C bus of tuner.

Windows driver send this to tuner before set frequency, bandwidth, etc.:
wC0 | 15 | C0 00 00 00 00 01 01 01 01 01 01 02 00 00
01                                 | ...............
; I cut firmware from here, by the way Windows driver use firmware v2.1.8
wC0 | 2  | 01
01                                                                        |
..
; I don't known what is it, but with(out) it on Linux my tuner work fine!
; I think this is calibration data(?)
wC0 | 6  | 14 00 10 06 E8
03                                                            | ......
wC0 | 6  | 14 00 11 06 00
00                                                            | ......
wC0 | 6  | 14 00 23 06 9E
80                                                            | ..#...
wC0 | 6  | 14 00 24 06 00
00                                                            | ..$...
wC0 | 6  | 14 00 03 06 08
00                                                            | ......
wC0 | 6  | 14 00 07 06 32
C8                                                            | ....2.
wC0 | 6  | 14 00 01 06 01
00                                                            | ......
wC0 | 6  | 14 00 13 06 00
03                                                            | ......
wC0 | 6  | 14 00 0C 06 88
13                                                            | ......
wC0 | 6  | 14 00 0D 06 94
64                                                            | .....d
wC0 | 6  | 14 00 17 06 00
00                                                            | ......
wC0 | 6  | 14 00 12 06 00
00                                                            | ......
wC0 | 6  | 14 00 05 06 BA
00                                                            | ......
wC0 | 6  | 14 00 04 06 00
02                                                            | ......
wC0 | 6  | 14 00 16 06 00
00                                                            | ......
wC0 | 6  | 14 00 02 04 08
00                                                            | ......
wC0 | 6  | 14 00 01 04 00
00                                                            | ......
wC0 | 6  | 14 00 11 07 00
00                                                            | ......
wC0 | 6  | 14 00 08 07 00
00                                                            | ......
wC0 | 6  | 14 00 02 07 01
00                                                            | ......
wC0 | 6  | 14 00 05 07 32
C8                                                            | ....2.
wC0 | 6  | 14 00 0C 07 01
00                                                            | ......
wC0 | 6  | 14 00 01 07 01
00                                                            | ......
wC0 | 6  | 14 00 0D 07 00
00                                                            | ......
wC0 | 6  | 14 00 0E 07 00
00                                                            | ......
wC0 | 6  | 14 00 10 07 00
00                                                            | ......
wC0 | 6  | 14 00 0A 07 00
01                                                            | ......
wC0 | 6  | 14 00 06 07 88
13                                                            | ......
wC0 | 6  | 14 00 07 07 94
1B                                                            | ......
wC0 | 6  | 14 00 03 07 28
00                                                            | ....(.
wC0 | 6  | 14 00 13 07 FF
FF                                                            | ......
wC0 | 6  | 14 00 0F 07 00
00                                                            | ......
wC0 | 6  | 14 00 09 07 00
00                                                            | ......
wC0 | 6  | 14 00 04 07 B0
00                                                            |
......                                                                                                                    

wC0 | 6  | 14 00 12 07 10
00                                                            |
......                                                                                                                    

wC0 | 6  | 14 00 04 05 00
80                                                            |
......                                                                                                                    

wC0 | 6  | 14 00 01 05 01
00                                                            |
......                                                                                                                    

wC0 | 6  | 14 00 05 05 00
07                                                            |
......                                                                                                                    

wC0 | 6  | 14 00 06 05 01
00                                                            |
......                                                                                                                    

wC0 | 6  | 14 00 07 05 7F
00                                                            |
......                                                                                                                    

; without C0 00 0C tuner is not work
wC0 | 3  | C0 00
0C                                                                     |
...                                                                                                                       
                                                                                                                  


On 04.08.16 14:11, Olli Salonen wrote:
> Hi Oleh,
>
> It would seem to me that when you start the clocks here:
>
> >     "\xC0\x00\x00\x00\x00\x01\x01\x01\x01\x01\x01\x02\x00\x00\x01", 15);
>
> You've removed 0c from third octet compared to the default behaviour.
> However, then later in the sequence you run:
>
> >     +       /* start tuner? */
> >     +       if (SI2157_CHIPTYPE_SI2158 == dev->chiptype) {
> >     +               memcpy(cmd.args, "\xC0\x00\x0C", 3);
>
> Ie. there you do change the parameter in the third octet to 0c. I'm
> wondering what's the reason and significance of that. Was there a
> problem that you solved with this approach? Why is this way better
> than the previous way? I'm trying to understand that.
>
> Cheers,
> -olli
>
>
>
> On 4 August 2016 at 13:26, Oleh Kravchenko <oleg@kaa.org.ua
> <mailto:oleg@kaa.org.ua>> wrote:
>
>     Hi Olli,
>
>     Looks like I miss something, what parameter do you mean?
>
>     On 04.08.16 13:08, Olli Salonen wrote:
>     > Hi Oleh,
>     >
>     > Do you have any idea of what this parameter change does? I have
>     a gut
>     > feeling that this is an option that's not Si2158-specific, but a
>     > parameter that's valid for the other tuners as well.
>     >
>     > Do you know what this parameter will actually do? If so, it would be
>     > better to add this as a configuration option for the Si2157. Your
>     > patch will now change the behaviour even for devices that you
>     probably
>     > have not tested.
>     >
>     > Cheers,
>     > -olli
>     >
>     > On 4 August 2016 at 10:54, Oleh Kravchenko <oleg@kaa.org.ua
>     <mailto:oleg@kaa.org.ua>
>     > <mailto:oleg@kaa.org.ua <mailto:oleg@kaa.org.ua>>> wrote:
>     >
>     >     Signed-off-by: Oleh Kravchenko <oleg@kaa.org.ua
>     <mailto:oleg@kaa.org.ua>
>     >     <mailto:oleg@kaa.org.ua <mailto:oleg@kaa.org.ua>>>
>     >     ---
>     >      drivers/media/tuners/si2157.c      | 34
>     >     +++++++++++++++++++++++++++-------
>     >      drivers/media/tuners/si2157_priv.h |  1 +
>     >      2 files changed, 28 insertions(+), 7 deletions(-)
>     >
>     >     diff --git a/drivers/media/tuners/si2157.c
>     >     b/drivers/media/tuners/si2157.c
>     >     index 57b2508..d7035a5 100644
>     >     --- a/drivers/media/tuners/si2157.c
>     >     +++ b/drivers/media/tuners/si2157.c
>     >     @@ -103,12 +103,21 @@ static int si2157_init(struct
>     dvb_frontend *fe)
>     >                     goto warm;
>     >
>     >             /* power up */
>     >     -       if (dev->chiptype == SI2157_CHIPTYPE_SI2146) {
>     >     -               memcpy(cmd.args,
>     >     "\xc0\x05\x01\x00\x00\x0b\x00\x00\x01", 9);
>     >     -               cmd.wlen = 9;
>     >     -       } else {
>     >     -               memcpy(cmd.args,
>     >   
>      "\xc0\x00\x0c\x00\x00\x01\x01\x01\x01\x01\x01\x02\x00\x00\x01", 15);
>     >     -               cmd.wlen = 15;
>     >     +       switch (dev->chiptype) {
>     >     +               case SI2157_CHIPTYPE_SI2146:
>     >     +                       memcpy(cmd.args,
>     >     "\xc0\x05\x01\x00\x00\x0b\x00\x00\x01", 9);
>     >     +                       cmd.wlen = 9;
>     >     +                       break;
>     >     +
>     >     +               case SI2157_CHIPTYPE_SI2158:
>     >     +                       memcpy(cmd.args,
>     >   
>      "\xC0\x00\x00\x00\x00\x01\x01\x01\x01\x01\x01\x02\x00\x00\x01", 15);
>     >     +                       cmd.wlen = 15;
>     >     +                       break;
>     >     +
>     >     +               default:
>     >     +                       memcpy(cmd.args,
>     >   
>      "\xc0\x00\x0c\x00\x00\x01\x01\x01\x01\x01\x01\x02\x00\x00\x01", 15);
>     >     +                       cmd.wlen = 15;
>     >     +                       break;
>     >             }
>     >             cmd.rlen = 1;
>     >             ret = si2157_cmd_execute(client, &cmd);
>     >     @@ -204,6 +213,16 @@ skip_fw_download:
>     >             if (ret)
>     >                     goto err;
>     >
>     >     +       /* start tuner? */
>     >     +       if (SI2157_CHIPTYPE_SI2158 == dev->chiptype) {
>     >     +               memcpy(cmd.args, "\xC0\x00\x0C", 3);
>     >     +               cmd.wlen = 3;
>     >     +               cmd.rlen = 1;
>     >     +               ret = si2157_cmd_execute(client, &cmd);
>     >     +               if (ret)
>     >     +                       goto err;
>     >     +       }
>     >     +
>     >             /* query firmware version */
>     >             memcpy(cmd.args, "\x11", 1);
>     >             cmd.wlen = 1;
>     >     @@ -506,8 +525,9 @@ static int si2157_remove(struct i2c_client
>     >     *client)
>     >      }
>     >
>     >      static const struct i2c_device_id si2157_id_table[] = {
>     >     -       {"si2157", SI2157_CHIPTYPE_SI2157},
>     >             {"si2146", SI2157_CHIPTYPE_SI2146},
>     >     +       {"si2157", SI2157_CHIPTYPE_SI2157},
>     >     +       {"si2158", SI2157_CHIPTYPE_SI2158},
>     >             {}
>     >      };
>     >      MODULE_DEVICE_TABLE(i2c, si2157_id_table);
>     >     diff --git a/drivers/media/tuners/si2157_priv.h
>     >     b/drivers/media/tuners/si2157_priv.h
>     >     index d6b2c7b..677fa00 100644
>     >     --- a/drivers/media/tuners/si2157_priv.h
>     >     +++ b/drivers/media/tuners/si2157_priv.h
>     >     @@ -42,6 +42,7 @@ struct si2157_dev {
>     >
>     >      #define SI2157_CHIPTYPE_SI2157 0
>     >      #define SI2157_CHIPTYPE_SI2146 1
>     >     +#define SI2157_CHIPTYPE_SI2158 2
>     >
>     >      /* firmware command struct */
>     >      #define SI2157_ARGLEN      30
>     >     --
>     >     2.7.3
>     >
>     >     --
>     >     To unsubscribe from this list: send the line "unsubscribe
>     >     linux-media" in
>     >     the body of a message to majordomo@vger.kernel.org
>     <mailto:majordomo@vger.kernel.org>
>     >     <mailto:majordomo@vger.kernel.org
>     <mailto:majordomo@vger.kernel.org>>
>     >     More majordomo info at 
>     http://vger.kernel.org/majordomo-info.html
>     >
>     >
>
>     --
>     Best regards,
>     Oleh Kravchenko
>
>     Senior Software Developer, CMS | skype: oleg_krava | Email:
>     oleg@kaa.org.ua <mailto:oleg@kaa.org.ua>
>
>
>
Oleh Kravchenko Aug. 4, 2016, 2:11 p.m. UTC | #3 
By the way, may be "C0 00 0C" enable RF receiver?

On 04.08.16 15:03, Oleh Kravchenko wrote:
> I got this from tracing I2C bus of tuner.
>
> Windows driver send this to tuner before set frequency, bandwidth, etc.:
> wC0 | 15 | C0 00 00 00 00 01 01 01 01 01 01 02 00 00 01 | ...............
>
> ; I cut firmware from here, by the way Windows driver use firmware v2.1.8
> wC0 | 2  | 01 01             | ..
>
> ; I don't known what is it, but with(out) it on Linux my tuner work fine!
> ; I think this is calibration data(?)
> wC0 | 6  | 14 00 10 06 E8 03 | ......
> wC0 | 6  | 14 00 11 06 00 00 | ......
> wC0 | 6  | 14 00 23 06 9E 80 | ..#...
> wC0 | 6  | 14 00 24 06 00 00 | ..$...
> wC0 | 6  | 14 00 03 06 08 00 | ......
> wC0 | 6  | 14 00 07 06 32 C8 | ....2.
> wC0 | 6  | 14 00 01 06 01 00 | ......
> wC0 | 6  | 14 00 13 06 00 03 | ......
> wC0 | 6  | 14 00 0C 06 88 13 | ......
> wC0 | 6  | 14 00 0D 06 94 64 | .....d
> wC0 | 6  | 14 00 17 06 00 00 | ......
> wC0 | 6  | 14 00 12 06 00 00 | ......
> wC0 | 6  | 14 00 05 06 BA 00 | ......
> wC0 | 6  | 14 00 04 06 00 02 | ......
> wC0 | 6  | 14 00 16 06 00 00 | ......
> wC0 | 6  | 14 00 02 04 08 00 | ......
> wC0 | 6  | 14 00 01 04 00 00 | ......
> wC0 | 6  | 14 00 11 07 00 00 | ......
> wC0 | 6  | 14 00 08 07 00 00 | ......
> wC0 | 6  | 14 00 02 07 01 00 | ......
> wC0 | 6  | 14 00 05 07 32 C8 | ....2.
> wC0 | 6  | 14 00 0C 07 01 00 | ......
> wC0 | 6  | 14 00 01 07 01 00 | ......
> wC0 | 6  | 14 00 0D 07 00 00 | ......
> wC0 | 6  | 14 00 0E 07 00 00 | ......
> wC0 | 6  | 14 00 10 07 00 00 | ......
> wC0 | 6  | 14 00 0A 07 00 01 | ......
> wC0 | 6  | 14 00 06 07 88 13 | ......
> wC0 | 6  | 14 00 07 07 94 1B | ......
> wC0 | 6  | 14 00 03 07 28 00 | ....(.
> wC0 | 6  | 14 00 13 07 FF FF | ......
> wC0 | 6  | 14 00 0F 07 00 00 | ......
> wC0 | 6  | 14 00 09 07 00 00 | ......
> wC0 | 6  | 14 00 04 07 B0 00 | ......
> wC0 | 6  | 14 00 12 07 10 00 | ......
> wC0 | 6  | 14 00 04 05 00 80 | ......            
> wC0 | 6  | 14 00 01 05 01 00 | ......            
> wC0 | 6  | 14 00 05 05 00 07 | ......            
> wC0 | 6  | 14 00 06 05 01 00 | ......            
> wC0 | 6  | 14 00 07 05 7F 00 | ......
>
> ; without C0 00 0C tuner is not work
> wC0 | 3  | C0 00 0C          | ...
>
>
>
> On 04.08.16 14:11, Olli Salonen wrote:
>> Hi Oleh,
>>
>> It would seem to me that when you start the clocks here:
>>
>>>     "\xC0\x00\x00\x00\x00\x01\x01\x01\x01\x01\x01\x02\x00\x00\x01", 15);
>> You've removed 0c from third octet compared to the default behaviour.
>> However, then later in the sequence you run:
>>
>>>     +       /* start tuner? */
>>>     +       if (SI2157_CHIPTYPE_SI2158 == dev->chiptype) {
>>>     +               memcpy(cmd.args, "\xC0\x00\x0C", 3);
>> Ie. there you do change the parameter in the third octet to 0c. I'm
>> wondering what's the reason and significance of that. Was there a
>> problem that you solved with this approach? Why is this way better
>> than the previous way? I'm trying to understand that.
>>
>> Cheers,
>> -olli
>>
>>
>>
>> On 4 August 2016 at 13:26, Oleh Kravchenko <oleg@kaa.org.ua
>> <mailto:oleg@kaa.org.ua>> wrote:
>>
>>     Hi Olli,
>>
>>     Looks like I miss something, what parameter do you mean?
>>
>>     On 04.08.16 13:08, Olli Salonen wrote:
>>     > Hi Oleh,
>>     >
>>     > Do you have any idea of what this parameter change does? I have
>>     a gut
>>     > feeling that this is an option that's not Si2158-specific, but a
>>     > parameter that's valid for the other tuners as well.
>>     >
>>     > Do you know what this parameter will actually do? If so, it would be
>>     > better to add this as a configuration option for the Si2157. Your
>>     > patch will now change the behaviour even for devices that you
>>     probably
>>     > have not tested.
>>     >
>>     > Cheers,
>>     > -olli
>>     >
>>     > On 4 August 2016 at 10:54, Oleh Kravchenko <oleg@kaa.org.ua
>>     <mailto:oleg@kaa.org.ua>
>>     > <mailto:oleg@kaa.org.ua <mailto:oleg@kaa.org.ua>>> wrote:
>>     >
>>     >     Signed-off-by: Oleh Kravchenko <oleg@kaa.org.ua
>>     <mailto:oleg@kaa.org.ua>
>>     >     <mailto:oleg@kaa.org.ua <mailto:oleg@kaa.org.ua>>>
>>     >     ---
>>     >      drivers/media/tuners/si2157.c      | 34
>>     >     +++++++++++++++++++++++++++-------
>>     >      drivers/media/tuners/si2157_priv.h |  1 +
>>     >      2 files changed, 28 insertions(+), 7 deletions(-)
>>     >
>>     >     diff --git a/drivers/media/tuners/si2157.c
>>     >     b/drivers/media/tuners/si2157.c
>>     >     index 57b2508..d7035a5 100644
>>     >     --- a/drivers/media/tuners/si2157.c
>>     >     +++ b/drivers/media/tuners/si2157.c
>>     >     @@ -103,12 +103,21 @@ static int si2157_init(struct
>>     dvb_frontend *fe)
>>     >      goto warm;
>>     >
>>     >             /* power up */
>>     >     -       if (dev->chiptype == SI2157_CHIPTYPE_SI2146) {
>>     >     -               memcpy(cmd.args,
>>     >     "\xc0\x05\x01\x00\x00\x0b\x00\x00\x01", 9);
>>     >     -               cmd.wlen = 9;
>>     >     -       } else {
>>     >     -               memcpy(cmd.args,
>>     >   
>>      "\xc0\x00\x0c\x00\x00\x01\x01\x01\x01\x01\x01\x02\x00\x00\x01", 15);
>>     >     -               cmd.wlen = 15;
>>     >     +       switch (dev->chiptype) {
>>     >     +               case SI2157_CHIPTYPE_SI2146:
>>     >     +        memcpy(cmd.args,
>>     >     "\xc0\x05\x01\x00\x00\x0b\x00\x00\x01", 9);
>>     >     +        cmd.wlen = 9;
>>     >     +        break;
>>     >     +
>>     >     +               case SI2157_CHIPTYPE_SI2158:
>>     >     +        memcpy(cmd.args,
>>     >   
>>      "\xC0\x00\x00\x00\x00\x01\x01\x01\x01\x01\x01\x02\x00\x00\x01", 15);
>>     >     +        cmd.wlen = 15;
>>     >     +        break;
>>     >     +
>>     >     +               default:
>>     >     +        memcpy(cmd.args,
>>     >   
>>      "\xc0\x00\x0c\x00\x00\x01\x01\x01\x01\x01\x01\x02\x00\x00\x01", 15);
>>     >     +        cmd.wlen = 15;
>>     >     +        break;
>>     >             }
>>     >             cmd.rlen = 1;
>>     >             ret = si2157_cmd_execute(client, &cmd);
>>     >     @@ -204,6 +213,16 @@ skip_fw_download:
>>     >             if (ret)
>>     >      goto err;
>>     >
>>     >     +       /* start tuner? */
>>     >     +       if (SI2157_CHIPTYPE_SI2158 == dev->chiptype) {
>>     >     +               memcpy(cmd.args, "\xC0\x00\x0C", 3);
>>     >     +               cmd.wlen = 3;
>>     >     +               cmd.rlen = 1;
>>     >     +               ret = si2157_cmd_execute(client, &cmd);
>>     >     +               if (ret)
>>     >     +        goto err;
>>     >     +       }
>>     >     +
>>     >             /* query firmware version */
>>     >             memcpy(cmd.args, "\x11", 1);
>>     >             cmd.wlen = 1;
>>     >     @@ -506,8 +525,9 @@ static int si2157_remove(struct i2c_client
>>     >     *client)
>>     >      }
>>     >
>>     >      static const struct i2c_device_id si2157_id_table[] = {
>>     >     -       {"si2157", SI2157_CHIPTYPE_SI2157},
>>     >             {"si2146", SI2157_CHIPTYPE_SI2146},
>>     >     +       {"si2157", SI2157_CHIPTYPE_SI2157},
>>     >     +       {"si2158", SI2157_CHIPTYPE_SI2158},
>>     >             {}
>>     >      };
>>     >      MODULE_DEVICE_TABLE(i2c, si2157_id_table);
>>     >     diff --git a/drivers/media/tuners/si2157_priv.h
>>     >     b/drivers/media/tuners/si2157_priv.h
>>     >     index d6b2c7b..677fa00 100644
>>     >     --- a/drivers/media/tuners/si2157_priv.h
>>     >     +++ b/drivers/media/tuners/si2157_priv.h
>>     >     @@ -42,6 +42,7 @@ struct si2157_dev {
>>     >
>>     >      #define SI2157_CHIPTYPE_SI2157 0
>>     >      #define SI2157_CHIPTYPE_SI2146 1
>>     >     +#define SI2157_CHIPTYPE_SI2158 2
>>     >
>>     >      /* firmware command struct */
>>     >      #define SI2157_ARGLEN      30
>>     >     --
>>     >     2.7.3
>>     >
>>     >     --
>>     >     To unsubscribe from this list: send the line "unsubscribe
>>     >     linux-media" in
>>     >     the body of a message to majordomo@vger.kernel.org
>>     <mailto:majordomo@vger.kernel.org>
>>     >     <mailto:majordomo@vger.kernel.org
>>     <mailto:majordomo@vger.kernel.org>>
>>     >     More majordomo info at 
>>     http://vger.kernel.org/majordomo-info.html
>>     >
>>     >
>>
>>     --
>>     Best regards,
>>     Oleh Kravchenko
>>
>>     Senior Software Developer, CMS | skype: oleg_krava | Email:
>>     oleg@kaa.org.ua <mailto:oleg@kaa.org.ua>
>>
>>
>>
Mauro Carvalho Chehab Oct. 24, 2016, 3:54 p.m. UTC | #4 
Em Thu,  4 Aug 2016 10:54:02 +0300
Oleh Kravchenko <oleg@kaa.org.ua> escreveu:

> Signed-off-by: Oleh Kravchenko <oleg@kaa.org.ua>

What's the status of this patch? Is it still valid? If so, please re-send
with a proper description. e. g. what is it improving? why? how?

Regards,
Mauro

> ---
>  drivers/media/tuners/si2157.c      | 34 +++++++++++++++++++++++++++-------
>  drivers/media/tuners/si2157_priv.h |  1 +
>  2 files changed, 28 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/media/tuners/si2157.c b/drivers/media/tuners/si2157.c
> index 57b2508..d7035a5 100644
> --- a/drivers/media/tuners/si2157.c
> +++ b/drivers/media/tuners/si2157.c
> @@ -103,12 +103,21 @@ static int si2157_init(struct dvb_frontend *fe)
>  		goto warm;
>  
>  	/* power up */
> -	if (dev->chiptype == SI2157_CHIPTYPE_SI2146) {
> -		memcpy(cmd.args, "\xc0\x05\x01\x00\x00\x0b\x00\x00\x01", 9);
> -		cmd.wlen = 9;
> -	} else {
> -		memcpy(cmd.args, "\xc0\x00\x0c\x00\x00\x01\x01\x01\x01\x01\x01\x02\x00\x00\x01", 15);
> -		cmd.wlen = 15;
> +	switch (dev->chiptype) {
> +		case SI2157_CHIPTYPE_SI2146:
> +			memcpy(cmd.args, "\xc0\x05\x01\x00\x00\x0b\x00\x00\x01", 9);
> +			cmd.wlen = 9;
> +			break;
> +
> +		case SI2157_CHIPTYPE_SI2158:
> +			memcpy(cmd.args, "\xC0\x00\x00\x00\x00\x01\x01\x01\x01\x01\x01\x02\x00\x00\x01", 15);
> +			cmd.wlen = 15;
> +			break;
> +
> +		default:
> +			memcpy(cmd.args, "\xc0\x00\x0c\x00\x00\x01\x01\x01\x01\x01\x01\x02\x00\x00\x01", 15);
> +			cmd.wlen = 15;
> +			break;
>  	}
>  	cmd.rlen = 1;
>  	ret = si2157_cmd_execute(client, &cmd);
> @@ -204,6 +213,16 @@ skip_fw_download:
>  	if (ret)
>  		goto err;
>  
> +	/* start tuner? */
> +	if (SI2157_CHIPTYPE_SI2158 == dev->chiptype) {
> +		memcpy(cmd.args, "\xC0\x00\x0C", 3);
> +		cmd.wlen = 3;
> +		cmd.rlen = 1;
> +		ret = si2157_cmd_execute(client, &cmd);
> +		if (ret)
> +			goto err;
> +	}
> +
>  	/* query firmware version */
>  	memcpy(cmd.args, "\x11", 1);
>  	cmd.wlen = 1;
> @@ -506,8 +525,9 @@ static int si2157_remove(struct i2c_client *client)
>  }
>  
>  static const struct i2c_device_id si2157_id_table[] = {
> -	{"si2157", SI2157_CHIPTYPE_SI2157},
>  	{"si2146", SI2157_CHIPTYPE_SI2146},
> +	{"si2157", SI2157_CHIPTYPE_SI2157},
> +	{"si2158", SI2157_CHIPTYPE_SI2158},
>  	{}
>  };
>  MODULE_DEVICE_TABLE(i2c, si2157_id_table);
> diff --git a/drivers/media/tuners/si2157_priv.h b/drivers/media/tuners/si2157_priv.h
> index d6b2c7b..677fa00 100644
> --- a/drivers/media/tuners/si2157_priv.h
> +++ b/drivers/media/tuners/si2157_priv.h
> @@ -42,6 +42,7 @@ struct si2157_dev {
>  
>  #define SI2157_CHIPTYPE_SI2157 0
>  #define SI2157_CHIPTYPE_SI2146 1
> +#define SI2157_CHIPTYPE_SI2158 2
>  
>  /* firmware command struct */
>  #define SI2157_ARGLEN      30



Thanks,
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/tuners/si2157.c b/drivers/media/tuners/si2157.c
index 57b2508..d7035a5 100644
--- a/drivers/media/tuners/si2157.c
+++ b/drivers/media/tuners/si2157.c
@@ -103,12 +103,21 @@  static int si2157_init(struct dvb_frontend *fe)
 		goto warm;
 
 	/* power up */
-	if (dev->chiptype == SI2157_CHIPTYPE_SI2146) {
-		memcpy(cmd.args, "\xc0\x05\x01\x00\x00\x0b\x00\x00\x01", 9);
-		cmd.wlen = 9;
-	} else {
-		memcpy(cmd.args, "\xc0\x00\x0c\x00\x00\x01\x01\x01\x01\x01\x01\x02\x00\x00\x01", 15);
-		cmd.wlen = 15;
+	switch (dev->chiptype) {
+		case SI2157_CHIPTYPE_SI2146:
+			memcpy(cmd.args, "\xc0\x05\x01\x00\x00\x0b\x00\x00\x01", 9);
+			cmd.wlen = 9;
+			break;
+
+		case SI2157_CHIPTYPE_SI2158:
+			memcpy(cmd.args, "\xC0\x00\x00\x00\x00\x01\x01\x01\x01\x01\x01\x02\x00\x00\x01", 15);
+			cmd.wlen = 15;
+			break;
+
+		default:
+			memcpy(cmd.args, "\xc0\x00\x0c\x00\x00\x01\x01\x01\x01\x01\x01\x02\x00\x00\x01", 15);
+			cmd.wlen = 15;
+			break;
 	}
 	cmd.rlen = 1;
 	ret = si2157_cmd_execute(client, &cmd);
@@ -204,6 +213,16 @@  skip_fw_download:
 	if (ret)
 		goto err;
 
+	/* start tuner? */
+	if (SI2157_CHIPTYPE_SI2158 == dev->chiptype) {
+		memcpy(cmd.args, "\xC0\x00\x0C", 3);
+		cmd.wlen = 3;
+		cmd.rlen = 1;
+		ret = si2157_cmd_execute(client, &cmd);
+		if (ret)
+			goto err;
+	}
+
 	/* query firmware version */
 	memcpy(cmd.args, "\x11", 1);
 	cmd.wlen = 1;
@@ -506,8 +525,9 @@  static int si2157_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id si2157_id_table[] = {
-	{"si2157", SI2157_CHIPTYPE_SI2157},
 	{"si2146", SI2157_CHIPTYPE_SI2146},
+	{"si2157", SI2157_CHIPTYPE_SI2157},
+	{"si2158", SI2157_CHIPTYPE_SI2158},
 	{}
 };
 MODULE_DEVICE_TABLE(i2c, si2157_id_table);
diff --git a/drivers/media/tuners/si2157_priv.h b/drivers/media/tuners/si2157_priv.h
index d6b2c7b..677fa00 100644
--- a/drivers/media/tuners/si2157_priv.h
+++ b/drivers/media/tuners/si2157_priv.h
@@ -42,6 +42,7 @@  struct si2157_dev {
 
 #define SI2157_CHIPTYPE_SI2157 0
 #define SI2157_CHIPTYPE_SI2146 1
+#define SI2157_CHIPTYPE_SI2158 2
 
 /* firmware command struct */
 #define SI2157_ARGLEN      30