aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOla Lilja <elilola@steludxu2785.(none)>2011-05-03 14:18:29 +0200
committerJonas ABERG <jonas.aberg@stericsson.com>2011-05-03 14:51:50 +0200
commit2ebb1cb6cfd98e237f36842ddfee080cf6c02e68 (patch)
tree9f8c8b907771f21e1608283a8b3aa8b62b89a1d1
parent93e928db8ee75579625002a204d77da912d3afeb (diff)
misc/i2s: OPP100 in MSP master-mode onlyu8500-android-2.3_v0.71u5500-android-2.3_v0.57
When I2S is setup to run in codec-master the msp_i2s driver should never consider OPP100. Change-Id: Id450766a6838c43dca66012f4c065098723e3a40 Signed-off-by: Ola Lilja <ola.o.lilja@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/22091 Reviewed-by: Roger NILSSON1 <roger.xr.nilsson@stericsson.com>
-rw-r--r--drivers/misc/i2s/msp_i2s.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/misc/i2s/msp_i2s.c b/drivers/misc/i2s/msp_i2s.c
index 1723fd17e90..6cd04a0b699 100644
--- a/drivers/misc/i2s/msp_i2s.c
+++ b/drivers/misc/i2s/msp_i2s.c
@@ -449,7 +449,8 @@ static int configure_clock(struct msp *msp,
bit_clock = (config->input_clock_freq * 1000)/(sck_div + 1);
/* If the bit clock is higher than 19.2MHz, Vape should be run in 100% OPP */
- if (bit_clock > 19200000) {
+ /* Only consider OPP 100% when bit-clock is used, i.e. MSP master mode */
+ if ((bit_clock > 19200000) && ((config->tx_clock_sel != 0) || (config->rx_clock_sel != 0))) {
prcmu_qos_update_requirement(PRCMU_QOS_APE_OPP, "msp_i2s", 100);
msp->vape_opp_constraint = 1;
} else {