Commit cfcd718d authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab

V4L/DVB (3332): XC3028 code marked with an special define option

- Current xc3028 support is still experimental, requiring more work to be
  sent to mainstream. So, it was marked inside some defines, in order to be
  removed by gentree.pl stript. Script also updated to remove it.
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 9475fb1c
...@@ -154,6 +154,7 @@ struct em28xx_board em28xx_boards[] = { ...@@ -154,6 +154,7 @@ struct em28xx_board em28xx_boards[] = {
.amux = 1, .amux = 1,
}}, }},
}, },
#ifdef CONFIG_XC3028
[EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900] = { [EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900] = {
.name = "Hauppauge WinTV HVR 900", .name = "Hauppauge WinTV HVR 900",
.vchannels = 3, .vchannels = 3,
...@@ -222,6 +223,7 @@ struct em28xx_board em28xx_boards[] = { ...@@ -222,6 +223,7 @@ struct em28xx_board em28xx_boards[] = {
.amux = 1, .amux = 1,
}}, }},
}, },
#endif
[EM2820_BOARD_MSI_VOX_USB_2] = { [EM2820_BOARD_MSI_VOX_USB_2] = {
.name = "MSI VOX USB 2.0", .name = "MSI VOX USB 2.0",
.vchannels = 3, .vchannels = 3,
...@@ -340,9 +342,11 @@ struct usb_device_id em28xx_id_table [] = { ...@@ -340,9 +342,11 @@ struct usb_device_id em28xx_id_table [] = {
{ USB_DEVICE(0x2304, 0x0208), .driver_info = EM2820_BOARD_PINNACLE_USB_2 }, { USB_DEVICE(0x2304, 0x0208), .driver_info = EM2820_BOARD_PINNACLE_USB_2 },
{ USB_DEVICE(0x2040, 0x4200), .driver_info = EM2820_BOARD_HAUPPAUGE_WINTV_USB_2 }, { USB_DEVICE(0x2040, 0x4200), .driver_info = EM2820_BOARD_HAUPPAUGE_WINTV_USB_2 },
{ USB_DEVICE(0x2304, 0x0207), .driver_info = EM2820_BOARD_PINNACLE_DVC_90 }, { USB_DEVICE(0x2304, 0x0207), .driver_info = EM2820_BOARD_PINNACLE_DVC_90 },
#ifdef CONFIG_XC3028
{ USB_DEVICE(0x2040, 0x6500), .driver_info = EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900 }, { USB_DEVICE(0x2040, 0x6500), .driver_info = EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900 },
{ USB_DEVICE(0x0ccd, 0x0042), .driver_info = EM2880_BOARD_TERRATEC_HYBRID_XS }, { USB_DEVICE(0x0ccd, 0x0042), .driver_info = EM2880_BOARD_TERRATEC_HYBRID_XS },
{ USB_DEVICE(0x0ccd, 0x0047), .driver_info = EM2880_BOARD_TERRATEC_PRODIGY_XS }, { USB_DEVICE(0x0ccd, 0x0047), .driver_info = EM2880_BOARD_TERRATEC_PRODIGY_XS },
#endif
{ }, { },
}; };
......
...@@ -216,9 +216,11 @@ static void set_type(struct i2c_client *c, unsigned int type, ...@@ -216,9 +216,11 @@ static void set_type(struct i2c_client *c, unsigned int type,
i2c_master_send(c,buffer,4); i2c_master_send(c,buffer,4);
default_tuner_init(c); default_tuner_init(c);
break; break;
#ifdef CONFIG_XC3028
case TUNER_XCEIVE_XC3028: case TUNER_XCEIVE_XC3028:
xc3028_init(c); xc3028_init(c);
break; break;
#endif
default: default:
default_tuner_init(c); default_tuner_init(c);
break; break;
......
...@@ -983,23 +983,6 @@ static struct tuner_params tuner_samsung_tcpn_2121p30a_params[] = { ...@@ -983,23 +983,6 @@ static struct tuner_params tuner_samsung_tcpn_2121p30a_params[] = {
}, },
}; };
/* ------------ TUNER_XCEIVE_XC3028 - Xceive xc3028 ------------ */
static struct tuner_range tuner_xceive_xc3028_ranges[] = {
{ 16 * 140.25 /*MHz*/, 0x02, },
{ 16 * 463.25 /*MHz*/, 0x04, },
{ 16 * 999.99 , 0x01, },
};
static struct tuner_params tuner_xceive_xc3028_params[] = {
{
.type = TUNER_XCEIVE_XC3028,
.ranges = tuner_xceive_xc3028_ranges,
.count = ARRAY_SIZE(tuner_xceive_xc3028_ranges),
},
};
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
struct tunertype tuners[] = { struct tunertype tuners[] = {
...@@ -1369,7 +1352,7 @@ struct tunertype tuners[] = { ...@@ -1369,7 +1352,7 @@ struct tunertype tuners[] = {
}, },
[TUNER_XCEIVE_XC3028] = { /* Xceive 3028 */ [TUNER_XCEIVE_XC3028] = { /* Xceive 3028 */
.name = "Xceive xc3028", .name = "Xceive xc3028",
.params = tuner_xceive_xc3028_params, /* see xc3028.c for details */
}, },
}; };
......
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