diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-08-29 00:49:29 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-08-29 00:49:28 -0700 |
| commit | 436eeda4f16fcd12f1a8be22866969066c164e94 (patch) | |
| tree | f718a497dfba31b989dd2c13be0d96534987714b | |
| parent | 37d7004cec12489cd6ddba1b10f0c534f281e3a5 (diff) | |
| parent | b428b24214c2d4140b2e066a8dc250f55bcd55e4 (diff) | |
Merge "drivers: mfd: Add 1.6MHz clk support for wcd934x codec"
| -rw-r--r-- | drivers/mfd/wcd9xxx-utils.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/drivers/mfd/wcd9xxx-utils.c b/drivers/mfd/wcd9xxx-utils.c index 38286831a02c..fab594992df3 100644 --- a/drivers/mfd/wcd9xxx-utils.c +++ b/drivers/mfd/wcd9xxx-utils.c @@ -265,8 +265,17 @@ static u32 wcd9xxx_validate_dmic_sample_rate(struct device *dev, __func__, div_factor, mclk_rate); break; case 6: - /* DIV 6 is valid only for 12.288 MCLK */ - if (mclk_rate != WCD9XXX_MCLK_CLK_12P288MHZ) + /* + * DIV 6 is valid for both 9.6MHz and 12.288MHz + * MCLK on Tavil. Older codecs support DIV6 only + * for 12.288MHz MCLK. + */ + if ((mclk_rate == WCD9XXX_MCLK_CLK_9P6HZ) && + (of_device_is_compatible(dev->of_node, + "qcom,tavil-slim-pgd"))) + dev_dbg(dev, "%s: DMIC_DIV = %u, mclk_rate = %u\n", + __func__, div_factor, mclk_rate); + else if (mclk_rate != WCD9XXX_MCLK_CLK_12P288MHZ) goto undefined_rate; break; default: |