mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-23 20:53:53 +08:00
V4L/DVB (10119): em28xx: fix corrupted XCLK value
Correct problem introduced during the board refactoring where the XCLK frequency would get zero'd out. The sequence of events was as follows: em28xx_pre_card_setup() called em28xx_set_model() em28xx_set_model() would memcpy to dev->board configuration em28xx_pre_card_setup() would set the dev->board.xclk if not set em28xx_pre_card_setup() would set the XCLK register based on dev->board.xclk ... em28xx_card_setup() would call em28xx_set_model() em28xx_set_model() would memcpy to dev->board configuration (clearing out value of dev->board.xclk set in em28xx_pre_card_setup) ... em28xx_audio_analog_set() sets the XCLK register based on dev->board.xclk (which now contains zero) The change sets the default XCLK and I2C Clock fields in the board definition inside of em28xx_set_model() so that subsequent calls do not cause the values to be overwritten. Signed-off-by: Devin Heitmueller <dheitmueller@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
parent
60b4bde48b
commit
ed14e1c2f4
@ -1403,6 +1403,17 @@ EXPORT_SYMBOL_GPL(em28xx_tuner_callback);
|
||||
static void inline em28xx_set_model(struct em28xx *dev)
|
||||
{
|
||||
memcpy(&dev->board, &em28xx_boards[dev->model], sizeof(dev->board));
|
||||
|
||||
/* Those are the default values for the majority of boards
|
||||
Use those values if not specified otherwise at boards entry
|
||||
*/
|
||||
if (!dev->board.xclk)
|
||||
dev->board.xclk = EM28XX_XCLK_IR_RC5_MODE |
|
||||
EM28XX_XCLK_FREQUENCY_12MHZ;
|
||||
|
||||
if (!dev->board.i2c_speed)
|
||||
dev->board.i2c_speed = EM28XX_I2C_CLK_WAIT_ENABLE |
|
||||
EM28XX_I2C_FREQ_100_KHZ;
|
||||
}
|
||||
|
||||
/* Since em28xx_pre_card_setup() requires a proper dev->model,
|
||||
@ -1464,17 +1475,8 @@ void em28xx_pre_card_setup(struct em28xx *dev)
|
||||
if (rc >= 0)
|
||||
dev->reg_gpo = rc;
|
||||
|
||||
/* Those are the default values for the majority of boards
|
||||
Use those values if not specified otherwise at boards entry
|
||||
*/
|
||||
if (!dev->board.xclk)
|
||||
dev->board.xclk = EM28XX_XCLK_IR_RC5_MODE |
|
||||
EM28XX_XCLK_FREQUENCY_12MHZ;
|
||||
|
||||
if (!dev->board.i2c_speed)
|
||||
dev->board.i2c_speed = EM28XX_I2C_CLK_WAIT_ENABLE |
|
||||
EM28XX_I2C_FREQ_100_KHZ;
|
||||
|
||||
/* Set the initial XCLK and I2C clock values based on the board
|
||||
definition */
|
||||
em28xx_write_reg(dev, EM28XX_R0F_XCLK, dev->board.xclk & 0x7f);
|
||||
em28xx_write_reg(dev, EM28XX_R06_I2C_CLK, dev->board.i2c_speed);
|
||||
msleep(50);
|
||||
|
Loading…
Reference in New Issue
Block a user