[PATCH 3/4] si2165: cleanup logic

[Matthias Schwarzott]

Make si2165_set_if_freq_shift query IF frequency itself.
create function to write a set of registers
Always write adc registers after reset.

Signed-off-by: Matthias Schwarzott 
---
 drivers/media/dvb-frontends/si2165.c | 173 ++-
 1 file changed, 87 insertions(+), 86 deletions(-)

diff --git a/drivers/media/dvb-frontends/si2165.c 
b/drivers/media/dvb-frontends/si2165.c
index c5d7c0d..c87d927 100644
--- a/drivers/media/dvb-frontends/si2165.c
+++ b/drivers/media/dvb-frontends/si2165.c
@@ -243,6 +243,27 @@ err:
return ret;
 }
 
+#define REG16(reg, val) { (reg), (val) & 0xff }, { (reg)+1, (val)>>8 & 0xff }
+struct si2165_reg_value_pair {
+   u16 reg;
+   u8 val;
+};
+
+static int si2165_write_reg_list(struct si2165_state *state,
+const struct si2165_reg_value_pair *regs,
+int count)
+{
+   int i;
+   int ret;
+
+   for (i = 0; i < count; i++) {
+   ret = si2165_writereg8(state, regs[i].reg, regs[i].val);
+   if (ret < 0)
+   return ret;
+   }
+   return 0;
+}
+
 static int si2165_get_tune_settings(struct dvb_frontend *fe,
struct dvb_frontend_tune_settings *s)
 {
@@ -669,22 +690,19 @@ static int si2165_init(struct dvb_frontend *fe)
goto error;
}
 
-   /* write adc values after each reset*/
-   ret = si2165_writereg8(state, 0x012a, 0x46);
-   if (ret < 0)
-   goto error;
-   ret = si2165_writereg8(state, 0x012c, 0x00);
+   /* ts output config */
+   ret = si2165_writereg8(state, 0x04e4, 0x20);
if (ret < 0)
-   goto error;
-   ret = si2165_writereg8(state, 0x012e, 0x0a);
+   return ret;
+   ret = si2165_writereg16(state, 0x04ef, 0x00fe);
if (ret < 0)
-   goto error;
-   ret = si2165_writereg8(state, 0x012f, 0xff);
+   return ret;
+   ret = si2165_writereg24(state, 0x04f4, 0x55);
if (ret < 0)
-   goto error;
-   ret = si2165_writereg8(state, 0x0123, 0x70);
+   return ret;
+   ret = si2165_writereg8(state, 0x04e5, 0x01);
if (ret < 0)
-   goto error;
+   return ret;
 
return 0;
 error:
@@ -746,12 +764,22 @@ static int si2165_set_oversamp(struct si2165_state 
*state, u32 dvb_rate)
return si2165_writereg32(state, 0x00e4, reg_value);
 }
 
-static int si2165_set_if_freq_shift(struct si2165_state *state, u32 IF)
+static int si2165_set_if_freq_shift(struct si2165_state *state)
 {
+   struct dvb_frontend *fe = &(state->frontend);
u64 if_freq_shift;
s32 reg_value = 0;
u32 fe_clk = si2165_get_fe_clk(state);
+   u32 IF = 0;
+
+   if (!fe->ops.tuner_ops.get_if_frequency) {
+   dev_err(>i2c->dev,
+   "%s: Error: get_if_frequency() not defined at tuner. 
Can't work without it!\n",
+   KBUILD_MODNAME);
+   return -EINVAL;
+   }
 
+   fe->ops.tuner_ops.get_if_frequency(fe, );
if_freq_shift = IF;
if_freq_shift <<= 29;
 
@@ -767,35 +795,53 @@ static int si2165_set_if_freq_shift(struct si2165_state 
*state, u32 IF)
return si2165_writereg32(state, 0x00e8, reg_value);
 }
 
