Skip to contentSkip to conversation

Machine driver to support LPASS SC7280 sound card registration

PATCH Superseded Srinivasa Rao Mandadapu 3 participants 9 messages Sep 8, 2021 – Sep 15, 2021

Subsystems (5)

v1 of 6 Superseded Latest is v6 →

lore
Share & tools
lore
#0 lore raw

cover Machine driver to support LPASS SC7280 sound card registration

This patch set is to add support for SC7280 sound card registration and to add dt-bindings documentation file.

These patches depends on the dt-bindings header patch
-- https://patchwork.kernel.org/project/alsa-devel/list/?series=543829

Srinivasa Rao Mandadapu (2):
ASoC: google: dt-bindings: Add sc7280-herobrine machine bindings
ASoC: qcom: SC7280: Add machine driver

 .../bindings/sound/google,sc7280-herobrine.yaml    | 169 ++++++++++
 sound/soc/qcom/Kconfig                             |  12 +
 sound/soc/qcom/Makefile                            |   2 +
 sound/soc/qcom/sc7280.c                            | 347 +++++++++++++++++++++
 4 files changed, 530 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/sound/google,sc7280-herobrine.yaml
 create mode 100644 sound/soc/qcom/sc7280.c
Signature · 2 lines
Qualcomm India Private Limited, on behalf of Qualcomm Innovation Center, Inc.,
is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.
#1 lore raw

PATCH 1/2 ASoC: google: dt-bindings: Add sc7280-herobrine machine bindings

Add devicetree bindings documentation file for sc7280 sound card registration.

---
 .../bindings/sound/google,sc7280-herobrine.yaml    | 169 +++++++++++++++++++++
 1 file changed, 169 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/sound/google,sc7280-herobrine.yaml
Documentation/devicetree/bindings/sound/google,sc7280-herobrine.yaml new file +169 -0
new file mode 100644
index 0000000..e0d705f
@@ -0,0 +1,169 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/sound/google,sc7280-herobrine.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Google SC7280-Herobrine ASoC sound card driver
+
+maintainers:
+  - Srinivasa Rao Mandadapu <[email protected]>
+  - Judy Hsiao <[email protected]>
+
+description:
+  This binding describes the SC7280 sound card which uses LPASS for audio.
+
+properties:
+  compatible:
+    enum:
+      - google,sc7280-herobrine
+
+  audio-routing:
+    $ref: /schemas/types.yaml#/definitions/non-unique-string-array
+    description:
+      A list of the connections between audio components. Each entry is a
+      pair of strings, the first being the connection's sink, the second
+      being the connection's source.
+
+  model:
+    $ref: /schemas/types.yaml#/definitions/string
+    description: User specified audio sound card name
+
+  "#address-cells":
+    const: 1
+
+  "#size-cells":
+    const: 0
+
+patternProperties:
+  "^dai-link@[0-9a-f]$":
+    description:
+      Each subnode represents a dai link. Subnodes of each dai links would be
+      cpu/codec dais.
+
+    type: object
+
+    properties:
+      link-name:
+        description: Indicates dai-link name and PCM stream name.
+        $ref: /schemas/types.yaml#/definitions/string
+        maxItems: 1
+
+      reg:
+        maxItems: 1
+        description: dai link address.
+
+      cpu:
+        description: Holds subnode which indicates cpu dai.
+        type: object
+        properties:
+          sound-dai: true
+
+      codec:
+        description: Holds subnode which indicates codec dai.
+        type: object
+        properties:
+          sound-dai: true
+
+    required:
+      - link-name
+      - cpu
+      - codec
+
+    additionalProperties: false
+
+required:
+  - compatible
+  - model
+  - "#address-cells"
+  - "#size-cells"
+
+additionalProperties: false
+
+examples:
+
+  - |
+    #include <dt-bindings/sound/qcom,lpass.h>
+    sound {
+        compatible = "google,sc7280-herobrine";
+        model = "sc7280-wcd938x-max98360a-4dmic";
+
+        audio-routing =
+            "IN1_HPHL", "HPHL_OUT",
+            "IN2_HPHR", "HPHR_OUT",
+            "AMIC1", "MIC BIAS1",
+            "AMIC2", "MIC BIAS2",
+            "VA DMIC0", "MIC BIAS3",
+            "VA DMIC1", "MIC BIAS3",
+            "VA DMIC2", "MIC BIAS4",
+            "VA DMIC3", "MIC BIAS4",
+            "TX SWR_ADC0", "ADC1_OUTPUT",
+            "TX SWR_ADC1", "ADC2_OUTPUT",
+            "TX SWR_ADC2", "ADC3_OUTPUT",
+            "TX SWR_DMIC0", "DMIC1_OUTPUT",
+            "TX SWR_DMIC1", "DMIC2_OUTPUT",
+            "TX SWR_DMIC2", "DMIC3_OUTPUT",
+            "TX SWR_DMIC3", "DMIC4_OUTPUT";
+
+        #address-cells = <1>;
+        #size-cells = <0>;
+
+        dai-link@0 {
+            link-name = "WCD Playback";
+            reg = <LPASS_CDC_DMA_RX0>;
+            cpu {
+                sound-dai = <&lpass_cpu LPASS_CDC_DMA_RX0>;
+            };
+
+            codec {
+                sound-dai = <&wcd938x 0>, <&swr0 0>, <&rxmacro 0>;
+            };
+        };
+        dai-link@1 {
+            link-name = "WCD Capture";
+            reg = <LPASS_CDC_DMA_TX3>;
+            cpu {
+                sound-dai = <&lpass_cpu LPASS_CDC_DMA_TX3>;
+            };
+
+            codec {
+                sound-dai = <&wcd938x 1>, <&swr1 0>, <&txmacro 0>;
+            };
+        };
+
+        dai-link@2 {
+            link-name = "MI2S Playback";
+            reg = <MI2S_SECONDARY>;
+            cpu {
+                sound-dai = <&lpass_cpu MI2S_SECONDARY>;
+            };
+
+            codec {
+                sound-dai = <&max98360a>;
+            };
+        };
+
+        dai-link@3 {
+            link-name = "DMIC Capture";
+            reg = <LPASS_CDC_DMA_VA_TX0>;
+            cpu {
+                sound-dai = <&lpass_cpu LPASS_CDC_DMA_VA_TX0>;
+            };
+
+            codec {
+                sound-dai = <&vamacro 0>;
+            };
+        };
+
+        dai-link@5 {
+            link-name = "DP Playback";
+            reg = <LPASS_DP_RX>;
+            cpu {
+                sound-dai = <&lpass_cpu LPASS_DP_RX>;
+            };
+
+            codec {
+                sound-dai = <&mdss_dp>;
+            };
+        };
+    };
Signature · 2 lines
Qualcomm India Private Limited, on behalf of Qualcomm Innovation Center, Inc.,
is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.
maintainer
#2 lore raw

