tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[PATCH] dvb: tda1004x: allow N_I2C to be overridden by the card driver

allow N_I2C to be overridden by the card driver (Andreas Oberritter)

Signed-off-by: Johannes Stezenbach <js@linuxtv.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by

Johannes Stezenbach and committed by
Linus Torvalds 1dfb800f dd102c75

+5 -2
unified split
+2 -2
drivers/media/dvb/frontends/tda1004x.c
··· 406 406 407 407 /* set parameters */ 408 408 tda1004x_write_byteI(state, TDA10046H_CONFPLL2, 10); 409 - tda1004x_write_byteI(state, TDA10046H_CONFPLL3, 0); 409 + tda1004x_write_byteI(state, TDA10046H_CONFPLL3, state->config->n_i2c); 410 410 tda1004x_write_byteI(state, TDA10046H_FREQ_OFFSET, 99); 411 411 tda1004x_write_byteI(state, TDA10046H_FREQ_PHY2_MSB, 0xd4); 412 412 tda1004x_write_byteI(state, TDA10046H_FREQ_PHY2_LSB, 0x2c); ··· 547 547 tda1004x_write_mask(state, TDA1004X_AUTO, 8, 0); // select HP stream 548 548 tda1004x_write_mask(state, TDA1004X_CONFC1, 0x80, 0); // disable pulse killer 549 549 tda1004x_write_byteI(state, TDA10046H_CONFPLL2, 10); // PLL M = 10 550 - tda1004x_write_byteI(state, TDA10046H_CONFPLL3, 0); // PLL P = N = 0 550 + tda1004x_write_byteI(state, TDA10046H_CONFPLL3, state->config->n_i2c); // PLL P = N = 0 551 551 tda1004x_write_byteI(state, TDA10046H_FREQ_OFFSET, 99); // FREQOFFS = 99 552 552 tda1004x_write_byteI(state, TDA10046H_FREQ_PHY2_MSB, 0xd4); // } PHY2 = -11221 553 553 tda1004x_write_byteI(state, TDA10046H_FREQ_PHY2_LSB, 0x2c); // }
+3
drivers/media/dvb/frontends/tda1004x.h
··· 37 37 /* Does the OCLK signal need inverted? */ 38 38 u8 invert_oclk; 39 39 40 + /* value of N_I2C of the CONF_PLL3 register */ 41 + u8 n_i2c; 42 + 40 43 /* PLL maintenance */ 41 44 int (*pll_init)(struct dvb_frontend* fe); 42 45 int (*pll_set)(struct dvb_frontend* fe, struct dvb_frontend_parameters* params);