[PATCH 2/2] af9035: Add remaining it913x dual ids to af9035.

[PATCH 2/2] af9035: Add remaining it913x dual ids to af9035.

[Malcolm Priestley]

As follow on to patch
af9035: Move it913x single devices to af9035
and patch 1.

SNR is reported as db/10 values.

All dual ids are added to af9035 and it913x driver disabled.

it913x/it913x-fe removal patches to follow.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
---
 drivers/media/usb/dvb-usb-v2/af9035.c | 8 ++++++++
 drivers/media/usb/dvb-usb-v2/it913x.c | 5 +++++
 2 files changed, 13 insertions(+)

diff --git a/drivers/media/usb/dvb-usb-v2/af9035.c b/drivers/media/usb/dvb-usb-v2/af9035.c
index 4f682ad..49e8360 100644
--- a/drivers/media/usb/dvb-usb-v2/af9035.c
+++ b/drivers/media/usb/dvb-usb-v2/af9035.c
@@ -1552,6 +1552,14 @@ static const struct usb_device_id af9035_id_table[] = {
 		&af9035_props, "Avermedia A835B(4835)",	RC_MAP_IT913X_V2) },
 	{ DVB_USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_H335,
 		&af9035_props, "Avermedia H335", RC_MAP_IT913X_V2) },
+	{ DVB_USB_DEVICE(USB_VID_KWORLD_2, USB_PID_KWORLD_UB499_2T_T09,
+		&af9035_props, "Kworld UB499-2T T09", RC_MAP_IT913X_V1) },
+	{ DVB_USB_DEVICE(USB_VID_KWORLD_2, USB_PID_SVEON_STV22_IT9137,
+		&af9035_props, "Sveon STV22 Dual DVB-T HDTV",
+							RC_MAP_IT913X_V1) },
+	{ DVB_USB_DEVICE(USB_VID_KWORLD_2, USB_PID_CTVDIGDUAL_V2,
+		&af9035_props, "Digital Dual TV Receiver CTVDIGDUAL_V2",
+							RC_MAP_IT913X_V1) },
 	/* XXX: that same ID [0ccd:0099] is used by af9015 driver too */
 	{ DVB_USB_DEVICE(USB_VID_TERRATEC, 0x0099,
 		&af9035_props, "TerraTec Cinergy T Stick Dual RC (rev. 2)", NULL) },
diff --git a/drivers/media/usb/dvb-usb-v2/it913x.c b/drivers/media/usb/dvb-usb-v2/it913x.c
index 78bf8fd..39488f8 100644
--- a/drivers/media/usb/dvb-usb-v2/it913x.c
+++ b/drivers/media/usb/dvb-usb-v2/it913x.c
@@ -781,6 +781,8 @@ static const struct usb_device_id it913x_id_table[] = {
 	{}		/* Terminating entry */
 };
 