Re: [PATCH 1/2] ASoC: google: dt-bindings: Add sc7280-herobrine machine bindings

Quoted 9 lines · Srinivasa Rao Mandadapu

Add devicetree bindings documentation file for sc7280 sound card registration.

---
 .../bindings/sound/google,sc7280-herobrine.yaml    | 169 +++++++++++++++++++++
 1 file changed, 169 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/sound/google,sc7280-herobrine.yaml

My bot found errors running 'make DT_CHECKER_FLAGS=-m dt_binding_check' on your patch (DT_CHECKER_FLAGS is new in v5.13):

yamllint warnings/errors:

dtschema/dtc warnings/errors:
Error: Documentation/devicetree/bindings/sound/google,sc7280-herobrine.example.dts:46.24-25 syntax error FATAL ERROR: Unable to parse input tree
make[1]: *** [scripts/Makefile.lib:379: Documentation/devicetree/bindings/sound/google,sc7280-herobrine.example.dt.yaml] Error 1 make[1]: *** Waiting for unfinished jobs....
make: *** [Makefile:1438: dt_binding_check] Error 2

doc reference errors (make refcheckdocs):

See https://patchwork.ozlabs.org/patch/1525980

This check can fail if there are any dependencies. The base for a patch series is generally the most recent rc1.

If you already ran 'make dt_binding_check' and didn't see the above error(s), then make sure 'yamllint' is installed and dt-schema is up to date:

pip3 install dtschema --upgrade

Please check and re-submit.

#3 lore raw

Re: [PATCH 1/2] ASoC: google: dt-bindings: Add sc7280-herobrine machine bindings

Thanks for info Rob!!!.