+static const struct si2165_reg_value_pair agc_rewrite[] = {
+   { 0x012a, 0x46 },
+   { 0x012c, 0x00 },
+   { 0x012e, 0x0a },
+   { 0x012f, 0xff },
+   { 0x0123, 0x70 }
+};
+
+static const struct si2165_reg_value_pair dvbt_regs[] = {
+   /* impulsive_noise_remover */
+   { 0x031c, 0x01 },
+   { 0x00cb, 0x00 },
+   /* agc2 */
+   { 0x016e, 0x41 },
+   { 0x016c, 0x0e },
+   { 0x016d, 0x10 },
+   /* agc */
+   { 0x015b, 0x03 },
+   { 0x0150, 0x78 },
+   /* agc */
+   { 0x01a0, 0x78 },
+   { 0x01c8, 0x68 },
+   /* freq_sync_range */
+   REG16(0x030c, 0x0064),
+   /* gp_reg0 */
+   { 0x0387, 0x00 }
+};
+
 static int si2165_set_parameters(struct dvb_frontend *fe)
 {
int ret;
struct dtv_frontend_properties *p = >dtv_property_cache;
struct si2165_state *state = fe->demodulator_priv;
-   u8 val[3];
-   u32 IF;
u32 dvb_rate = 0;
u16 bw10k;
+   u32 bw_hz = p->bandwidth_hz;
 
dprintk("%s: called\n", __func__);
 
-   if (!fe->ops.tuner_ops.get_if_frequency) {
-   dev_err(>i2c->dev,
-   "%s: Error: get_if_frequency() not defined at tuner. 
Can't work without it!\n",
-   KBUILD_MODNAME);
-   return -EINVAL;
-   }
-
if (!state->has_dvbt)
return -EINVAL;
 
-   if (p->bandwidth_hz > 0) {
-   dvb_rate = p->bandwidth_hz * 8 / 7;
-   bw10k = p->bandwidth_hz / 1;
-   } else {
-   dvb_rate = 8 * 8 / 7;
- 

Re: [PATCH 3/4] si2165: cleanup logic

[kbuild test robot]

Hi Matthias,

[auto build test ERROR on v4.3-rc7]
[also build test ERROR on next-20151113]

url:
https://github.com/0day-ci/linux/commits/Matthias-Schwarzott/cx231xx_dvb-use-demod_i2c-for-demod-attach/20151114-065917
config: xtensa-allyesconfig (attached as .config)
reproduce:
wget 
https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross
 -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
make.cross ARCH=xtensa 

Note: the 
linux-review/Matthias-Schwarzott/cx231xx_dvb-use-demod_i2c-for-demod-attach/20151114-065917
 HEAD 92eaa21d1f22e14d623c057e06ab9d5035f6df7b builds fine.
  It only hurts bisectibility.

All errors (new ones prefixed by >>):

   drivers/media/dvb-frontends/si2165.c: In function 'si2165_set_parameters':
>> drivers/media/dvb-frontends/si2165.c:886:39: error: 'val' undeclared (first 
>> use in this function)
 ret = si2165_readreg8(state, 0x0341, val);
  ^
   drivers/media/dvb-frontends/si2165.c:886:39: note: each undeclared 
identifier is reported only once for each function it appears in
>> drivers/media/dvb-frontends/si2165.c:905:3: error: label 'error' used but 
>> not defined
  goto error;
  ^

vim +/val +886 drivers/media/dvb-frontends/si2165.c

3e54a169 Matthias Schwarzott 2014-07-22  880/* recalc if_freq_shift if IF 
might has changed */
b480ae7b Matthias Schwarzott 2015-11-13  881ret = 
si2165_set_if_freq_shift(state);
3e54a169 Matthias Schwarzott 2014-07-22  882if (ret < 0)
3e54a169 Matthias Schwarzott 2014-07-22  883return ret;
3e54a169 Matthias Schwarzott 2014-07-22  884  
3e54a169 Matthias Schwarzott 2014-07-22  885/* boot/wdog status */
3e54a169 Matthias Schwarzott 2014-07-22 @886ret = si2165_readreg8(state, 
0x0341, val);
3e54a169 Matthias Schwarzott 2014-07-22  887if (ret < 0)
3e54a169 Matthias Schwarzott 2014-07-22  888return ret;
3e54a169 Matthias Schwarzott 2014-07-22  889ret = si2165_writereg8(state, 
0x0341, 0x00);
3e54a169 Matthias Schwarzott 2014-07-22  890if (ret < 0)
3e54a169 Matthias Schwarzott 2014-07-22  891return ret;
3e54a169 Matthias Schwarzott 2014-07-22  892/* reset all */
3e54a169 Matthias Schwarzott 2014-07-22  893ret = si2165_writereg8(state, 
0x00c0, 0x00);
3e54a169 Matthias Schwarzott 2014-07-22  894if (ret < 0)
3e54a169 Matthias Schwarzott 2014-07-22  895return ret;
3e54a169 Matthias Schwarzott 2014-07-22  896/* gp_reg0 */
3e54a169 Matthias Schwarzott 2014-07-22  897ret = si2165_writereg32(state, 
0x0384, 0x);
3e54a169 Matthias Schwarzott 2014-07-22  898if (ret < 0)
3e54a169 Matthias Schwarzott 2014-07-22  899return ret;
b480ae7b Matthias Schwarzott 2015-11-13  900  
b480ae7b Matthias Schwarzott 2015-11-13  901/* write adc values after each 
reset*/
b480ae7b Matthias Schwarzott 2015-11-13  902ret = 
si2165_write_reg_list(state, agc_rewrite,
b480ae7b Matthias Schwarzott 2015-11-13  903
ARRAY_SIZE(agc_rewrite));
b480ae7b Matthias Schwarzott 2015-11-13  904if (ret < 0)
b480ae7b Matthias Schwarzott 2015-11-13 @905goto error;
b480ae7b Matthias Schwarzott 2015-11-13  906  
3e54a169 Matthias Schwarzott 2014-07-22  907/* start_synchro */
3e54a169 Matthias Schwarzott 2014-07-22  908ret = si2165_writereg8(state, 
0x02e0, 0x01);

:: The code at line 886 was first introduced by commit
:: 3e54a1697ace99d1ad602ec268abf117ace1412f [media] si2165: Add demod 
driver for DVB-T only

:: TO: Matthias Schwarzott 
:: CC: Mauro Carvalho Chehab 

---
0-DAY kernel test infrastructureOpen Source Technology Center
https://lists.01.org/pipermail/kbuild-all   Intel Corporation


.config.gz
Description: Binary data