summaryrefslogtreecommitdiff
path: root/sound/soc/qcom/lpass-ipq806x.c
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2017-04-05 10:34:10 +0200
committerMark Brown <broonie@kernel.org>2017-04-21 18:07:45 +0100
commit97c52eb969718f0231f197937eb0418e7514aba3 (patch)
tree6e3d6d9194e38ce59a98e92fd9d3c083bb447cac /sound/soc/qcom/lpass-ipq806x.c
parentc1ae3cfa0e89fa1a7ecc4c99031f5e9ae99d9201 (diff)
ASoC: qcom: move clock names into LPASS variant struct
The clock names for the two supported codecs are either "mi2s-*" name variants generated by code. This naming scheme does not work for platforms like MSM8660 which has I2S channels named CODEC_I2S_SPKR (rather than just "MI2S tertiary" and other repetitive names) and consequently have clocks named "codec-i2s-spkr-osr-clk" and similar. Skip the runtime generation of clock names and replace it with name lookup tables encoded into the variant data. Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/qcom/lpass-ipq806x.c')
-rw-r--r--sound/soc/qcom/lpass-ipq806x.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/sound/soc/qcom/lpass-ipq806x.c b/sound/soc/qcom/lpass-ipq806x.c
index 608c1a92af8a..ca1e1f2d2787 100644
--- a/sound/soc/qcom/lpass-ipq806x.c
+++ b/sound/soc/qcom/lpass-ipq806x.c
@@ -92,6 +92,12 @@ static struct lpass_variant ipq806x_data = {
.wrdma_channels = 4,
.dai_driver = &ipq806x_lpass_cpu_dai_driver,
.num_dai = 1,
+ .dai_osr_clk_names = (const char *[]) {
+ "mi2s-osr-clk",
+ },
+ .dai_bit_clk_names = (const char *[]) {
+ "mi2s-bit-clk",
+ },
.alloc_dma_channel = ipq806x_lpass_alloc_dma_channel,
.free_dma_channel = ipq806x_lpass_free_dma_channel,
};