This error is due to missing dependency patch.(https://patchwork.kernel.org/project/alsa-devel/list/?series=543829)

Could You Please check with the above patch applied?

Quoted 37 lines · Rob Herring
Quoted 9 lines · Srinivasa Rao Mandadapu

Add devicetree bindings documentation file for sc7280 sound card registration.

---
  .../bindings/sound/google,sc7280-herobrine.yaml    | 169 +++++++++++++++++++++
  1 file changed, 169 insertions(+)

create mode 100644 Documentation/devicetree/bindings/sound/google,sc7280-herobrine.yaml

My bot found errors running 'make DT_CHECKER_FLAGS=-m dt_binding_check' on your patch (DT_CHECKER_FLAGS is new in v5.13):

yamllint warnings/errors:

dtschema/dtc warnings/errors:
Error: Documentation/devicetree/bindings/sound/google,sc7280-herobrine.example.dts:46.24-25 syntax error FATAL ERROR: Unable to parse input tree
make[1]: *** [scripts/Makefile.lib:379: Documentation/devicetree/bindings/sound/google,sc7280-herobrine.example.dt.yaml] Error 1 make[1]: *** Waiting for unfinished jobs....
make: *** [Makefile:1438: dt_binding_check] Error 2

doc reference errors (make refcheckdocs):

See https://patchwork.ozlabs.org/patch/1525980

This check can fail if there are any dependencies. The base for a patch series is generally the most recent rc1.

If you already ran 'make dt_binding_check' and didn't see the above error(s), then make sure 'yamllint' is installed and dt-schema is up to date:

pip3 install dtschema --upgrade

Please check and re-submit.

Signature · 2 lines
Qualcomm India Private Limited, on behalf of Qualcomm Innovation Center, Inc.,
is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.
maintainer
#4 lore raw

Re: [PATCH 1/2] ASoC: google: dt-bindings: Add sc7280-herobrine machine bindings

Quoted 2 lines · Srinivasa Rao Mandadapu

Thanks for info Rob!!!.

Don't top-post on maillists.

Quoted 5 lines

This error is due to missing dependency patch.(https://patchwork.kernel.org/project/alsa-devel/list/?series=543829)

Could You Please check with the above patch applied?

No. How is a script supposed to handle that?

Where have you noted the dependency in the patch? Without that, I assume you just didn't run 'make dt_binding_check' and the maintainer doesn't know to check that the dependency is applied.

Rob

Quoted 44 lines · Rob Herring
Quoted 29 lines · Srinivasa Rao Mandadapu
Quoted 9 lines

Add devicetree bindings documentation file for sc7280 sound card registration.

---
  .../bindings/sound/google,sc7280-herobrine.yaml    | 169 +++++++++++++++++++++
  1 file changed, 169 insertions(+)

create mode 100644 Documentation/devicetree/bindings/sound/google,sc7280-herobrine.yaml

My bot found errors running 'make DT_CHECKER_FLAGS=-m dt_binding_check' on your patch (DT_CHECKER_FLAGS is new in v5.13):

yamllint warnings/errors:

dtschema/dtc warnings/errors:
Error: Documentation/devicetree/bindings/sound/google,sc7280-herobrine.example.dts:46.24-25 syntax error FATAL ERROR: Unable to parse input tree
make[1]: *** [scripts/Makefile.lib:379: Documentation/devicetree/bindings/sound/google,sc7280-herobrine.example.dt.yaml] Error 1 make[1]: *** Waiting for unfinished jobs....
make: *** [Makefile:1438: dt_binding_check] Error 2

doc reference errors (make refcheckdocs):

See https://patchwork.ozlabs.org/patch/1525980

This check can fail if there are any dependencies. The base for a patch series is generally the most recent rc1.

Quoted 8 lines

If you already ran 'make dt_binding_check' and didn't see the above error(s), then make sure 'yamllint' is installed and dt-schema is up to date:

pip3 install dtschema --upgrade

Please check and re-submit.

--
Qualcomm India Private Limited, on behalf of Qualcomm Innovation Center, Inc., is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.

#5 lore raw

Re: [PATCH 1/2] ASoC: google: dt-bindings: Add sc7280-herobrine machine bindings

Quoted 4 lines · Rob Herring
Quoted 1 line · Srinivasa Rao Mandadapu

Thanks for info Rob!!!.

Don't top-post on maillists.

Okay. Will take care from Next time.

Quoted 4 lines
Quoted 4 lines

This error is due to missing dependency patch.(https://patchwork.kernel.org/project/alsa-devel/list/?series=543829)

Quoted 8 lines
Quoted 1 line

Could You Please check with the above patch applied?

No. How is a script supposed to handle that?

Where have you noted the dependency in the patch? Without that, I assume you just didn't run 'make dt_binding_check' and the maintainer doesn't know to check that the dependency is applied.

Rob

Included dependency list in cover letter. Will include in this patch next time.

Quoted 43 lines
Quoted 43 lines · Rob Herring
Quoted 29 lines · Srinivasa Rao Mandadapu
Quoted 9 lines

Add devicetree bindings documentation file for sc7280 sound card registration.

---
   .../bindings/sound/google,sc7280-herobrine.yaml    | 169 +++++++++++++++++++++
   1 file changed, 169 insertions(+)

create mode 100644 Documentation/devicetree/bindings/sound/google,sc7280-herobrine.yaml

My bot found errors running 'make DT_CHECKER_FLAGS=-m dt_binding_check' on your patch (DT_CHECKER_FLAGS is new in v5.13):

yamllint warnings/errors:

dtschema/dtc warnings/errors:
Error: Documentation/devicetree/bindings/sound/google,sc7280-herobrine.example.dts:46.24-25 syntax error FATAL ERROR: Unable to parse input tree
make[1]: *** [scripts/Makefile.lib:379: Documentation/devicetree/bindings/sound/google,sc7280-herobrine.example.dt.yaml] Error 1 make[1]: *** Waiting for unfinished jobs....
make: *** [Makefile:1438: dt_binding_check] Error 2

doc reference errors (make refcheckdocs):

See https://patchwork.ozlabs.org/patch/1525980

This check can fail if there are any dependencies. The base for a patch series is generally the most recent rc1.

Quoted 8 lines

If you already ran 'make dt_binding_check' and didn't see the above error(s), then make sure 'yamllint' is installed and dt-schema is up to date:

pip3 install dtschema --upgrade

Please check and re-submit.

--
Qualcomm India Private Limited, on behalf of Qualcomm Innovation Center, Inc., is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.

Signature · 2 lines
Qualcomm India Private Limited, on behalf of Qualcomm Innovation Center, Inc.,
is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.
#6 lore raw

PATCH 2/2 ASoC: qcom: SC7280: Add machine driver

In reply to Srinivasa Rao Mandadapu

Add new machine driver to register sound card on sc7280 based targets and do the required configuration for lpass cpu dai and external codecs connected over MI2S and soundwire interfaces.
Add support for audio jack detection, soundwire init and MBHC.

---
 sound/soc/qcom/Kconfig  |  12 ++
 sound/soc/qcom/Makefile |   2 +
 sound/soc/qcom/sc7280.c | 347 ++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 361 insertions(+)
 create mode 100644 sound/soc/qcom/sc7280.c
sound/soc/qcom/Kconfig +12 -0
index cc7c1de..d9ffcb7 100644
@@ -152,4 +152,16 @@ config SND_SOC_SC7180
 	  SC7180 SoC-based systems.
 	  Say Y if you want to use audio device on this SoCs.
 
+config SND_SOC_SC7280
+	tristate "SoC Machine driver for SC7280 boards"
+	depends on I2C && SOUNDWIRE
+	select SND_SOC_QCOM_COMMON
+	select SND_SOC_MAX98357A
+	select SND_SOC_LPASS_RX_MACRO
+	select SND_SOC_LPASS_TX_MACRO
+	help
+	  To add support for audio on Qualcomm Technologies Inc.
+	  SC7280 SoC-based systems.
+	  Say Y if you want to use audio device on this SoCs.
+
 endif #SND_SOC_QCOM
sound/soc/qcom/Makefile +2 -0
index 1600ae5..625aec6 100644
@@ -19,6 +19,7 @@ snd-soc-storm-objs := storm.o
 snd-soc-apq8016-sbc-objs := apq8016_sbc.o
 snd-soc-apq8096-objs := apq8096.o
 snd-soc-sc7180-objs := sc7180.o
+snd-soc-sc7280-objs := sc7280.o
 snd-soc-sdm845-objs := sdm845.o
 snd-soc-sm8250-objs := sm8250.o
 snd-soc-qcom-common-objs := common.o
@@ -27,6 +28,7 @@ obj-$(CONFIG_SND_SOC_STORM) += snd-soc-storm.o
 obj-$(CONFIG_SND_SOC_APQ8016_SBC) += snd-soc-apq8016-sbc.o
 obj-$(CONFIG_SND_SOC_MSM8996) += snd-soc-apq8096.o
 obj-$(CONFIG_SND_SOC_SC7180) += snd-soc-sc7180.o
+obj-$(CONFIG_SND_SOC_SC7280) += snd-soc-sc7280.o
 obj-$(CONFIG_SND_SOC_SDM845) += snd-soc-sdm845.o
 obj-$(CONFIG_SND_SOC_SM8250) += snd-soc-sm8250.o
 obj-$(CONFIG_SND_SOC_QCOM_COMMON) += snd-soc-qcom-common.o
sound/soc/qcom/sc7280.c new file +347 -0

347 lines not on this page · raw message

Signature · 2 lines
Qualcomm India Private Limited, on behalf of Qualcomm Innovation Center, Inc.,
is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.
#7 lore raw

Re: [PATCH 2/2] ASoC: qcom: SC7280: Add machine driver

Quoting Srinivasa Rao Mandadapu (2021-09-08 11:00:57)

Quoted 6 lines
sound/soc/qcom/sc7280.c new file +0 -0
new file mode 100644
index 0000000..1ab29f6

sound/soc/qcom/sc7280.c line 8

Quoted 8 lines
sound/soc/qcom/sc7280.c new file +8 -0
@@ -0,0 +1,347 @@
+// SPDX-License-Identifier: GPL-2.0-only
+//
+// Copyright (c) 2020-2021, The Linux Foundation. All rights reserved.
+//
+// sc7280.c -- ALSA SoC Machine driver for sc7280
+
+#include <dt-bindings/sound/sc7180-lpass.h>
+#include <dt-bindings/sound/qcom,q6afe.h>

Can these come after the linux/sound includes?

sound/soc/qcom/sc7280.c line 18

Quoted 10 lines
sound/soc/qcom/sc7280.c new file +10 -0
+#include <linux/gpio.h>
+#include <linux/gpio/consumer.h>
+#include <linux/module.h>
+#include <linux/of_device.h>
+#include <linux/platform_device.h>
+#include <sound/core.h>
+#include <sound/jack.h>
+#include <sound/pcm.h>
+#include <sound/soc.h>
+#include <uapi/linux/input-event-codes.h>

Is this include used?

sound/soc/qcom/sc7280.c line 24

Quoted 6 lines
sound/soc/qcom/sc7280.c new file +6 -0
+
+#include "../codecs/wcd938x.h"
+#include "common.h"
+#include "lpass.h"
+
+#define DRIVER_NAME "SC7280"

Is this useful? Why not just inline it in the one place it is used so we don't have to jump to the define to figure out what it is?

Quoted 51 lines
sound/soc/qcom/sc7280.c new file +51 -0
+#define LPASS_MAX_PORTS  (LPASS_CDC_DMA_VA_TX8 + 1)
+
+
+struct sc7280_snd_data {
+       bool stream_prepared[LPASS_MAX_PORTS];
+       struct snd_soc_card card;
+       struct sdw_stream_runtime *sruntime[LPASS_MAX_PORTS];
+       struct snd_soc_jack hs_jack;
+       struct snd_soc_jack hdmi_jack;
+       bool jack_setup;
+};
+
+static void sc7280_jack_free(struct snd_jack *jack)
+{
+       struct snd_soc_component *component = jack->private_data;
+
+       snd_soc_component_set_jack(component, NULL, NULL);
+}
+
+static int sc7280_headset_init(struct snd_soc_pcm_runtime *rtd)
+{
+       struct snd_soc_card *card = rtd->card;
+       struct sc7280_snd_data *pdata = snd_soc_card_get_drvdata(card);
+       struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0);
+       struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);
+       struct snd_soc_component *component = codec_dai->component;
+       struct snd_jack *jack;
+       int rval, i;
+
+       if (!pdata->jack_setup) {
+               rval = snd_soc_card_jack_new(card, "Headset Jack",
+                                                       SND_JACK_HEADSET | SND_JACK_LINEOUT |
+                                                       SND_JACK_MECHANICAL |
+                                                       SND_JACK_BTN_0 | SND_JACK_BTN_1 |
+                                                       SND_JACK_BTN_2 | SND_JACK_BTN_3 |
+                                                       SND_JACK_BTN_4 | SND_JACK_BTN_5,
+                                                       &pdata->hs_jack, NULL, 0);
+
+               if (rval < 0) {
+                       dev_err(card->dev, "Unable to add Headset Jack\n");
+                       return rval;
+               }
+
+               jack = pdata->hs_jack.jack;
+
+               snd_jack_set_key(jack, SND_JACK_BTN_0, KEY_MEDIA);
+               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);
+
+               jack->private_data = component;

sound/soc/qcom/sc7280.c line 85

Quoted 10 lines
sound/soc/qcom/sc7280.c new file +10 -0
+               jack->private_free = sc7280_jack_free;
+               pdata->jack_setup = true;
+       }
+       switch (cpu_dai->id) {
+       case LPASS_CDC_DMA_RX0:
+       case LPASS_CDC_DMA_TX3:
+               for_each_rtd_codec_dais(rtd, i, codec_dai) {
+                       rval = snd_soc_component_set_jack(component, &pdata->hs_jack, NULL);
+                       if (rval != 0 && rval != -EOPNOTSUPP) {
+                               dev_warn(card->dev, "Failed to set jack: %d\n", rval);

Why not dev_err?

Quoted 45 lines
sound/soc/qcom/sc7280.c new file +45 -0
+                               return rval;
+                       }
+               }
+
+               break;
+       default:
+               break;
+       }
+
+       return 0;
+}
+
+static int sc7280_hdmi_init(struct snd_soc_pcm_runtime *rtd)
+{
+       struct snd_soc_card *card = rtd->card;
+       struct sc7280_snd_data *pdata = snd_soc_card_get_drvdata(card);
+       struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0);
+       struct snd_soc_component *component = codec_dai->component;
+       struct snd_jack *jack;
+       int rval;
+
+       rval = snd_soc_card_jack_new(
+                       card, "HDMI Jack",
+                       SND_JACK_LINEOUT,
+                       &pdata->hdmi_jack, NULL, 0);
+
+       if (rval < 0) {
+               dev_err(card->dev, "Unable to add HDMI Jack\n");
+               return rval;
+       }
+
+       jack = pdata->hdmi_jack.jack;
+       jack->private_data = component;
+       jack->private_free = sc7280_jack_free;
+
+       return snd_soc_component_set_jack(component, &pdata->hdmi_jack, NULL);
+}
+
+static int sc7280_init(struct snd_soc_pcm_runtime *rtd)
+{
+       struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);
+
+       switch (cpu_dai->id) {
+       case LPASS_CDC_DMA_TX3:
+               return sc7280_headset_init(rtd);

sound/soc/qcom/sc7280.c line 140

Quoted 10 lines
sound/soc/qcom/sc7280.c new file +10 -0
+       case LPASS_CDC_DMA_RX0:
+       case LPASS_CDC_DMA_VA_TX0:
+       case MI2S_SECONDARY:
+               return 0;
+       case LPASS_DP_RX:
+               return sc7280_hdmi_init(rtd);
+       default:
+               dev_err(rtd->dev, "%s: invalid dai id 0x%x\n", __func__, cpu_dai->id);
+               return -EINVAL;
+       }

