diff options
| author |   Linus Walleij <linus.walleij@linaro.org> | 2017-04-05 10:34:10 +0200 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2017-04-21 18:07:45 +0100 |
| commit | 97c52eb969718f0231f197937eb0418e7514aba3 (patch) | |
| tree | 6e3d6d9194e38ce59a98e92fd9d3c083bb447cac /sound/soc/qcom/lpass-apq8016.c | |
| parent | Linux 4.11-rc1 (diff) | |
| download | wireguard-linux-97c52eb969718f0231f197937eb0418e7514aba3.tar.xz wireguard-linux-97c52eb969718f0231f197937eb0418e7514aba3.zip | |
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-apq8016.c')
| -rw-r--r-- | sound/soc/qcom/lpass-apq8016.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/sound/soc/qcom/lpass-apq8016.c b/sound/soc/qcom/lpass-apq8016.c index 8aed72be3224..8a74844d99e2 100644 --- a/sound/soc/qcom/lpass-apq8016.c +++ b/sound/soc/qcom/lpass-apq8016.c @@ -231,6 +231,18 @@ static struct lpass_variant apq8016_data = { .wrdma_channels = 2, .dai_driver = apq8016_lpass_cpu_dai_driver, .num_dai = ARRAY_SIZE(apq8016_lpass_cpu_dai_driver), + .dai_osr_clk_names = (const char *[]) { + "mi2s-osr-clk0", + "mi2s-osr-clk1", + "mi2s-osr-clk2", + "mi2s-osr-clk3", + }, + .dai_bit_clk_names = (const char *[]) { + "mi2s-bit-clk0", + "mi2s-bit-clk1", + "mi2s-bit-clk2", + "mi2s-bit-clk3", + }, .init = apq8016_lpass_init, .exit = apq8016_lpass_exit, .alloc_dma_channel = apq8016_lpass_alloc_dma_channel, |