commit 15bb366e86e07820374ec313170aab65d4e1d983
author Manu Abraham <abraham.manu@gmail.com> Wed Apr 08 20:14:00 2009 -0300
committer Mauro Carvalho Chehab <mchehab@redhat.com> Tue Jun 16 18:20:39 2009 -0300
tree 0e045378faddba2fbc807b345b0dbf128025d480
parent 94a809143a47343b45c73e84f7f26e3087c2fd62

V4L/DVB (11588): stv090x: support > 60MSPS, simplify Srate calculation

Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

drivers/media/dvb/frontends/stv090x.c

diff --git a/drivers/media/dvb/frontends/stv090x.c b/drivers/media/dvb/frontends/stv090x.c
index a350364..6e7c47a 100644
--- a/drivers/media/dvb/frontends/stv090x.c
+++ b/drivers/media/dvb/frontends/stv090x.c
@@ -725,18 +725,22 @@
 {
 	u32 sym;
 
-	if (srate > 6000000) {
-		sym  = (srate / 1000) * 65536;
-		sym /= (state->mclk / 1000);
+	if (srate > 60000000) {
+		sym  = (srate << 4); /* SR * 2^16 / master_clk */
+		sym /= (state->mclk >> 12);
+	} else if (srate > 6000000) {
+		sym  = (srate << 6);
+		sym /= (state->mclk >> 10);
 	} else {
-		sym  = (srate / 100) * 65536;
-		sym /= (state->mclk / 100);
+		sym  = (srate << 9);
+		sym /= (state->mclk >> 7);
 	}
 
-	if (STV090x_WRITE_DEMOD(state, SFRINIT1, (sym >> 8) & 0xff) < 0) /* MSB */
+	if (STV090x_WRITE_DEMOD(state, SFRINIT1, (sym >> 8) & 0x7f) < 0) /* MSB */
 		goto err;
 	if (STV090x_WRITE_DEMOD(state, SFRINIT0, (sym & 0xff)) < 0) /* LSB */
 		goto err;
+
 	return 0;
 err:
 	dprintk(FE_ERROR, 1, "I/O error");
@@ -748,17 +752,29 @@
 	u32 sym;
 
 	srate = 105 * (srate / 100);
-	if (srate > 6000000) {
-		sym  = (srate / 1000) * 65536;
-		sym /= (clk / 1000);
+	if (srate > 60000000) {
+		sym  = (srate << 4); /* SR * 2^16 / master_clk */
+		sym /= (state->mclk >> 12);
+	} else if (srate > 6000000) {
+		sym  = (srate << 6);
+		sym /= (state->mclk >> 10);
 	} else {
-		sym  = (srate / 100) * 65536;
-		sym /= (clk / 100);
+		sym  = (srate << 9);
+		sym /= (state->mclk >> 7);
 	}
-	if (STV090x_WRITE_DEMOD(state, SFRUP1, (sym >> 8) & 0x7f) < 0) /* MSB */
-		goto err;
-	if (STV090x_WRITE_DEMOD(state, SFRUP0, sym & 0xff) < 0) /* LSB */
-		goto err;
+
+	if (sym < 0x7fff) {
+		if (STV090x_WRITE_DEMOD(state, SFRUP1, (sym >> 8) & 0x7f) < 0) /* MSB */
+			goto err;
+		if (STV090x_WRITE_DEMOD(state, SFRUP0, sym & 0xff) < 0) /* LSB */
+			goto err;
+	} else {
+		if (STV090x_WRITE_DEMOD(state, SFRUP1, 0x7f) < 0) /* MSB */
+			goto err;
+		if (STV090x_WRITE_DEMOD(state, SFRUP0, 0xff) < 0) /* LSB */
+			goto err;
+	}
+
 	return 0;
 err:
 	dprintk(FE_ERROR, 1, "I/O error");
@@ -770,13 +786,17 @@
 	u32 sym;
 
 	srate = 95 * (srate / 100);
-	if (srate > 6000000) {
-		sym  = (srate / 1000) * 65536;
-		sym /= (clk / 1000);
+	if (srate > 60000000) {
+		sym  = (srate << 4); /* SR * 2^16 / master_clk */
+		sym /= (state->mclk >> 12);
+	} else if (srate > 6000000) {
+		sym  = (srate << 6);
+		sym /= (state->mclk >> 10);
 	} else {
-		sym  = (srate / 100) * 65536;
-		sym /= (clk / 100);
+		sym  = (srate << 9);
+		sym /= (state->mclk >> 7);
 	}
+
 	if (STV090x_WRITE_DEMOD(state, SFRLOW1, ((sym >> 8) & 0xff)) < 0) /* MSB */
 		goto err;
 	if (STV090x_WRITE_DEMOD(state, SFRLOW0, (sym & 0xff)) < 0) /* LSB */