Nitpick: Add newline.

sound/soc/qcom/sc7280.c line 141

Quoted 1 line
sound/soc/qcom/sc7280.c new file +1 -0
+       return 0;

Can we even get here? Maybe remove return from default above and make this a return -EINVAL.

Quoted 10 lines
sound/soc/qcom/sc7280.c new file +10 -0
+}
+
+static int sc7280_snd_startup(struct snd_pcm_substream *substream)
+{
+       struct snd_soc_pcm_runtime *rtd = substream->private_data;
+       struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);
+
+       switch (cpu_dai->id) {
+       case LPASS_CDC_DMA_RX0:
+       case LPASS_CDC_DMA_TX3:

sound/soc/qcom/sc7280.c line 161

Quoted 10 lines
sound/soc/qcom/sc7280.c new file +10 -0
+       case LPASS_CDC_DMA_VA_TX0:
+               break;
+       case MI2S_SECONDARY:
+               break;
+       case LPASS_DP_RX:
+               break;
+       default:
+               dev_err(rtd->dev, "%s: invalid dai id 0x%x\n", __func__, cpu_dai->id);
+               return -EINVAL;
+       }

Nitpick: Add newline.

sound/soc/qcom/sc7280.c line 171

Quoted 10 lines
sound/soc/qcom/sc7280.c new file +10 -0
+       return 0;
+}
+
+static int sc7280_snd_hw_params(struct snd_pcm_substream *substream,
+                               struct snd_pcm_hw_params *params)
+{
+       struct snd_pcm_runtime *runtime = substream->runtime;
+       struct snd_soc_pcm_runtime *rtd = substream->private_data;
+       struct snd_soc_dai *codec_dai;
+       struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);

