mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-24 11:16:51 +00:00
Adds support for ct2 (Olli Salonen) and pctv292e in the project imx6
This commit is contained in:
Tonacho
parent
24ed310289
commit
218d513768
3246
projects/imx6/patches/linux/linux-225-ct2-devices.patch
Normal file
3246
projects/imx6/patches/linux/linux-225-ct2-devices.patch
Normal file
File diff suppressed because it is too large
Load Diff
192
projects/imx6/patches/linux/linux-226-pctv292e-devices.patch
Normal file
192
projects/imx6/patches/linux/linux-226-pctv292e-devices.patch
Normal file
@ -0,0 +1,192 @@
|
||||
diff -rupN a/drivers/media/usb/em28xx/em28xx-cards.c b/drivers/media/usb/em28xx/em28xx-cards.c
|
||||
--- a/drivers/media/usb/em28xx/em28xx-cards.c 2015-02-23 14:54:18.000000000 +0100
|
||||
+++ b/drivers/media/usb/em28xx/em28xx-cards.c 2015-02-12 16:46:54.000000000 +0100
|
||||
@@ -448,6 +448,18 @@ static struct em28xx_reg_seq speedlink_v
|
||||
{ -1, -1, -1, -1},
|
||||
};
|
||||
|
||||
+static struct em28xx_reg_seq pctv_292e[] = {
|
||||
+ {EM2874_R80_GPIO_P0_CTRL, 0xff, 0xff, 0},
|
||||
+ {0x0d, 0xff, 0xff, 950},
|
||||
+ {EM2874_R80_GPIO_P0_CTRL, 0xbd, 0xff, 100},
|
||||
+ {EM2874_R80_GPIO_P0_CTRL, 0xfd, 0xff, 410},
|
||||
+ {EM2874_R80_GPIO_P0_CTRL, 0x7d, 0xff, 300},
|
||||
+ {EM2874_R80_GPIO_P0_CTRL, 0x7c, 0xff, 60},
|
||||
+ {0x0d, 0x42, 0xff, 50},
|
||||
+ {EM2874_R5F_TS_ENABLE, 0x85, 0xff, 0},
|
||||
+ {-1, -1, -1, -1},
|
||||
+};
|
||||
+
|
||||
/*
|
||||
* Button definitions
|
||||
*/
|
||||
@@ -2157,6 +2169,17 @@ struct em28xx_board em28xx_boards[] = {
|
||||
.has_dvb = 1,
|
||||
.ir_codes = RC_MAP_PINNACLE_PCTV_HD,
|
||||
},
|
||||
+ /* 2013:025f PCTV tripleStick (292e).
|
||||
+ * Empia EM28178, Silicon Labs Si2168, Silicon Labs Si2157 */
|
||||
+ [EM28178_BOARD_PCTV_292E] = {
|
||||
+ .name = "PCTV tripleStick (292e)",
|
||||
+ .def_i2c_bus = 1,
|
||||
+ .i2c_speed = EM28XX_I2C_CLK_WAIT_ENABLE | EM28XX_I2C_FREQ_400_KHZ,
|
||||
+ .tuner_type = TUNER_ABSENT,
|
||||
+ .tuner_gpio = pctv_292e,
|
||||
+ .has_dvb = 1,
|
||||
+ .ir_codes = RC_MAP_PINNACLE_PCTV_HD,
|
||||
+ },
|
||||
};
|
||||
EXPORT_SYMBOL_GPL(em28xx_boards);
|
||||
|
||||
@@ -2330,6 +2353,8 @@ struct usb_device_id em28xx_id_table[] =
|
||||
.driver_info = EM2765_BOARD_SPEEDLINK_VAD_LAPLACE },
|
||||
{ USB_DEVICE(0x2013, 0x0258),
|
||||
.driver_info = EM28178_BOARD_PCTV_461E },
|
||||
+ { USB_DEVICE(0x2013, 0x025f),
|
||||
+ .driver_info = EM28178_BOARD_PCTV_292E },
|
||||
{ },
|
||||
};
|
||||
MODULE_DEVICE_TABLE(usb, em28xx_id_table);
|
||||
diff -rupN a/drivers/media/usb/em28xx/em28xx-dvb.c b/drivers/media/usb/em28xx/em28xx-dvb.c
|
||||
--- a/drivers/media/usb/em28xx/em28xx-dvb.c 2014-11-02 14:07:11.000000000 +0100
|
||||
+++ b/drivers/media/usb/em28xx/em28xx-dvb.c 2015-02-24 16:39:35.000000000 +0100
|
||||
@@ -53,6 +53,8 @@
|
||||
#include "mb86a20s.h"
|
||||
#include "m88ds3103.h"
|
||||
#include "m88ts2022.h"
|
||||
+#include "si2168.h"
|
||||
+#include "si2157.h"
|
||||
|
||||
MODULE_AUTHOR("Mauro Carvalho Chehab <mchehab@infradead.org>");
|
||||
MODULE_LICENSE("GPL");
|
||||
@@ -91,6 +93,7 @@ struct em28xx_dvb {
|
||||
struct semaphore pll_mutex;
|
||||
bool dont_attach_fe1;
|
||||
int lna_gpio;
|
||||
+ struct i2c_client *i2c_client_demod;
|
||||
struct i2c_client *i2c_client_tuner;
|
||||
};
|
||||
|
||||
@@ -719,6 +722,21 @@ static int em28xx_pctv_290e_set_lna(stru
|
||||
#endif
|
||||
}
|
||||
|
||||
+static int em28xx_pctv_292e_set_lna(struct dvb_frontend *fe)
|
||||
+{
|
||||
+ struct dtv_frontend_properties *c = &fe->dtv_property_cache;
|
||||
+ struct em28xx_i2c_bus *i2c_bus = fe->dvb->priv;
|
||||
+ struct em28xx *dev = i2c_bus->dev;
|
||||
+ u8 lna;
|
||||
+
|
||||
+ if (c->lna == 1)
|
||||
+ lna = 0x01;
|
||||
+ else
|
||||
+ lna = 0x00;
|
||||
+
|
||||
+ return em28xx_write_reg_bits(dev, EM2874_R80_GPIO_P0_CTRL, lna, 0x01);
|
||||
+}
|
||||
+
|
||||
static int em28xx_mt352_terratec_xs_init(struct dvb_frontend *fe)
|
||||
{
|
||||
/* Values extracted from a USB trace of the Terratec Windows driver */
|
||||
@@ -1413,6 +1431,66 @@ static int em28xx_dvb_init(struct em28xx
|
||||
}
|
||||
}
|
||||
break;
|
||||
+ case EM28178_BOARD_PCTV_292E:
|
||||
+ {
|
||||
+ struct i2c_adapter *adapter;
|
||||
+ struct i2c_client *client;
|
||||
+ struct i2c_board_info info;
|
||||
+ struct si2168_config si2168_config;
|
||||
+ struct si2157_config si2157_config;
|
||||
+
|
||||
+ /* attach demod */
|
||||
+ memset(&si2168_config, 0, sizeof(si2168_config));
|
||||
+ si2168_config.i2c_adapter = &adapter;
|
||||
+ si2168_config.fe = &dvb->fe[0];
|
||||
+ si2168_config.ts_mode = SI2168_TS_PARALLEL;
|
||||
+ memset(&info, 0, sizeof(struct i2c_board_info));
|
||||
+ strlcpy(info.type, "si2168", I2C_NAME_SIZE);
|
||||
+ info.addr = 0x64;
|
||||
+ info.platform_data = &si2168_config;
|
||||
+ request_module(info.type);
|
||||
+ client = i2c_new_device(&dev->i2c_adap[dev->def_i2c_bus], &info);
|
||||
+ if (client == NULL || client->dev.driver == NULL) {
|
||||
+ result = -ENODEV;
|
||||
+ goto out_free;
|
||||
+ }
|
||||
+
|
||||
+ if (!try_module_get(client->dev.driver->owner)) {
|
||||
+ i2c_unregister_device(client);
|
||||
+ result = -ENODEV;
|
||||
+ goto out_free;
|
||||
+ }
|
||||
+
|
||||
+ dvb->i2c_client_demod = client;
|
||||
+
|
||||
+ /* attach tuner */
|
||||
+ memset(&si2157_config, 0, sizeof(si2157_config));
|
||||
+ si2157_config.fe = dvb->fe[0];
|
||||
+ memset(&info, 0, sizeof(struct i2c_board_info));
|
||||
+ strlcpy(info.type, "si2157", I2C_NAME_SIZE);
|
||||
+ info.addr = 0x60;
|
||||
+ info.platform_data = &si2157_config;
|
||||
+ request_module(info.type);
|
||||
+ client = i2c_new_device(adapter, &info);
|
||||
+ if (client == NULL || client->dev.driver == NULL) {
|
||||
+ module_put(dvb->i2c_client_demod->dev.driver->owner);
|
||||
+ i2c_unregister_device(dvb->i2c_client_demod);
|
||||
+ result = -ENODEV;
|
||||
+ goto out_free;
|
||||
+ }
|
||||
+
|
||||
+ if (!try_module_get(client->dev.driver->owner)) {
|
||||
+ i2c_unregister_device(client);
|
||||
+ module_put(dvb->i2c_client_demod->dev.driver->owner);
|
||||
+ i2c_unregister_device(dvb->i2c_client_demod);
|
||||
+ result = -ENODEV;
|
||||
+ goto out_free;
|
||||
+ }
|
||||
+
|
||||
+ dvb->i2c_client_tuner = client;
|
||||
+ dvb->fe[0]->ops.set_lna = em28xx_pctv_292e_set_lna;
|
||||
+ }
|
||||
+ break;
|
||||
default:
|
||||
em28xx_errdev("/2: The frontend of your DVB/ATSC card"
|
||||
" isn't supported yet\n");
|
||||
@@ -1485,6 +1563,10 @@ static int em28xx_dvb_fini(struct em28xx
|
||||
}
|
||||
|
||||
i2c_release_client(dvb->i2c_client_tuner);
|
||||
+ /* remove I2C demod */
|
||||
+ if (dvb->i2c_client_demod) {
|
||||
+ i2c_unregister_device(dvb->i2c_client_demod);
|
||||
+ }
|
||||
em28xx_unregister_dvb(dvb);
|
||||
kfree(dvb);
|
||||
dev->dvb = NULL;
|
||||
diff -rupN a/drivers/media/usb/em28xx/em28xx.h b/drivers/media/usb/em28xx/em28xx.h
|
||||
--- a/drivers/media/usb/em28xx/em28xx.h 2014-11-02 14:07:11.000000000 +0100
|
||||
+++ b/drivers/media/usb/em28xx/em28xx.h 2015-02-23 15:28:11.000000000 +0100
|
||||
@@ -137,6 +137,7 @@
|
||||
#define EM2874_BOARD_KWORLD_UB435Q_V2 90
|
||||
#define EM2765_BOARD_SPEEDLINK_VAD_LAPLACE 91
|
||||
#define EM28178_BOARD_PCTV_461E 92
|
||||
+#define EM28178_BOARD_PCTV_292E 94
|
||||
|
||||
/* Limits minimum and default number of buffers */
|
||||
#define EM28XX_MIN_BUF 4
|
||||
diff -rupN a/drivers/media/usb/em28xx/Kconfig b/drivers/media/usb/em28xx/Kconfig
|
||||
--- a/drivers/media/usb/em28xx/Kconfig 2014-11-02 14:07:11.000000000 +0100
|
||||
+++ b/drivers/media/usb/em28xx/Kconfig 2015-02-12 16:46:54.000000000 +0100
|
||||
@@ -55,6 +55,8 @@ config VIDEO_EM28XX_DVB
|
||||
select MEDIA_TUNER_TDA18271 if MEDIA_SUBDRV_AUTOSELECT
|
||||
select DVB_M88DS3103 if MEDIA_SUBDRV_AUTOSELECT
|
||||
select MEDIA_TUNER_M88TS2022 if MEDIA_SUBDRV_AUTOSELECT
|
||||
+ select DVB_SI2168 if MEDIA_SUBDRV_AUTOSELECT
|
||||
+ select MEDIA_TUNER_SI2157 if MEDIA_SUBDRV_AUTOSELECT
|
||||
---help---
|
||||
This adds support for DVB cards based on the
|
||||
Empiatech em28xx chips.
|
||||
Loading…
x
Reference in New Issue
Block a user