leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[media] drxk: add support for Mpeg output clock drive strength config

Browse Source 
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Mauro Carvalho Chehab 2012-01-20 19:13:07 -03:00
parent 6e5caf8493
commit 6fb65a66a2
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/media/dvb/dvb-usb/az6007.c
View File

@ -69,6 +69,7 @@ static struct drxk_config terratec_h7_drxk = {
.single_master = true, .single_master = true,
.no_i2c_bridge = false, .no_i2c_bridge = false,
.chunk_size = 64, .chunk_size = 64,
.mpeg_out_clk_strength = 0x02,
.microcode_name = "dvb-usb-terratec-h7-az6007.fw", .microcode_name = "dvb-usb-terratec-h7-az6007.fw",
}; };
@ -278,12 +279,10 @@ static int az6007_led_on_off(struct usb_interface *intf, int onoff)
{ {
struct usb_device *udev = interface_to_usbdev(intf); struct usb_device *udev = interface_to_usbdev(intf);
int ret; int ret;
/* TS through */ /* TS through */
ret = az6007_write(udev, AZ6007_POWER, onoff, 0, NULL, 0); ret = az6007_write(udev, AZ6007_POWER, onoff, 0, NULL, 0);
if (ret < 0) if (ret < 0)
err("%s failed with error %d", __func__, ret); err("%s failed with error %d", __func__, ret);
return ret; return ret;
} }

2
drivers/media/dvb/frontends/drxk.h
View File

@ -17,6 +17,7 @@
* @antenna_gpio: GPIO bit used to control the antenna * @antenna_gpio: GPIO bit used to control the antenna
* @antenna_dvbt: GPIO bit for changing antenna to DVB-C. A value of 1 * @antenna_dvbt: GPIO bit for changing antenna to DVB-C. A value of 1
* means that 1=DVBC, 0 = DVBT. Zero means the opposite. * means that 1=DVBC, 0 = DVBT. Zero means the opposite.
* @mpeg_out_clk_strength: DRXK Mpeg output clock drive strength.
* @microcode_name: Name of the firmware file with the microcode * @microcode_name: Name of the firmware file with the microcode
* *
* On the *_gpio vars, bit 0 is UIO-1, bit 1 is UIO-2 and bit 2 is * On the *_gpio vars, bit 0 is UIO-1, bit 1 is UIO-2 and bit 2 is
@ -32,6 +33,7 @@ struct drxk_config {
bool antenna_dvbt; bool antenna_dvbt;
u16 antenna_gpio; u16 antenna_gpio;
u8 mpeg_out_clk_strength;
int chunk_size; int chunk_size;
const char *microcode_name; const char *microcode_name;

12
drivers/media/dvb/frontends/drxk_hard.c
View File

@ -91,10 +91,6 @@ bool IsA1WithRomCode(struct drxk_state *state)
#define DRXK_MPEG_PARALLEL_OUTPUT_PIN_DRIVE_STRENGTH (0x03) #define DRXK_MPEG_PARALLEL_OUTPUT_PIN_DRIVE_STRENGTH (0x03)
#endif #endif
#ifndef DRXK_MPEG_OUTPUT_CLK_DRIVE_STRENGTH
#define DRXK_MPEG_OUTPUT_CLK_DRIVE_STRENGTH (0x06)
#endif
#define DEFAULT_DRXK_MPEG_LOCK_TIMEOUT 700 #define DEFAULT_DRXK_MPEG_LOCK_TIMEOUT 700
#define DEFAULT_DRXK_DEMOD_LOCK_TIMEOUT 500 #define DEFAULT_DRXK_DEMOD_LOCK_TIMEOUT 500
@ -659,7 +655,6 @@ static int init_state(struct drxk_state *state)
u32 ulGPIOCfg = 0x0113; u32 ulGPIOCfg = 0x0113;
u32 ulInvertTSClock = 0; u32 ulInvertTSClock = 0;
u32 ulTSDataStrength = DRXK_MPEG_SERIAL_OUTPUT_PIN_DRIVE_STRENGTH; u32 ulTSDataStrength = DRXK_MPEG_SERIAL_OUTPUT_PIN_DRIVE_STRENGTH;
u32 ulTSClockkStrength = DRXK_MPEG_OUTPUT_CLK_DRIVE_STRENGTH;
u32 ulDVBTBitrate = 50000000; u32 ulDVBTBitrate = 50000000;
u32 ulDVBCBitrate = DRXK_QAM_SYMBOLRATE_MAX * 8; u32 ulDVBCBitrate = DRXK_QAM_SYMBOLRATE_MAX * 8;
@ -820,7 +815,6 @@ static int init_state(struct drxk_state *state)
state->m_DVBCBitrate = ulDVBCBitrate; state->m_DVBCBitrate = ulDVBCBitrate;
state->m_TSDataStrength = (ulTSDataStrength & 0x07); state->m_TSDataStrength = (ulTSDataStrength & 0x07);
state->m_TSClockkStrength = (ulTSClockkStrength & 0x07);
/* Maximum bitrate in b/s in case static clockrate is selected */ /* Maximum bitrate in b/s in case static clockrate is selected */
state->m_mpegTsStaticBitrate = 19392658; state->m_mpegTsStaticBitrate = 19392658;
@ -6394,6 +6388,12 @@ struct dvb_frontend *drxk_attach(const struct drxk_config *config,
state->m_DVBCStaticCLK = 1; state->m_DVBCStaticCLK = 1;
} }
if (config->mpeg_out_clk_strength)
state->m_TSClockkStrength = config->mpeg_out_clk_strength & 0x07;
else
state->m_TSClockkStrength = 0x06;
if (config->parallel_ts) if (config->parallel_ts)
state->m_enableParallel = true; state->m_enableParallel = true;
else else