const?

Quoted 10 lines
sound/soc/qcom/sc7280.c new file +10 -0
+       struct sc7280_snd_data *pdata = snd_soc_card_get_drvdata(rtd->card);
+       struct sdw_stream_runtime *sruntime;
+       int i;
+
+       snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_CHANNELS, 2, 2);
+       snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_RATE, 48000, 48000);
+
+       switch (cpu_dai->id) {
+       case LPASS_CDC_DMA_TX3:
+       case LPASS_CDC_DMA_RX0:

sound/soc/qcom/sc7280.c line 191

Quoted 10 lines
sound/soc/qcom/sc7280.c new file +10 -0
+               for_each_rtd_codec_dais(rtd, i, codec_dai) {
+                       sruntime = snd_soc_dai_get_sdw_stream(codec_dai, substream->stream);
+                       if (sruntime != ERR_PTR(-EOPNOTSUPP))
+                               pdata->sruntime[cpu_dai->id] = sruntime;
+               }
+               break;
+       }
+
+       return 0;
+

Nitpick: Drop newline.

sound/soc/qcom/sc7280.c line 197

Quoted 6 lines
sound/soc/qcom/sc7280.c new file +6 -0
+}
+
+static int sc7280_snd_swr_prepare(struct snd_pcm_substream *substream)
+{
+       struct snd_soc_pcm_runtime *rtd = substream->private_data;
+       struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);

const?

Quoted 13 lines
sound/soc/qcom/sc7280.c new file +13 -0
+       struct sc7280_snd_data *data = snd_soc_card_get_drvdata(rtd->card);
+       struct sdw_stream_runtime *sruntime = data->sruntime[cpu_dai->id];
+       int ret;
+
+       if (!sruntime)
+               return 0;
+
+       if (data->stream_prepared[cpu_dai->id]) {
+               sdw_disable_stream(sruntime);
+               sdw_deprepare_stream(sruntime);
+               data->stream_prepared[cpu_dai->id] = false;
+       }
+

sound/soc/qcom/sc7280.c line 220

Quoted 10 lines
sound/soc/qcom/sc7280.c new file +10 -0
+       ret = sdw_prepare_stream(sruntime);
+       if (ret)
+               return ret;
+
+       ret = sdw_enable_stream(sruntime);
+       if (ret) {
+               sdw_deprepare_stream(sruntime);
+               return ret;
+       }
+       data->stream_prepared[cpu_dai->id]  = true;

Why two spaces after ]?

sound/soc/qcom/sc7280.c line 229

Quoted 9 lines
sound/soc/qcom/sc7280.c new file +9 -0
+
+       return ret;
+}
+
+
+static int sc7280_snd_prepare(struct snd_pcm_substream *substream)
+{
+       struct snd_soc_pcm_runtime *rtd = substream->private_data;
+       struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);

const?

Quoted 7 lines
sound/soc/qcom/sc7280.c new file +7 -0
+
+       switch (cpu_dai->id) {
+       case LPASS_CDC_DMA_RX0:
+       case LPASS_CDC_DMA_TX3:
+               return sc7280_snd_swr_prepare(substream);
+       default:
+               break;

sound/soc/qcom/sc7280.c line 246

Quoted 10 lines
sound/soc/qcom/sc7280.c new file +10 -0
+       }
+
+       return 0;
+}
+
+static int sc7280_snd_hw_free(struct snd_pcm_substream *substream)
+{
+       struct snd_soc_pcm_runtime *rtd = substream->private_data;
+       struct sc7280_snd_data *data = snd_soc_card_get_drvdata(rtd->card);
+       struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);

const?

