diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-01-20 17:13:07 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-01-21 10:46:35 -0500 |
commit | 6fb65a66a227013ba1825efcf47e3c5df1a39131 (patch) | |
tree | 887f0df97560137b7de41fb4843c6879ebd7bf33 /drivers/media/dvb/frontends/drxk_hard.c | |
parent | 6e5caf8493fabbb1c6aec1cb98adb9667182a1c6 (diff) |
[media] drxk: add support for Mpeg output clock drive strength config
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb/frontends/drxk_hard.c')
-rw-r--r-- | drivers/media/dvb/frontends/drxk_hard.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/media/dvb/frontends/drxk_hard.c b/drivers/media/dvb/frontends/drxk_hard.c index 65703968d8ae..d25b0d20038b 100644 --- a/drivers/media/dvb/frontends/drxk_hard.c +++ b/drivers/media/dvb/frontends/drxk_hard.c | |||
@@ -91,10 +91,6 @@ bool IsA1WithRomCode(struct drxk_state *state) | |||
91 | #define DRXK_MPEG_PARALLEL_OUTPUT_PIN_DRIVE_STRENGTH (0x03) | 91 | #define DRXK_MPEG_PARALLEL_OUTPUT_PIN_DRIVE_STRENGTH (0x03) |
92 | #endif | 92 | #endif |
93 | 93 | ||
94 | #ifndef DRXK_MPEG_OUTPUT_CLK_DRIVE_STRENGTH | ||
95 | #define DRXK_MPEG_OUTPUT_CLK_DRIVE_STRENGTH (0x06) | ||
96 | #endif | ||
97 | |||
98 | #define DEFAULT_DRXK_MPEG_LOCK_TIMEOUT 700 | 94 | #define DEFAULT_DRXK_MPEG_LOCK_TIMEOUT 700 |
99 | #define DEFAULT_DRXK_DEMOD_LOCK_TIMEOUT 500 | 95 | #define DEFAULT_DRXK_DEMOD_LOCK_TIMEOUT 500 |
100 | 96 | ||
@@ -659,7 +655,6 @@ static int init_state(struct drxk_state *state) | |||
659 | u32 ulGPIOCfg = 0x0113; | 655 | u32 ulGPIOCfg = 0x0113; |
660 | u32 ulInvertTSClock = 0; | 656 | u32 ulInvertTSClock = 0; |
661 | u32 ulTSDataStrength = DRXK_MPEG_SERIAL_OUTPUT_PIN_DRIVE_STRENGTH; | 657 | u32 ulTSDataStrength = DRXK_MPEG_SERIAL_OUTPUT_PIN_DRIVE_STRENGTH; |
662 | u32 ulTSClockkStrength = DRXK_MPEG_OUTPUT_CLK_DRIVE_STRENGTH; | ||
663 | u32 ulDVBTBitrate = 50000000; | 658 | u32 ulDVBTBitrate = 50000000; |
664 | u32 ulDVBCBitrate = DRXK_QAM_SYMBOLRATE_MAX * 8; | 659 | u32 ulDVBCBitrate = DRXK_QAM_SYMBOLRATE_MAX * 8; |
665 | 660 | ||
@@ -820,7 +815,6 @@ static int init_state(struct drxk_state *state) | |||
820 | state->m_DVBCBitrate = ulDVBCBitrate; | 815 | state->m_DVBCBitrate = ulDVBCBitrate; |
821 | 816 | ||
822 | state->m_TSDataStrength = (ulTSDataStrength & 0x07); | 817 | state->m_TSDataStrength = (ulTSDataStrength & 0x07); |
823 | state->m_TSClockkStrength = (ulTSClockkStrength & 0x07); | ||
824 | 818 | ||
825 | /* Maximum bitrate in b/s in case static clockrate is selected */ | 819 | /* Maximum bitrate in b/s in case static clockrate is selected */ |
826 | state->m_mpegTsStaticBitrate = 19392658; | 820 | state->m_mpegTsStaticBitrate = 19392658; |
@@ -6394,6 +6388,12 @@ struct dvb_frontend *drxk_attach(const struct drxk_config *config, | |||
6394 | state->m_DVBCStaticCLK = 1; | 6388 | state->m_DVBCStaticCLK = 1; |
6395 | } | 6389 | } |
6396 | 6390 | ||
6391 | |||
6392 | if (config->mpeg_out_clk_strength) | ||
6393 | state->m_TSClockkStrength = config->mpeg_out_clk_strength & 0x07; | ||
6394 | else | ||
6395 | state->m_TSClockkStrength = 0x06; | ||
6396 | |||
6397 | if (config->parallel_ts) | 6397 | if (config->parallel_ts) |
6398 | state->m_enableParallel = true; | 6398 | state->m_enableParallel = true; |
6399 | else | 6399 | else |