Skip to content

L
linux
Commit 7afe510a authored by Daniel Scheller's avatar Daniel Scheller Committed by Mauro Carvalho Chehab
Browse files
Options

[media] dvb-frontends/cxd2841er: make ASCOT use optional 

The Sony CXD28xx demods may have other tuner types attached to them (e.g.
NXP TDA18212), so don't mandatorily configure and enable the ASCOT
functionality, but make this conditional by a config flag.
Signed-off-by: default avatarDaniel Scheller <d.scheller@gmx.net>
Acked-by: default avatarAbylay Ospan <aospan@netup.ru>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 03ab1bd5
Show whitespace changes
Inline Side-by-side
Showing with 46 additions and 27 deletions
drivers/media/dvb-frontends/cxd2841er.c
View file @ 7afe510a
...@@ -2277,6 +2277,7 @@ static int cxd2841er_sleep_tc_to_active_t2_band(struct cxd2841er_priv *priv, ...@@ -2277,6 +2277,7 @@ static int cxd2841er_sleep_tc_to_active_t2_band(struct cxd2841er_priv *priv,
/* Group delay equaliser settings for /* Group delay equaliser settings for
* ASCOT2D, ASCOT2E and ASCOT3 tuners * ASCOT2D, ASCOT2E and ASCOT3 tuners
*/ */
if (priv->flags & CXD2841ER_ASCOT)
cxd2841er_write_regs(priv, I2C_SLVT, cxd2841er_write_regs(priv, I2C_SLVT,
0xA6, itbCoef8bw[priv->xtal], 14); 0xA6, itbCoef8bw[priv->xtal], 14);
/* <IF freq setting> */ /* <IF freq setting> */
...@@ -2306,6 +2307,7 @@ static int cxd2841er_sleep_tc_to_active_t2_band(struct cxd2841er_priv *priv, ...@@ -2306,6 +2307,7 @@ static int cxd2841er_sleep_tc_to_active_t2_band(struct cxd2841er_priv *priv,
/* Group delay equaliser settings for /* Group delay equaliser settings for
* ASCOT2D, ASCOT2E and ASCOT3 tuners * ASCOT2D, ASCOT2E and ASCOT3 tuners
*/ */
if (priv->flags & CXD2841ER_ASCOT)
cxd2841er_write_regs(priv, I2C_SLVT, cxd2841er_write_regs(priv, I2C_SLVT,
0xA6, itbCoef7bw[priv->xtal], 14); 0xA6, itbCoef7bw[priv->xtal], 14);
/* <IF freq setting> */ /* <IF freq setting> */
...@@ -2335,6 +2337,7 @@ static int cxd2841er_sleep_tc_to_active_t2_band(struct cxd2841er_priv *priv, ...@@ -2335,6 +2337,7 @@ static int cxd2841er_sleep_tc_to_active_t2_band(struct cxd2841er_priv *priv,
/* Group delay equaliser settings for /* Group delay equaliser settings for
* ASCOT2D, ASCOT2E and ASCOT3 tuners * ASCOT2D, ASCOT2E and ASCOT3 tuners
*/ */
if (priv->flags & CXD2841ER_ASCOT)
cxd2841er_write_regs(priv, I2C_SLVT, cxd2841er_write_regs(priv, I2C_SLVT,
0xA6, itbCoef6bw[priv->xtal], 14); 0xA6, itbCoef6bw[priv->xtal], 14);
/* <IF freq setting> */ /* <IF freq setting> */
...@@ -2364,6 +2367,7 @@ static int cxd2841er_sleep_tc_to_active_t2_band(struct cxd2841er_priv *priv, ...@@ -2364,6 +2367,7 @@ static int cxd2841er_sleep_tc_to_active_t2_band(struct cxd2841er_priv *priv,
/* Group delay equaliser settings for /* Group delay equaliser settings for
* ASCOT2D, ASCOT2E and ASCOT3 tuners * ASCOT2D, ASCOT2E and ASCOT3 tuners
*/ */
if (priv->flags & CXD2841ER_ASCOT)
cxd2841er_write_regs(priv, I2C_SLVT, cxd2841er_write_regs(priv, I2C_SLVT,
0xA6, itbCoef5bw[priv->xtal], 14); 0xA6, itbCoef5bw[priv->xtal], 14);
/* <IF freq setting> */ /* <IF freq setting> */
...@@ -2393,6 +2397,7 @@ static int cxd2841er_sleep_tc_to_active_t2_band(struct cxd2841er_priv *priv, ...@@ -2393,6 +2397,7 @@ static int cxd2841er_sleep_tc_to_active_t2_band(struct cxd2841er_priv *priv,
/* Group delay equaliser settings for /* Group delay equaliser settings for
* ASCOT2D, ASCOT2E and ASCOT3 tuners * ASCOT2D, ASCOT2E and ASCOT3 tuners
*/ */
if (priv->flags & CXD2841ER_ASCOT)
cxd2841er_write_regs(priv, I2C_SLVT, cxd2841er_write_regs(priv, I2C_SLVT,
0xA6, itbCoef17bw[priv->xtal], 14); 0xA6, itbCoef17bw[priv->xtal], 14);
/* <IF freq setting> */ /* <IF freq setting> */
...@@ -2493,6 +2498,7 @@ static int cxd2841er_sleep_tc_to_active_t_band( ...@@ -2493,6 +2498,7 @@ static int cxd2841er_sleep_tc_to_active_t_band(
/* Group delay equaliser settings for /* Group delay equaliser settings for
* ASCOT2D, ASCOT2E and ASCOT3 tuners * ASCOT2D, ASCOT2E and ASCOT3 tuners
*/ */
if (priv->flags & CXD2841ER_ASCOT)
cxd2841er_write_regs(priv, I2C_SLVT, cxd2841er_write_regs(priv, I2C_SLVT,
0xA6, itbCoef8bw[priv->xtal], 14); 0xA6, itbCoef8bw[priv->xtal], 14);
/* <IF freq setting> */ /* <IF freq setting> */
...@@ -2529,6 +2535,7 @@ static int cxd2841er_sleep_tc_to_active_t_band( ...@@ -2529,6 +2535,7 @@ static int cxd2841er_sleep_tc_to_active_t_band(
/* Group delay equaliser settings for /* Group delay equaliser settings for
* ASCOT2D, ASCOT2E and ASCOT3 tuners * ASCOT2D, ASCOT2E and ASCOT3 tuners
*/ */
if (priv->flags & CXD2841ER_ASCOT)
cxd2841er_write_regs(priv, I2C_SLVT, cxd2841er_write_regs(priv, I2C_SLVT,
0xA6, itbCoef7bw[priv->xtal], 14); 0xA6, itbCoef7bw[priv->xtal], 14);
/* <IF freq setting> */ /* <IF freq setting> */
...@@ -2565,6 +2572,7 @@ static int cxd2841er_sleep_tc_to_active_t_band( ...@@ -2565,6 +2572,7 @@ static int cxd2841er_sleep_tc_to_active_t_band(
/* Group delay equaliser settings for /* Group delay equaliser settings for
* ASCOT2D, ASCOT2E and ASCOT3 tuners * ASCOT2D, ASCOT2E and ASCOT3 tuners
*/ */
if (priv->flags & CXD2841ER_ASCOT)
cxd2841er_write_regs(priv, I2C_SLVT, cxd2841er_write_regs(priv, I2C_SLVT,
0xA6, itbCoef6bw[priv->xtal], 14); 0xA6, itbCoef6bw[priv->xtal], 14);
/* <IF freq setting> */ /* <IF freq setting> */
...@@ -2601,6 +2609,7 @@ static int cxd2841er_sleep_tc_to_active_t_band( ...@@ -2601,6 +2609,7 @@ static int cxd2841er_sleep_tc_to_active_t_band(
/* Group delay equaliser settings for /* Group delay equaliser settings for
* ASCOT2D, ASCOT2E and ASCOT3 tuners * ASCOT2D, ASCOT2E and ASCOT3 tuners
*/ */
if (priv->flags & CXD2841ER_ASCOT)
cxd2841er_write_regs(priv, I2C_SLVT, cxd2841er_write_regs(priv, I2C_SLVT,
0xA6, itbCoef5bw[priv->xtal], 14); 0xA6, itbCoef5bw[priv->xtal], 14);
/* <IF freq setting> */ /* <IF freq setting> */
...@@ -2703,6 +2712,7 @@ static int cxd2841er_sleep_tc_to_active_i_band( ...@@ -2703,6 +2712,7 @@ static int cxd2841er_sleep_tc_to_active_i_band(
cxd2841er_write_regs(priv, I2C_SLVT, cxd2841er_write_regs(priv, I2C_SLVT,
0x9F, nominalRate8bw[priv->xtal], 5); 0x9F, nominalRate8bw[priv->xtal], 5);
/* Group delay equaliser settings for ASCOT tuners optimized */ /* Group delay equaliser settings for ASCOT tuners optimized */
if (priv->flags & CXD2841ER_ASCOT)
cxd2841er_write_regs(priv, I2C_SLVT, cxd2841er_write_regs(priv, I2C_SLVT,
0xA6, itbCoef8bw[priv->xtal], 14); 0xA6, itbCoef8bw[priv->xtal], 14);
...@@ -2733,6 +2743,7 @@ static int cxd2841er_sleep_tc_to_active_i_band( ...@@ -2733,6 +2743,7 @@ static int cxd2841er_sleep_tc_to_active_i_band(
cxd2841er_write_regs(priv, I2C_SLVT, cxd2841er_write_regs(priv, I2C_SLVT,
0x9F, nominalRate7bw[priv->xtal], 5); 0x9F, nominalRate7bw[priv->xtal], 5);
/* Group delay equaliser settings for ASCOT tuners optimized */ /* Group delay equaliser settings for ASCOT tuners optimized */
if (priv->flags & CXD2841ER_ASCOT)
cxd2841er_write_regs(priv, I2C_SLVT, cxd2841er_write_regs(priv, I2C_SLVT,
0xA6, itbCoef7bw[priv->xtal], 14); 0xA6, itbCoef7bw[priv->xtal], 14);
...@@ -2763,6 +2774,7 @@ static int cxd2841er_sleep_tc_to_active_i_band( ...@@ -2763,6 +2774,7 @@ static int cxd2841er_sleep_tc_to_active_i_band(
cxd2841er_write_regs(priv, I2C_SLVT, cxd2841er_write_regs(priv, I2C_SLVT,
0x9F, nominalRate6bw[priv->xtal], 5); 0x9F, nominalRate6bw[priv->xtal], 5);
/* Group delay equaliser settings for ASCOT tuners optimized */ /* Group delay equaliser settings for ASCOT tuners optimized */
if (priv->flags & CXD2841ER_ASCOT)
cxd2841er_write_regs(priv, I2C_SLVT, cxd2841er_write_regs(priv, I2C_SLVT,
0xA6, itbCoef6bw[priv->xtal], 14); 0xA6, itbCoef6bw[priv->xtal], 14);
...@@ -2826,6 +2838,7 @@ static int cxd2841er_sleep_tc_to_active_c_band(struct cxd2841er_priv *priv, ...@@ -2826,6 +2838,7 @@ static int cxd2841er_sleep_tc_to_active_c_band(struct cxd2841er_priv *priv,
switch (bandwidth) { switch (bandwidth) {
case 8000000: case 8000000:
case 7000000: case 7000000:
if (priv->flags & CXD2841ER_ASCOT)
cxd2841er_write_regs( cxd2841er_write_regs(
priv, I2C_SLVT, 0xa6, priv, I2C_SLVT, 0xa6,
bw7_8mhz_b10_a6, sizeof(bw7_8mhz_b10_a6)); bw7_8mhz_b10_a6, sizeof(bw7_8mhz_b10_a6));
...@@ -2833,6 +2846,7 @@ static int cxd2841er_sleep_tc_to_active_c_band(struct cxd2841er_priv *priv, ...@@ -2833,6 +2846,7 @@ static int cxd2841er_sleep_tc_to_active_c_band(struct cxd2841er_priv *priv,
iffreq = cxd2841er_calc_iffreq(ifhz); iffreq = cxd2841er_calc_iffreq(ifhz);
break; break;
case 6000000: case 6000000:
if (priv->flags & CXD2841ER_ASCOT)
cxd2841er_write_regs( cxd2841er_write_regs(
priv, I2C_SLVT, 0xa6, priv, I2C_SLVT, 0xa6,
bw6mhz_b10_a6, sizeof(bw6mhz_b10_a6)); bw6mhz_b10_a6, sizeof(bw6mhz_b10_a6));
...@@ -2924,8 +2938,9 @@ static int cxd2841er_sleep_tc_to_active_t(struct cxd2841er_priv *priv, ...@@ -2924,8 +2938,9 @@ static int cxd2841er_sleep_tc_to_active_t(struct cxd2841er_priv *priv,
cxd2841er_write_reg(priv, I2C_SLVT, 0x6a, 0x50); cxd2841er_write_reg(priv, I2C_SLVT, 0x6a, 0x50);
/* Set SLV-T Bank : 0x10 */ /* Set SLV-T Bank : 0x10 */
cxd2841er_write_reg(priv, I2C_SLVT, 0x00, 0x10); cxd2841er_write_reg(priv, I2C_SLVT, 0x00, 0x10);
/* ASCOT setting ON */ /* ASCOT setting */
cxd2841er_set_reg_bits(priv, I2C_SLVT, 0xa5, 0x01, 0x01); cxd2841er_set_reg_bits(priv, I2C_SLVT, 0xa5,
((priv->flags & CXD2841ER_ASCOT) ? 0x01 : 0x00), 0x01);
/* Set SLV-T Bank : 0x18 */ /* Set SLV-T Bank : 0x18 */
cxd2841er_write_reg(priv, I2C_SLVT, 0x00, 0x18); cxd2841er_write_reg(priv, I2C_SLVT, 0x00, 0x18);
/* Pre-RS BER moniter setting */ /* Pre-RS BER moniter setting */
...@@ -3002,8 +3017,9 @@ static int cxd2841er_sleep_tc_to_active_t2(struct cxd2841er_priv *priv, ...@@ -3002,8 +3017,9 @@ static int cxd2841er_sleep_tc_to_active_t2(struct cxd2841er_priv *priv,
cxd2841er_write_reg(priv, I2C_SLVT, 0x6a, 0x50); cxd2841er_write_reg(priv, I2C_SLVT, 0x6a, 0x50);
/* Set SLV-T Bank : 0x10 */ /* Set SLV-T Bank : 0x10 */
cxd2841er_write_reg(priv, I2C_SLVT, 0x00, 0x10); cxd2841er_write_reg(priv, I2C_SLVT, 0x00, 0x10);
/* ASCOT setting ON */ /* ASCOT setting */
cxd2841er_set_reg_bits(priv, I2C_SLVT, 0xa5, 0x01, 0x01); cxd2841er_set_reg_bits(priv, I2C_SLVT, 0xa5,
((priv->flags & CXD2841ER_ASCOT) ? 0x01 : 0x00), 0x01);
/* Set SLV-T Bank : 0x20 */ /* Set SLV-T Bank : 0x20 */
cxd2841er_write_reg(priv, I2C_SLVT, 0x00, 0x20); cxd2841er_write_reg(priv, I2C_SLVT, 0x00, 0x20);
/* Acquisition optimization setting */ /* Acquisition optimization setting */
...@@ -3140,8 +3156,9 @@ static int cxd2841er_sleep_tc_to_active_i(struct cxd2841er_priv *priv, ...@@ -3140,8 +3156,9 @@ static int cxd2841er_sleep_tc_to_active_i(struct cxd2841er_priv *priv,
cxd2841er_write_regs(priv, I2C_SLVT, 0x43, data, 2); cxd2841er_write_regs(priv, I2C_SLVT, 0x43, data, 2);
/* Enable ADC 4 */ /* Enable ADC 4 */
cxd2841er_write_reg(priv, I2C_SLVX, 0x18, 0x00); cxd2841er_write_reg(priv, I2C_SLVX, 0x18, 0x00);
/* ASCOT setting ON */ /* ASCOT setting */
cxd2841er_set_reg_bits(priv, I2C_SLVT, 0xa5, 0x01, 0x01); cxd2841er_set_reg_bits(priv, I2C_SLVT, 0xa5,
((priv->flags & CXD2841ER_ASCOT) ? 0x01 : 0x00), 0x01);
/* FEC Auto Recovery setting */ /* FEC Auto Recovery setting */
cxd2841er_set_reg_bits(priv, I2C_SLVT, 0x30, 0x01, 0x01); cxd2841er_set_reg_bits(priv, I2C_SLVT, 0x30, 0x01, 0x01);
cxd2841er_set_reg_bits(priv, I2C_SLVT, 0x31, 0x00, 0x01); cxd2841er_set_reg_bits(priv, I2C_SLVT, 0x31, 0x00, 0x01);
...@@ -3225,8 +3242,9 @@ static int cxd2841er_sleep_tc_to_active_c(struct cxd2841er_priv *priv, ...@@ -3225,8 +3242,9 @@ static int cxd2841er_sleep_tc_to_active_c(struct cxd2841er_priv *priv,
cxd2841er_write_reg(priv, I2C_SLVT, 0x6a, 0x48); cxd2841er_write_reg(priv, I2C_SLVT, 0x6a, 0x48);
/* Set SLV-T Bank : 0x10 */ /* Set SLV-T Bank : 0x10 */
cxd2841er_write_reg(priv, I2C_SLVT, 0x00, 0x10); cxd2841er_write_reg(priv, I2C_SLVT, 0x00, 0x10);
/* ASCOT setting ON */ /* ASCOT setting */
cxd2841er_set_reg_bits(priv, I2C_SLVT, 0xa5, 0x01, 0x01); cxd2841er_set_reg_bits(priv, I2C_SLVT, 0xa5,
((priv->flags & CXD2841ER_ASCOT) ? 0x01 : 0x00), 0x01);
/* Set SLV-T Bank : 0x40 */ /* Set SLV-T Bank : 0x40 */
cxd2841er_write_reg(priv, I2C_SLVT, 0x00, 0x40); cxd2841er_write_reg(priv, I2C_SLVT, 0x00, 0x40);
/* Demod setting */ /* Demod setting */
......
drivers/media/dvb-frontends/cxd2841er.h
View file @ 7afe510a
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#define CXD2841ER_USE_GATECTRL 1 /* bit 0 */ #define CXD2841ER_USE_GATECTRL 1 /* bit 0 */
#define CXD2841ER_AUTO_IFHZ 2 /* bit 1 */ #define CXD2841ER_AUTO_IFHZ 2 /* bit 1 */
#define CXD2841ER_TS_SERIAL 4 /* bit 2 */ #define CXD2841ER_TS_SERIAL 4 /* bit 2 */
#define CXD2841ER_ASCOT 8 /* bit 3 */
enum cxd2841er_xtal { enum cxd2841er_xtal {
SONY_XTAL_20500, /* 20.5 MHz */ SONY_XTAL_20500, /* 20.5 MHz */
......
drivers/media/pci/netup_unidvb/netup_unidvb_core.c
View file @ 7afe510a
...@@ -123,7 +123,7 @@ static void netup_unidvb_queue_cleanup(struct netup_dma *dma); ...@@ -123,7 +123,7 @@ static void netup_unidvb_queue_cleanup(struct netup_dma *dma);
static struct cxd2841er_config demod_config = { static struct cxd2841er_config demod_config = {
.i2c_addr = 0xc8, .i2c_addr = 0xc8,
.xtal = SONY_XTAL_24000, .xtal = SONY_XTAL_24000,
.flags = CXD2841ER_USE_GATECTRL .flags = CXD2841ER_USE_GATECTRL | CXD2841ER_ASCOT
}; };
static struct horus3a_config horus3a_conf = { static struct horus3a_config horus3a_conf = {
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7