Quoted 23 lines
sound/soc/qcom/sc7280.c new file +23 -0
+       struct sdw_stream_runtime *sruntime = data->sruntime[cpu_dai->id];
+
+       switch (cpu_dai->id) {
+       case LPASS_CDC_DMA_RX0:
+       case LPASS_CDC_DMA_TX3:
+               if (sruntime && data->stream_prepared[cpu_dai->id]) {
+                       sdw_disable_stream(sruntime);
+                       sdw_deprepare_stream(sruntime);
+                       data->stream_prepared[cpu_dai->id] = false;
+               }
+               break;
+       default:
+               break;
+       }
+       return 0;
+}
+
+static void sc7280_snd_shutdown(struct snd_pcm_substream *substream)
+{
+       struct snd_soc_pcm_runtime *rtd = substream->private_data;
+       struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);
+
+       switch (cpu_dai->id) {

sound/soc/qcom/sc7280.c line 279

Quoted 10 lines
sound/soc/qcom/sc7280.c new file +10 -0
+       case LPASS_CDC_DMA_RX0:
+       case LPASS_CDC_DMA_TX3:
+       case LPASS_CDC_DMA_VA_TX0:
+               break;
+       case MI2S_SECONDARY:
+               break;
+       case LPASS_DP_RX:
+               break;
+       default:
+               dev_err(rtd->dev, "%s: invalid dai id 0x%x\n", __func__, cpu_dai->id);

Can use %#x to skip the 0x part.

Quoted 22 lines
sound/soc/qcom/sc7280.c new file +22 -0
+               break;
+       }
+}
+
+static const struct snd_soc_ops sc7280_ops = {
+       .startup = sc7280_snd_startup,
+       .shutdown = sc7280_snd_shutdown,
+       .hw_params = sc7280_snd_hw_params,
+       .hw_free = sc7280_snd_hw_free,
+       .prepare = sc7280_snd_prepare,
+};
+
+static const struct snd_soc_dapm_widget sc7280_snd_widgets[] = {
+       SND_SOC_DAPM_HP("Headphone Jack", NULL),
+       SND_SOC_DAPM_MIC("Headset Mic", NULL),
+};
+
+static int sc7280_snd_platform_probe(struct platform_device *pdev)
+{
+       struct snd_soc_card *card;
+       struct sc7280_snd_data *data;
+       struct device *dev = &pdev->dev;

sound/soc/qcom/sc7280.c line 311

Quoted 10 lines
sound/soc/qcom/sc7280.c new file +10 -0
+       struct snd_soc_dai_link *link;
+       int ret, i;
+
+       /* Allocate the private data */
+       data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
+       if (!data)
+               return -ENOMEM;
+
+       card = &data->card;
+       data->jack_setup = false;

Isn't that implicit via kzalloc above? This can be dropped.

Quoted 6 lines
sound/soc/qcom/sc7280.c new file +6 -0
+       snd_soc_card_set_drvdata(card, data);
+
+       card->owner = THIS_MODULE;
+       card->driver_name = DRIVER_NAME;
+       card->dev = dev;
+

sound/soc/qcom/sc7280.c line 327

Quoted 10 lines
sound/soc/qcom/sc7280.c new file +10 -0
+       ret = qcom_snd_parse_of(card);
+       if (ret)
+               return ret;
+
+       for_each_card_prelinks(card, i, link) {
+               link->init = sc7280_init;
+               link->ops = &sc7280_ops;
+       }
+       ret = devm_snd_soc_register_card(dev, card);
+       return ret;

Nitpick:

return devm_snd_soc_register_card(dev, card)

sound/soc/qcom/sc7280.c line 332

Quoted 5 lines
sound/soc/qcom/sc7280.c new file +5 -0
+}
+
+static const struct of_device_id sc7280_snd_device_id[]  = {
+       {.compatible = "google,sc7280-herobrine"},
+       {},

Nitpick: Drop comma here so nothing can come after without causing a compile error.

Quoted 3 lines
sound/soc/qcom/sc7280.c new file +3 -0
+};
+MODULE_DEVICE_TABLE(of, sc7280_snd_device_id);
+
#8 lore raw

Re: [PATCH 2/2] ASoC: qcom: SC7280: Add machine driver

Thanks for Your Time Stephen!!!

Quoted 16 lines · Stephen Boyd

Quoting Srinivasa Rao Mandadapu (2021-09-08 11:00:57)

Quoted 6 lines
sound/soc/qcom/sc7280.c new file +0 -0
new file mode 100644
index 0000000..1ab29f6

sound/soc/qcom/sc7280.c line 8

Quoted 8 lines
sound/soc/qcom/sc7280.c new file +8 -0
@@ -0,0 +1,347 @@
+// SPDX-License-Identifier: GPL-2.0-only
+//
+// Copyright (c) 2020-2021, The Linux Foundation. All rights reserved.
+//
+// sc7280.c -- ALSA SoC Machine driver for sc7280
+
+#include <dt-bindings/sound/sc7180-lpass.h>
+#include <dt-bindings/sound/qcom,q6afe.h>

Can these come after the linux/sound includes?

yes. it can be moved to below.

Quoted 12 lines

sound/soc/qcom/sc7280.c line 18

Quoted 11 lines
sound/soc/qcom/sc7280.c new file +10 -0
+#include <linux/gpio.h>
+#include <linux/gpio/consumer.h>
+#include <linux/module.h>
+#include <linux/of_device.h>
+#include <linux/platform_device.h>
+#include <sound/core.h>
+#include <sound/jack.h>
+#include <sound/pcm.h>
+#include <sound/soc.h>
+#include <uapi/linux/input-event-codes.h>

Is this include used?

This is is required for macros KEY_MEDIA' KEY_'VOICECOMMAND' 'KEY_VOLUMEUP'.

Quoted 9 lines

sound/soc/qcom/sc7280.c line 24

Quoted 7 lines
sound/soc/qcom/sc7280.c new file +6 -0
+
+#include "../codecs/wcd938x.h"
+#include "common.h"
+#include "lpass.h"
+
+#define DRIVER_NAME "SC7280"

Is this useful? Why not just inline it in the one place it is used so we don't have to jump to the define to figure out what it is?

Yes. will make it inline.

Quoted 54 lines
Quoted 54 lines
sound/soc/qcom/sc7280.c new file +54 -0
+#define LPASS_MAX_PORTS  (LPASS_CDC_DMA_VA_TX8 + 1)
+
+
+struct sc7280_snd_data {
+       bool stream_prepared[LPASS_MAX_PORTS];
+       struct snd_soc_card card;
+       struct sdw_stream_runtime *sruntime[LPASS_MAX_PORTS];
+       struct snd_soc_jack hs_jack;
+       struct snd_soc_jack hdmi_jack;
+       bool jack_setup;
+};
+
+static void sc7280_jack_free(struct snd_jack *jack)
+{
+       struct snd_soc_component *component = jack->private_data;
+
+       snd_soc_component_set_jack(component, NULL, NULL);
+}
+
+static int sc7280_headset_init(struct snd_soc_pcm_runtime *rtd)
+{
+       struct snd_soc_card *card = rtd->card;
+       struct sc7280_snd_data *pdata = snd_soc_card_get_drvdata(card);
+       struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0);
+       struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);
+       struct snd_soc_component *component = codec_dai->component;
+       struct snd_jack *jack;
+       int rval, i;
+
+       if (!pdata->jack_setup) {
+               rval = snd_soc_card_jack_new(card, "Headset Jack",
+                                                       SND_JACK_HEADSET | SND_JACK_LINEOUT |
+                                                       SND_JACK_MECHANICAL |
+                                                       SND_JACK_BTN_0 | SND_JACK_BTN_1 |
+                                                       SND_JACK_BTN_2 | SND_JACK_BTN_3 |
+                                                       SND_JACK_BTN_4 | SND_JACK_BTN_5,
+                                                       &pdata->hs_jack, NULL, 0);
+
+               if (rval < 0) {
+                       dev_err(card->dev, "Unable to add Headset Jack\n");
+                       return rval;
+               }
+
+               jack = pdata->hs_jack.jack;
+
+               snd_jack_set_key(jack, SND_JACK_BTN_0, KEY_MEDIA);
+               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);
+
+               jack->private_data = component;
+               jack->private_free = sc7280_jack_free;
+               pdata->jack_setup = true;
+       }
Quoted 8 lines

