commit 41149914db8535e076cf8e8822a7cc354dabda95
author Ke Dong <kedong@google.com> Wed Feb 11 09:49:52 2015 -0800
committer Ke Dong <kedong@google.com> Fri Feb 20 19:13:27 2015 -0800
tree 21f92ed349f5c9d3836ba2058062b1b4cc5287ec
parent ffff490f5aed6f6235d990aee70200d803521758

Fix tuner address to 0x21.

Since TPM uses i2c address 0x20, tuner i2c address has to be fixed to
0x21.

Google-Bug-Id: 19432272
Change-Id: I2824b1a08ecc2ec1b4148587654e248147cded53

drivers/media/dvb/frontends/dvbsky_m88rs6000.c

diff --git a/drivers/media/dvb/frontends/dvbsky_m88rs6000.c b/drivers/media/dvb/frontends/dvbsky_m88rs6000.c
index dcb9f29..ee27a90 100644
--- a/drivers/media/dvb/frontends/dvbsky_m88rs6000.c
+++ b/drivers/media/dvb/frontends/dvbsky_m88rs6000.c
@@ -1528,8 +1528,9 @@
 
 	dprintk("%s()\n", __func__);
 	
-	val = m88rs6000_readreg(state, 0x29);
-	state->tuner_addr = ( val & 0x80) ? 0x20 : 0x21;	
+	/* Use 0x21 for tuner address since 0x20 is used by TPM. */
+	m88rs6000_writereg(state, 0x29, 0x7f & m88rs6000_readreg(state, 0x29));
+	state->tuner_addr = 0x21;
 	
 	m88rs6000_initfe(fe);