diff options
author | Antti Palosaari <crope@iki.fi> | 2011-04-27 20:03:07 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-05-20 08:30:00 -0400 |
commit | 107d7b181ddeaeea92d1aa25f2e1e5a3acb7da40 (patch) | |
tree | 1b18ffd6a3f729b5ea876ef9c0bfeefc6f3975d6 /drivers | |
parent | f3b1af19647f375efb96cbd0589f9279caea7023 (diff) |
[media] cx24116: add config option to split firmware download
It is very rare I2C adapter hardware which can provide 32kB I2C write
as one write. Add .i2c_wr_max option to set desired max packet size.
Split transaction to smaller pieces according to that option.
Signed-off-by: Antti Palosaari <crope@iki.fi>
Cc: Steven Toth <stoth@hauppauge.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/media/dvb/frontends/cx24116.c | 17 | ||||
-rw-r--r-- | drivers/media/dvb/frontends/cx24116.h | 3 |
2 files changed, 17 insertions, 3 deletions
diff --git a/drivers/media/dvb/frontends/cx24116.c b/drivers/media/dvb/frontends/cx24116.c index cf1ec6c82042..26e65a66719a 100644 --- a/drivers/media/dvb/frontends/cx24116.c +++ b/drivers/media/dvb/frontends/cx24116.c | |||
@@ -566,7 +566,7 @@ static int cx24116_load_firmware(struct dvb_frontend *fe, | |||
566 | { | 566 | { |
567 | struct cx24116_state *state = fe->demodulator_priv; | 567 | struct cx24116_state *state = fe->demodulator_priv; |
568 | struct cx24116_cmd cmd; | 568 | struct cx24116_cmd cmd; |
569 | int i, ret; | 569 | int i, ret, len, remaining; |
570 | unsigned char vers[4]; | 570 | unsigned char vers[4]; |
571 | 571 | ||
572 | dprintk("%s\n", __func__); | 572 | dprintk("%s\n", __func__); |
@@ -603,8 +603,19 @@ static int cx24116_load_firmware(struct dvb_frontend *fe, | |||
603 | cx24116_writereg(state, 0xF5, 0x00); | 603 | cx24116_writereg(state, 0xF5, 0x00); |
604 | cx24116_writereg(state, 0xF6, 0x00); | 604 | cx24116_writereg(state, 0xF6, 0x00); |
605 | 605 | ||
606 | /* write the entire firmware as one transaction */ | 606 | /* Split firmware to the max I2C write len and write. |
607 | cx24116_writeregN(state, 0xF7, fw->data, fw->size); | 607 | * This overflows 16 bit intentionally in order to get max write |
608 | * len when i2c_wr_max is set to 0. */ | ||
609 | for (remaining = fw->size; remaining > 0; | ||
610 | remaining -= (u16) (state->config->i2c_wr_max - 1)) { | ||
611 | |||
612 | len = remaining; | ||
613 | if (len > (u16) (state->config->i2c_wr_max - 1)) | ||
614 | len = (u16) (state->config->i2c_wr_max - 1); | ||
615 | |||
616 | cx24116_writeregN(state, 0xF7, &fw->data[fw->size - remaining], | ||
617 | len); | ||
618 | } | ||
608 | 619 | ||
609 | cx24116_writereg(state, 0xF4, 0x10); | 620 | cx24116_writereg(state, 0xF4, 0x10); |
610 | cx24116_writereg(state, 0xF0, 0x00); | 621 | cx24116_writereg(state, 0xF0, 0x00); |
diff --git a/drivers/media/dvb/frontends/cx24116.h b/drivers/media/dvb/frontends/cx24116.h index b1b76b47a14c..7d90ab949c03 100644 --- a/drivers/media/dvb/frontends/cx24116.h +++ b/drivers/media/dvb/frontends/cx24116.h | |||
@@ -35,6 +35,9 @@ struct cx24116_config { | |||
35 | 35 | ||
36 | /* Need to set MPEG parameters */ | 36 | /* Need to set MPEG parameters */ |
37 | u8 mpg_clk_pos_pol:0x02; | 37 | u8 mpg_clk_pos_pol:0x02; |
38 | |||
39 | /* max bytes I2C provider can write at once */ | ||
40 | u16 i2c_wr_max; | ||
38 | }; | 41 | }; |
39 | 42 | ||
40 | #if defined(CONFIG_DVB_CX24116) || \ | 43 | #if defined(CONFIG_DVB_CX24116) || \ |