sound/soc/qcom/sc7280.c line 85

Quoted 7 lines
sound/soc/qcom/sc7280.c new file +7 -0
+       switch (cpu_dai->id) {
+       case LPASS_CDC_DMA_RX0:
+       case LPASS_CDC_DMA_TX3:
+               for_each_rtd_codec_dais(rtd, i, codec_dai) {
+                       rval = snd_soc_component_set_jack(component, &pdata->hs_jack, NULL);
+                       if (rval != 0 && rval != -EOPNOTSUPP) {
+                               dev_warn(card->dev, "Failed to set jack: %d\n", rval);

Why not dev_err?

Okay. will change to dev_err().

Quoted 49 lines
Quoted 49 lines
sound/soc/qcom/sc7280.c new file +48 -0
+                               return rval;
+                       }
+               }
+
+               break;
+       default:
+               break;
+       }
+
+       return 0;
+}
+
+static int sc7280_hdmi_init(struct snd_soc_pcm_runtime *rtd)
+{
+       struct snd_soc_card *card = rtd->card;
+       struct sc7280_snd_data *pdata = snd_soc_card_get_drvdata(card);
+       struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0);
+       struct snd_soc_component *component = codec_dai->component;
+       struct snd_jack *jack;
+       int rval;
+
+       rval = snd_soc_card_jack_new(
+                       card, "HDMI Jack",
+                       SND_JACK_LINEOUT,
+                       &pdata->hdmi_jack, NULL, 0);
+
+       if (rval < 0) {
+               dev_err(card->dev, "Unable to add HDMI Jack\n");
+               return rval;
+       }
+
+       jack = pdata->hdmi_jack.jack;
+       jack->private_data = component;
+       jack->private_free = sc7280_jack_free;
+
+       return snd_soc_component_set_jack(component, &pdata->hdmi_jack, NULL);
+}
+
+static int sc7280_init(struct snd_soc_pcm_runtime *rtd)
+{
+       struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);
+
+       switch (cpu_dai->id) {
+       case LPASS_CDC_DMA_TX3:
+               return sc7280_headset_init(rtd);
+       case LPASS_CDC_DMA_RX0:
+       case LPASS_CDC_DMA_VA_TX0:
+       case MI2S_SECONDARY:
Quoted 8 lines

sound/soc/qcom/sc7280.c line 140

Quoted 7 lines
sound/soc/qcom/sc7280.c new file +7 -0
+               return 0;
+       case LPASS_DP_RX:
+               return sc7280_hdmi_init(rtd);
+       default:
+               dev_err(rtd->dev, "%s: invalid dai id 0x%x\n", __func__, cpu_dai->id);
+               return -EINVAL;
+       }

Nitpick: Add newline.

Okay.

Quoted 18 lines

sound/soc/qcom/sc7280.c line 141

Quoted 2 lines
sound/soc/qcom/sc7280.c new file +1 -0
+       return 0;

Can we even get here? Maybe remove return from default above and make this a return -EINVAL.

Quoted 13 lines
sound/soc/qcom/sc7280.c new file +13 -0
+}
+
+static int sc7280_snd_startup(struct snd_pcm_substream *substream)
+{
+       struct snd_soc_pcm_runtime *rtd = substream->private_data;
+       struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);
+
+       switch (cpu_dai->id) {
+       case LPASS_CDC_DMA_RX0:
+       case LPASS_CDC_DMA_TX3:
+       case LPASS_CDC_DMA_VA_TX0:
+               break;
+       case MI2S_SECONDARY:
Quoted 8 lines

sound/soc/qcom/sc7280.c line 161

Quoted 7 lines
sound/soc/qcom/sc7280.c new file +7 -0
+               break;
+       case LPASS_DP_RX:
+               break;
+       default:
+               dev_err(rtd->dev, "%s: invalid dai id 0x%x\n", __func__, cpu_dai->id);
+               return -EINVAL;
+       }

Nitpick: Add newline.

Okay.

Quoted 12 lines

sound/soc/qcom/sc7280.c line 171

Quoted 11 lines
sound/soc/qcom/sc7280.c new file +10 -0
+       return 0;
+}
+
+static int sc7280_snd_hw_params(struct snd_pcm_substream *substream,
+                               struct snd_pcm_hw_params *params)
+{
+       struct snd_pcm_runtime *runtime = substream->runtime;
+       struct snd_soc_pcm_runtime *rtd = substream->private_data;
+       struct snd_soc_dai *codec_dai;
+       struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);

const?

Okay.

Quoted 14 lines
Quoted 14 lines
sound/soc/qcom/sc7280.c new file +13 -0
+       struct sc7280_snd_data *pdata = snd_soc_card_get_drvdata(rtd->card);
+       struct sdw_stream_runtime *sruntime;
+       int i;
+
+       snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_CHANNELS, 2, 2);
+       snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_RATE, 48000, 48000);
+
+       switch (cpu_dai->id) {
+       case LPASS_CDC_DMA_TX3:
+       case LPASS_CDC_DMA_RX0:
+               for_each_rtd_codec_dais(rtd, i, codec_dai) {
+                       sruntime = snd_soc_dai_get_sdw_stream(codec_dai, substream->stream);
+                       if (sruntime != ERR_PTR(-EOPNOTSUPP))
Quoted 8 lines

sound/soc/qcom/sc7280.c line 191

Quoted 7 lines
sound/soc/qcom/sc7280.c new file +7 -0
+                               pdata->sruntime[cpu_dai->id] = sruntime;
+               }
+               break;
+       }
+
+       return 0;
+

Nitpick: Drop newline.

Okay.

Quoted 8 lines

sound/soc/qcom/sc7280.c line 197

Quoted 7 lines
sound/soc/qcom/sc7280.c new file +6 -0
+}
+
+static int sc7280_snd_swr_prepare(struct snd_pcm_substream *substream)
+{
+       struct snd_soc_pcm_runtime *rtd = substream->private_data;
+       struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);

const?

Okay.

Quoted 17 lines
Quoted 17 lines
sound/soc/qcom/sc7280.c new file +16 -0
+       struct sc7280_snd_data *data = snd_soc_card_get_drvdata(rtd->card);
+       struct sdw_stream_runtime *sruntime = data->sruntime[cpu_dai->id];
+       int ret;
+
+       if (!sruntime)
+               return 0;
+
+       if (data->stream_prepared[cpu_dai->id]) {
+               sdw_disable_stream(sruntime);
+               sdw_deprepare_stream(sruntime);
+               data->stream_prepared[cpu_dai->id] = false;
+       }
+
+       ret = sdw_prepare_stream(sruntime);
+       if (ret)
+               return ret;
Quoted 8 lines