+#if 0
+
 MODULE_DEVICE_TABLE(usb, it913x_id_table);
 
 static struct usb_driver it913x_driver = {
@@ -792,8 +794,11 @@ static struct usb_driver it913x_driver = {
 	.id_table	= it913x_id_table,
 };
 
+
 module_usb_driver(it913x_driver);
 
+#endif
+
 MODULE_AUTHOR("Malcolm Priestley <tvboxspy@gmail.com>");
 MODULE_DESCRIPTION("it913x USB 2 Driver");
 MODULE_VERSION("1.33");
-- 
1.9.rc1

Re: [PATCH 2/2] af9035: Add remaining it913x dual ids to af9035.

[Antti Palosaari]

Moikka Malcolm!
Thanks for the patch serie.

You removed all IDs from it913x driver. There is possibility to just 
remove / comment out:
	MODULE_DEVICE_TABLE(usb, it913x_id_table);
which prevents loading that driver automatically, but leaves possibility 
to load it manually if user wants to fallback. I am fine either way you 
decide to do it, just a propose.

regards
Antti


On 09.02.2014 15:04, Malcolm Priestley wrote:
> As follow on to patch
> af9035: Move it913x single devices to af9035
> and patch 1.
>
> SNR is reported as db/10 values.
>
> All dual ids are added to af9035 and it913x driver disabled.
>
> it913x/it913x-fe removal patches to follow.
>
> Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
> ---
>   drivers/media/usb/dvb-usb-v2/af9035.c | 8 ++++++++
>   drivers/media/usb/dvb-usb-v2/it913x.c | 5 +++++
>   2 files changed, 13 insertions(+)
>
> diff --git a/drivers/media/usb/dvb-usb-v2/af9035.c b/drivers/media/usb/dvb-usb-v2/af9035.c
> index 4f682ad..49e8360 100644
> --- a/drivers/media/usb/dvb-usb-v2/af9035.c
> +++ b/drivers/media/usb/dvb-usb-v2/af9035.c
> @@ -1552,6 +1552,14 @@ static const struct usb_device_id af9035_id_table[] = {
>   		&af9035_props, "Avermedia A835B(4835)",	RC_MAP_IT913X_V2) },
>   	{ DVB_USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_H335,
>   		&af9035_props, "Avermedia H335", RC_MAP_IT913X_V2) },
> +	{ DVB_USB_DEVICE(USB_VID_KWORLD_2, USB_PID_KWORLD_UB499_2T_T09,
> +		&af9035_props, "Kworld UB499-2T T09", RC_MAP_IT913X_V1) },
> +	{ DVB_USB_DEVICE(USB_VID_KWORLD_2, USB_PID_SVEON_STV22_IT9137,
> +		&af9035_props, "Sveon STV22 Dual DVB-T HDTV",
> +							RC_MAP_IT913X_V1) },
> +	{ DVB_USB_DEVICE(USB_VID_KWORLD_2, USB_PID_CTVDIGDUAL_V2,
> +		&af9035_props, "Digital Dual TV Receiver CTVDIGDUAL_V2",
> +							RC_MAP_IT913X_V1) },
>   	/* XXX: that same ID [0ccd:0099] is used by af9015 driver too */
>   	{ DVB_USB_DEVICE(USB_VID_TERRATEC, 0x0099,
>   		&af9035_props, "TerraTec Cinergy T Stick Dual RC (rev. 2)", NULL) },
> diff --git a/drivers/media/usb/dvb-usb-v2/it913x.c b/drivers/media/usb/dvb-usb-v2/it913x.c
> index 78bf8fd..39488f8 100644
> --- a/drivers/media/usb/dvb-usb-v2/it913x.c
> +++ b/drivers/media/usb/dvb-usb-v2/it913x.c
> @@ -781,6 +781,8 @@ static const struct usb_device_id it913x_id_table[] = {
>   	{}		/* Terminating entry */
>   };
>
> +#if 0
> +
>   MODULE_DEVICE_TABLE(usb, it913x_id_table);
>
>   static struct usb_driver it913x_driver = {
> @@ -792,8 +794,11 @@ static struct usb_driver it913x_driver = {
>   	.id_table	= it913x_id_table,
>   };
>
> +
>   module_usb_driver(it913x_driver);
>
> +#endif
> +
>   MODULE_AUTHOR("Malcolm Priestley <tvboxspy@gmail.com>");
>   MODULE_DESCRIPTION("it913x USB 2 Driver");
>   MODULE_VERSION("1.33");
>


-- 
http://palosaari.fi/

Re: [PATCH 2/2] af9035: Add remaining it913x dual ids to af9035.

[Malcolm Priestley]

On Tue, 2014-02-11 at 19:42 +0200, Antti Palosaari wrote:
> Moikka Malcolm!
> Thanks for the patch serie.
> 
> You removed all IDs from it913x driver. There is possibility to just 
> remove / comment out:
> 	MODULE_DEVICE_TABLE(usb, it913x_id_table);
> which prevents loading that driver automatically, but leaves possibility 
> to load it manually if user wants to fallback. I am fine either way you 
> decide to do it, just a propose.
Hi Antti

I am going post a patches to remove it.

The only reason why an user would want to fall back is
the use dvb-usb-it9137-01.fw firmware with USB_VID_KWORLD_2.

I left the USB_VID_KWORLD_2 ids in the driver.

I haven't found any issues with dvb-usb-it9135-01.fw

USB_VID_KWORLD_2 users could have trouble updating older kernels via
media_build.

Perhaps there should be a warning message in af9035 that users need to
change firmware.

Regards


Malcolm

Re: [PATCH 2/2] af9035: Add remaining it913x dual ids to af9035.

[Antti Palosaari]

On 11.02.2014 22:32, Malcolm Priestley wrote:
> On Tue, 2014-02-11 at 19:42 +0200, Antti Palosaari wrote:
>> Moikka Malcolm!
>> Thanks for the patch serie.
>>
>> You removed all IDs from it913x driver. There is possibility to just
>> remove / comment out:
>> 	MODULE_DEVICE_TABLE(usb, it913x_id_table);
>> which prevents loading that driver automatically, but leaves possibility
>> to load it manually if user wants to fallback. I am fine either way you
>> decide to do it, just a propose.
> Hi Antti
>
> I am going post a patches to remove it.
>
> The only reason why an user would want to fall back is
> the use dvb-usb-it9137-01.fw firmware with USB_VID_KWORLD_2.
>
> I left the USB_VID_KWORLD_2 ids in the driver.
>
> I haven't found any issues with dvb-usb-it9135-01.fw
>
> USB_VID_KWORLD_2 users could have trouble updating older kernels via
> media_build.
>
> Perhaps there should be a warning message in af9035 that users need to
> change firmware.

Is that KẂorld device dual model (I guess yes, because of it9137)? Is it 
version 1 (AX) or version 2 (BX) chip?

If it is dual with version 1 chips, it is similar than that:
http://blog.palosaari.fi/2013/06/naked-hardware-9-terratec-cinergy-t.html

I suspect firmware is same for both it9135 or it9137 and only difference 
between chips is pins to connect slave demodulator.

Maybe difference is just firmware version and it is likely older (as I 
extracted one it9135 ver. 1 fw from latest windows driver). Have to 
check that.

regards
Antti

-- 
http://palosaari.fi/

Re: [PATCH 2/2] af9035: Add remaining it913x dual ids to af9035.

[Malcolm Priestley]

On Tue, 2014-02-11 at 22:41 +0200, Antti Palosaari wrote:
> On 11.02.2014 22:32, Malcolm Priestley wrote:
> > On Tue, 2014-02-11 at 19:42 +0200, Antti Palosaari wrote:
> >> Moikka Malcolm!
> >> Thanks for the patch serie.
> >>
> >> You removed all IDs from it913x driver. There is possibility to just
> >> remove / comment out:
> >> 	MODULE_DEVICE_TABLE(usb, it913x_id_table);
> >> which prevents loading that driver automatically, but leaves possibility
> >> to load it manually if user wants to fallback. I am fine either way you
> >> decide to do it, just a propose.
> > Hi Antti
> >
> > I am going post a patches to remove it.
> >
> > The only reason why an user would want to fall back is
> > the use dvb-usb-it9137-01.fw firmware with USB_VID_KWORLD_2.
> >
> > I left the USB_VID_KWORLD_2 ids in the driver.
> >
> > I haven't found any issues with dvb-usb-it9135-01.fw
> >
> > USB_VID_KWORLD_2 users could have trouble updating older kernels via
> > media_build.
> >
> > Perhaps there should be a warning message in af9035 that users need to
> > change firmware.
> 
> Is that KẂorld device dual model (I guess yes, because of it9137)? Is it 
> version 1 (AX) or version 2 (BX) chip?

Both apparently exist, but the firmware is the same.

The main difference registers in the firmwares
dvb-usb-it9137-01.fw -->clk enable 0xd81a --> tuner_it91x_priv.h...set_it9137_template
dvb-usb-it9135-01.fw -->clk enable 0xcfff --> tuner_it91x_priv.h...set_it9135_template
dvb-usb-it9135-02.fw -->clk enable 0xcfff --> tuner_it91x_priv.h...set_it9135_template

As far as It can tell all the latest firmwares are based on
set_it9135_template.

On the KWorld the second device is another it9137 and has an eeprom
24c02 fitted.

So dropping the dvb-usb-it9137-01.fw firmware is fine.

Regards


Malcolm