Hi Tzung-Bi, Thanks for the review! On Mon, Jul 20, 2020 at 10:47 AM Tzung-Bi Shih <tzungbi@xxxxxxxxxx> wrote: > > On Fri, Jul 17, 2020 at 8:02 PM Cheng-Yi Chiang <cychiang@xxxxxxxxxxxx> wrote: > > diff --git a/sound/soc/qcom/sc7180.c b/sound/soc/qcom/sc7180.c > > new file mode 100644 > > index 000000000000..cbe6b487d432 > > --- /dev/null > > +++ b/sound/soc/qcom/sc7180.c > > @@ -0,0 +1,410 @@ > > +// SPDX-License-Identifier: GPL-2.0-only > > +/* > > + * Copyright (c) 2020, The Linux Foundation. All rights reserved. > > + * > > + * sc7180.c -- ALSA SoC Machine driver for SC7180 > > + */ > Use "//" for all lines (see https://lkml.org/lkml/2020/5/14/332). > Thanks for the pointer. Fixed in v2. > > +#include <linux/module.h> > > +#include <linux/platform_device.h> > > +#include <linux/of_device.h> > > +#include <sound/core.h> > > +#include <sound/pcm.h> > > +#include <sound/pcm_params.h> > > +#include <sound/jack.h> > > +#include <sound/soc.h> > > +#include <uapi/linux/input-event-codes.h> > > +#include <dt-bindings/sound/sc7180-lpass.h> > > +#include "../codecs/rt5682.h" > > +#include "common.h" > > +#include "lpass.h" > Insert a blank line in between <...> and "..." and sort the list > alphabetically to make it less likely to conflict. Fixed in v2. > > > +static int sc7180_snd_hw_params(struct snd_pcm_substream *substream, > > + struct snd_pcm_hw_params *params) > > +{ > Dummy function? Or is it still work in progress? > Removed in v2. > > + struct snd_soc_pcm_runtime *rtd = substream->private_data; > > + struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); > > + int ret = 0; > > + > > + switch (cpu_dai->id) { > > + case MI2S_PRIMARY: > > + break; > > + case MI2S_SECONDARY: > > + break; > > + default: > > + pr_err("%s: invalid dai id 0x%x\n", __func__, cpu_dai->id); > -EINVAL. > Removed in v2. > > +static int sc7180_dai_init(struct snd_soc_pcm_runtime *rtd) > > +{ > > + struct snd_soc_component *component; > > + struct snd_soc_card *card = rtd->card; > > + struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); > > + struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); > > + struct sc7180_snd_data *pdata = snd_soc_card_get_drvdata(card); > > + struct snd_jack *jack; > > + int rval; > > + > > + if (!pdata->jack_setup) { > > + rval = snd_soc_card_jack_new( > > + card, "Headset Jack", > > + SND_JACK_HEADSET | > > + SND_JACK_HEADPHONE | > > + SND_JACK_BTN_0 | SND_JACK_BTN_1 | > > + SND_JACK_BTN_2 | SND_JACK_BTN_3, > > + &pdata->jack, NULL, 0); > > + > > + if (rval < 0) { > > + dev_err(card->dev, "Unable to add Headphone Jack\n"); > > + return rval; > > + } > > + > > + jack = pdata->jack.jack; > > + > > + snd_jack_set_key(jack, SND_JACK_BTN_0, KEY_PLAYPAUSE); > > + snd_jack_set_key(jack, SND_JACK_BTN_1, KEY_VOICECOMMAND); > > + snd_jack_set_key(jack, SND_JACK_BTN_2, KEY_VOLUMEUP); > > + snd_jack_set_key(jack, SND_JACK_BTN_3, KEY_VOLUMEDOWN); > > + pdata->jack_setup = true; > This block is something I don't expect to be in "dai_init" (i.e. there > is only 1 headset jack, why do we need to run the code for n times). > Thanks for the suggestion. In v2 I am using aux device so this function is cleaned up to be specific to aux device for jack detection. > > + switch (cpu_dai->id) { > > + case MI2S_PRIMARY: > > + jack = pdata->jack.jack; > > + component = codec_dai->component; > > + > > + jack->private_data = component; > > + jack->private_free = sc7180_jack_free; > > + rval = snd_soc_component_set_jack(component, > > + &pdata->jack, NULL); > > + if (rval != 0 && rval != -EOPNOTSUPP) { > > + dev_warn(card->dev, "Failed to set jack: %d\n", rval); > > + return rval; > > + } > > + break; > > + case MI2S_SECONDARY: > > + break; > > + default: > > + pr_err("%s: invalid dai id 0x%x\n", __func__, cpu_dai->id); > -EINVAL. > Removed in v2. > > +static int sc7180_snd_startup(struct snd_pcm_substream *substream) > > +{ > > + unsigned int codec_dai_fmt = SND_SOC_DAIFMT_CBS_CFS; > > + struct snd_soc_pcm_runtime *rtd = substream->private_data; > > + struct snd_soc_card *card = rtd->card; > > + struct sc7180_snd_data *data = snd_soc_card_get_drvdata(card); > > + struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); > > + struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); > > + int ret; > > + > > + switch (cpu_dai->id) { > > + case MI2S_PRIMARY: > > + codec_dai_fmt |= SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_I2S; > If the format is fixed, could it put somewhere statically? > Fixed in v2. > > + if (++data->pri_mi2s_clk_count == 1) { > Don't it need to be atomic? > soc_pcm_open and soc_pcm_close are protected by card->pcm_mutex so they will happen in sequence. > > + snd_soc_dai_set_sysclk(cpu_dai, > > + LPASS_MCLK0, > > + DEFAULT_MCLK_RATE, > > + SNDRV_PCM_STREAM_PLAYBACK); > > + } > > + snd_soc_dai_set_fmt(codec_dai, codec_dai_fmt); > > + > > + /* Configure PLL1 for codec */ > > + ret = snd_soc_dai_set_pll(codec_dai, 0, RT5682_PLL1_S_MCLK, > > + DEFAULT_MCLK_RATE, RT5682_PLL1_FREQ); > > + if (ret < 0) { > > + dev_err(rtd->dev, "can't set codec pll: %d\n", ret); > > + return ret; > > + } > > + > > + /* Configure sysclk for codec */ > > + ret = snd_soc_dai_set_sysclk(codec_dai, RT5682_SCLK_S_PLL1, > > + RT5682_PLL1_FREQ, > > + SND_SOC_CLOCK_IN); > > + if (ret < 0) > > + dev_err(rtd->dev, "snd_soc_dai_set_sysclk err = %d\n", > > + ret); > > + > > + break; > > + case MI2S_SECONDARY: > > + break; > > + default: > > + pr_err("%s: invalid dai id 0x%x\n", __func__, cpu_dai->id); > -EINVAL. Fixed in v2 > > > +static void sc7180_snd_shutdown(struct snd_pcm_substream *substream) > > +{ > > + struct snd_soc_pcm_runtime *rtd = substream->private_data; > > + struct snd_soc_card *card = rtd->card; > > + struct sc7180_snd_data *data = snd_soc_card_get_drvdata(card); > > + struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); > > + > > + switch (cpu_dai->id) { > > + case MI2S_PRIMARY: > > + if (--data->pri_mi2s_clk_count == 0) { > Atomic? ditto > > > + snd_soc_dai_set_sysclk(cpu_dai, > > + LPASS_MCLK0, > > + 0, > > + SNDRV_PCM_STREAM_PLAYBACK); > > + } > > + break; > > + case MI2S_SECONDARY: > > + break; > > + default: > > + pr_err("%s: invalid dai id 0x%x\n", __func__, cpu_dai->id); > -EINVAL. > not needed since this returns void > > +static int sc7180_snd_platform_probe(struct platform_device *pdev) > > +{ > > + struct snd_soc_card *card; > > + struct sc7180_snd_data *data; > > + struct device *dev = &pdev->dev; > > + int ret; > > + > > + card = kzalloc(sizeof(*card), GFP_KERNEL); > > + if (!card) > > + return -ENOMEM; > Looks like you don't need to allocate the card in runtime. Also you > need to use the devm version if needed. > Thanks for the great suggestion. In v2 I am using a static sound card. Also, use devm wherever possible to greatly simplify the code. > > + /* Allocate the private data */ > > + data = kzalloc(sizeof(*data), GFP_KERNEL); > Use devm. > Fixed in v2. > > + card->dapm_widgets = sc7180_snd_widgets; > > + card->num_dapm_widgets = ARRAY_SIZE(sc7180_snd_widgets); > Can the struct snd_soc_card allocate statically? > Fixed in v2. > > + sc7180_add_ops(card); > > + ret = snd_soc_register_card(card); > devm. > > > I didn't dive into the logic too much. Would need another round > review if any newer version. Thanks again.