sound/soc/qcom/sc7280.c line 220

Quoted 7 lines
sound/soc/qcom/sc7280.c new file +7 -0
+
+       ret = sdw_enable_stream(sruntime);
+       if (ret) {
+               sdw_deprepare_stream(sruntime);
+               return ret;
+       }
+       data->stream_prepared[cpu_dai->id]  = true;

Why two spaces after ]?

Okay. Will remove it.

Quoted 11 lines

sound/soc/qcom/sc7280.c line 229

Quoted 10 lines
sound/soc/qcom/sc7280.c new file +9 -0
+
+       return ret;
+}
+
+
+static int sc7280_snd_prepare(struct snd_pcm_substream *substream)
+{
+       struct snd_soc_pcm_runtime *rtd = substream->private_data;
+       struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);

const?

Okay.

Quoted 11 lines
Quoted 11 lines
sound/soc/qcom/sc7280.c new file +10 -0
+
+       switch (cpu_dai->id) {
+       case LPASS_CDC_DMA_RX0:
+       case LPASS_CDC_DMA_TX3:
+               return sc7280_snd_swr_prepare(substream);
+       default:
+               break;
+       }
+
+       return 0;
Quoted 8 lines

sound/soc/qcom/sc7280.c line 246

Quoted 7 lines
sound/soc/qcom/sc7280.c new file +7 -0
+}
+
+static int sc7280_snd_hw_free(struct snd_pcm_substream *substream)
+{
+       struct snd_soc_pcm_runtime *rtd = substream->private_data;
+       struct sc7280_snd_data *data = snd_soc_card_get_drvdata(rtd->card);
+       struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);

const?

Okay.

Quoted 27 lines
Quoted 27 lines
sound/soc/qcom/sc7280.c new file +26 -0
+       struct sdw_stream_runtime *sruntime = data->sruntime[cpu_dai->id];
+
+       switch (cpu_dai->id) {
+       case LPASS_CDC_DMA_RX0:
+       case LPASS_CDC_DMA_TX3:
+               if (sruntime && data->stream_prepared[cpu_dai->id]) {
+                       sdw_disable_stream(sruntime);
+                       sdw_deprepare_stream(sruntime);
+                       data->stream_prepared[cpu_dai->id] = false;
+               }
+               break;
+       default:
+               break;
+       }
+       return 0;
+}
+
+static void sc7280_snd_shutdown(struct snd_pcm_substream *substream)
+{
+       struct snd_soc_pcm_runtime *rtd = substream->private_data;
+       struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);
+
+       switch (cpu_dai->id) {
+       case LPASS_CDC_DMA_RX0:
+       case LPASS_CDC_DMA_TX3:
+       case LPASS_CDC_DMA_VA_TX0:
Quoted 8 lines

sound/soc/qcom/sc7280.c line 159

Quoted 7 lines
sound/soc/qcom/sc7280.c new file +7 -0
+               break;
+       case MI2S_SECONDARY:
+               break;
+       case LPASS_DP_RX:
+               break;
+       default:
+               dev_err(rtd->dev, "%s: invalid dai id 0x%x\n", __func__, cpu_dai->id);

Can use %#x to skip the 0x part.

Okay. Will Change it to %d.

Quoted 26 lines
Quoted 26 lines
sound/soc/qcom/sc7280.c new file +25 -0
+               break;
+       }
+}
+
+static const struct snd_soc_ops sc7280_ops = {
+       .startup = sc7280_snd_startup,
+       .shutdown = sc7280_snd_shutdown,
+       .hw_params = sc7280_snd_hw_params,
+       .hw_free = sc7280_snd_hw_free,
+       .prepare = sc7280_snd_prepare,
+};
+
+static const struct snd_soc_dapm_widget sc7280_snd_widgets[] = {
+       SND_SOC_DAPM_HP("Headphone Jack", NULL),
+       SND_SOC_DAPM_MIC("Headset Mic", NULL),
+};
+
+static int sc7280_snd_platform_probe(struct platform_device *pdev)
+{
+       struct snd_soc_card *card;
+       struct sc7280_snd_data *data;
+       struct device *dev = &pdev->dev;
+       struct snd_soc_dai_link *link;
+       int ret, i;
+
Quoted 8 lines

sound/soc/qcom/sc7280.c line 311

Quoted 7 lines
sound/soc/qcom/sc7280.c new file +7 -0
+       /* Allocate the private data */
+       data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
+       if (!data)
+               return -ENOMEM;
+
+       card = &data->card;
+       data->jack_setup = false;

Isn't that implicit via kzalloc above? This can be dropped.

Yes. Will remove it.

Quoted 19 lines
Quoted 7 lines
sound/soc/qcom/sc7280.c new file +6 -0
+       snd_soc_card_set_drvdata(card, data);
+
+       card->owner = THIS_MODULE;
+       card->driver_name = DRIVER_NAME;
+       card->dev = dev;
+

sound/soc/qcom/sc7280.c line 327

Quoted 10 lines
sound/soc/qcom/sc7280.c new file +10 -0
+       ret = qcom_snd_parse_of(card);
+       if (ret)
+               return ret;
+
+       for_each_card_prelinks(card, i, link) {
+               link->init = sc7280_init;
+               link->ops = &sc7280_ops;
+       }
+       ret = devm_snd_soc_register_card(dev, card);
+       return ret;

Nitpick:

Quoted 1 line

return devm_snd_soc_register_card(dev, card)

Okay. will change it.

Quoted 8 lines

sound/soc/qcom/sc7280.c line 332

Quoted 6 lines
sound/soc/qcom/sc7280.c new file +5 -0
+}
+
+static const struct of_device_id sc7280_snd_device_id[]  = {
+       {.compatible = "google,sc7280-herobrine"},
+       {},

Nitpick: Drop comma here so nothing can come after without causing a compile error.

Okay. Will remove it.

Quoted 4 lines
Quoted 4 lines
sound/soc/qcom/sc7280.c new file +3 -0
+};
+MODULE_DEVICE_TABLE(of, sc7280_snd_device_id);
+
Signature · 2 lines
Qualcomm India Private Limited, on behalf of Qualcomm Innovation Center, Inc.,
is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.