Skip to contentSkip to conversation

Machine driver to support LPASS SC7280 sound card registration

PATCH Superseded Srinivasa Rao Mandadapu 5 participants 14 messages Oct 29, 2021 – Nov 8, 2021

Subsystems (5)

v4 of 6 Superseded Latest is v6 →

lore
Share & tools
lore
#0 lore raw

v4 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.

This patch set 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
Changes Since V3:
-- Change audio jack playpause key value.
Changes Since V2:
-- updated required field in bindings
-- updated Return type check with proper enum in sc7280.c -- Updated Header name and Typos in sc7280.c
Changes Since V1:
-- Indentation changes and typo.

 .../bindings/sound/google,sc7280-herobrine.yaml    | 170 ++++++++++
 sound/soc/qcom/Kconfig                             |  12 +
 sound/soc/qcom/Makefile                            |   2 +
 sound/soc/qcom/sc7280.c                            | 343 +++++++++++++++++++++
 4 files changed, 527 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 v4 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    | 170 +++++++++++++++++++++
 1 file changed, 170 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/sound/google,sc7280-herobrine.yaml
Documentation/devicetree/bindings/sound/google,sc7280-herobrine.yaml new file +170 -0
new file mode 100644
index 0000000..3a781c8
@@ -0,0 +1,170 @@
+# 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
+      - reg
+
+    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.
#2 lore raw

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

Quoting Srinivasa Rao Mandadapu (2021-10-29 08:04:35)

Quoted 56 lines
Documentation/devicetree/bindings/sound/google,sc7280-herobrine.yaml new file +50 -0
new file mode 100644
index 0000000..3a781c8
@@ -0,0 +1,170 @@
+# 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

Documentation/devicetree/bindings/sound/google,sc7280-herobrine.yaml line 60

Quoted 10 lines
Documentation/devicetree/bindings/sound/google,sc7280-herobrine.yaml new file +10 -0
+
+      reg:
+        maxItems: 1
+        description: dai link address.
+
+      cpu:
+        description: Holds subnode which indicates cpu dai.
+        type: object
+        properties:
+          sound-dai: true

Is sound-dai required? And additionalProperties is false? I think we need that yet again.

Documentation/devicetree/bindings/sound/google,sc7280-herobrine.yaml line 67

Quoted 7 lines
Documentation/devicetree/bindings/sound/google,sc7280-herobrine.yaml new file +7 -0
+
+      codec:
+        description: Holds subnode which indicates codec dai.
+        type: object
+        properties:
+          sound-dai: true
+

Same here.

Quoted 8 lines
Documentation/devicetree/bindings/sound/google,sc7280-herobrine.yaml new file +8 -0
+    required:
+      - link-name
+      - cpu
+      - codec
+      - reg
+
+    additionalProperties: false
+
#3 lore raw

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

On 10/30/2021 12:37 AM, Stephen Boyd wrote:
Thanks for Your time Stephen!!!

Quoted 61 lines

Quoting Srinivasa Rao Mandadapu (2021-10-29 08:04:35)

Quoted 60 lines
Documentation/devicetree/bindings/sound/google,sc7280-herobrine.yaml new file +54 -0
new file mode 100644
index 0000000..3a781c8
@@ -0,0 +1,170 @@
+# 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.
Quoted 8 lines

Documentation/devicetree/bindings/sound/google,sc7280-herobrine.yaml line 60

Quoted 6 lines
Documentation/devicetree/bindings/sound/google,sc7280-herobrine.yaml new file +6 -0
+
+      cpu:
+        description: Holds subnode which indicates cpu dai.
+        type: object
+        properties:
+          sound-dai: true

Is sound-dai required? And additionalProperties is false? I think we need that yet again.

Okay. Will mark additionalPropertiesas true.

Quoted 18 lines

Documentation/devicetree/bindings/sound/google,sc7280-herobrine.yaml line 67

Quoted 8 lines
Documentation/devicetree/bindings/sound/google,sc7280-herobrine.yaml new file +7 -0
+
+      codec:
+        description: Holds subnode which indicates codec dai.
+        type: object
+        properties:
+          sound-dai: true
+

Same here.

Quoted 8 lines
Documentation/devicetree/bindings/sound/google,sc7280-herobrine.yaml new file +8 -0
+    required:
+      - link-name
+      - cpu
+      - codec
+      - reg
+
+    additionalProperties: false
+
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.
#4 lore raw

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

Quoted 73 lines · Srinivasa Rao Mandadapu

On 10/30/2021 12:37 AM, Stephen Boyd wrote:
Thanks for Your time Stephen!!!

Quoted 61 lines

Quoting Srinivasa Rao Mandadapu (2021-10-29 08:04:35)

Quoted 60 lines
Documentation/devicetree/bindings/sound/google,sc7280-herobrine.yaml new file +54 -0
new file mode 100644
index 0000000..3a781c8
@@ -0,0 +1,170 @@
+# 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.
Quoted 8 lines

Documentation/devicetree/bindings/sound/google,sc7280-herobrine.yaml line 60

Quoted 6 lines
Documentation/devicetree/bindings/sound/google,sc7280-herobrine.yaml new file +6 -0
+
+      cpu:
+        description: Holds subnode which indicates cpu dai.
+        type: object
+        properties:
+          sound-dai: true

Is sound-dai required? And additionalProperties is false? I think we need that yet again.

Quoted 1 line

Okay. Will mark additionalPropertiesas true.

'additiionalProperties: true' is almost never right. It's generally only correct for schemas that are incomplete collections of properties.

Rob

#5 lore raw

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

On 11/6/2021 7:00 AM, Rob Herring wrote:
Thanks for Your time Rob!!!

Quoted 74 lines
Quoted 72 lines · Srinivasa Rao Mandadapu

On 10/30/2021 12:37 AM, Stephen Boyd wrote:
Thanks for Your time Stephen!!!

Quoted 69 lines

Quoting Srinivasa Rao Mandadapu (2021-10-29 08:04:35)

Quoted 56 lines
Documentation/devicetree/bindings/sound/google,sc7280-herobrine.yaml new file +50 -0
new file mode 100644
index 0000000..3a781c8
@@ -0,0 +1,170 @@
+# 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

Documentation/devicetree/bindings/sound/google,sc7280-herobrine.yaml line 60

Quoted 10 lines
Documentation/devicetree/bindings/sound/google,sc7280-herobrine.yaml new file +10 -0
+
+      reg:
+        maxItems: 1
+        description: dai link address.
+
+      cpu:
+        description: Holds subnode which indicates cpu dai.
+        type: object
+        properties:
+          sound-dai: true

Is sound-dai required? And additionalProperties is false? I think we need that yet again.

Quoted 6 lines
Quoted 1 line

Okay. Will mark additionalPropertiesas true.

'additiionalProperties: true' is almost never right. It's generally only correct for schemas that are incomplete collections of properties.

Rob

As per Stephen Suggestion. thought it's a solution.

The sound-dai required here, and same is fallowed in SC7180 machine driver bindings.

Could You please suggest better approach on this?

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

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

Quoted 83 lines · Srinivasa Rao Mandadapu

On 11/6/2021 7:00 AM, Rob Herring wrote:
Thanks for Your time Rob!!!

Quoted 79 lines
Quoted 72 lines · Srinivasa Rao Mandadapu

On 10/30/2021 12:37 AM, Stephen Boyd wrote:
Thanks for Your time Stephen!!!

Quoted 61 lines

Quoting Srinivasa Rao Mandadapu (2021-10-29 08:04:35)

Quoted 60 lines
Documentation/devicetree/bindings/sound/google,sc7280-herobrine.yaml new file +54 -0
new file mode 100644
index 0000000..3a781c8
@@ -0,0 +1,170 @@
+# 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.
Quoted 8 lines

Documentation/devicetree/bindings/sound/google,sc7280-herobrine.yaml line 60

Quoted 6 lines
Documentation/devicetree/bindings/sound/google,sc7280-herobrine.yaml new file +6 -0
+
+      cpu:
+        description: Holds subnode which indicates cpu dai.
+        type: object
+        properties:
+          sound-dai: true

Is sound-dai required? And additionalProperties is false? I think we need that yet again.

Quoted 1 line

Okay. Will mark additionalPropertiesas true.

'additiionalProperties: true' is almost never right. It's generally only correct for schemas that are incomplete collections of properties.

Quoted 8 lines
Quoted 1 line

Rob

As per Stephen Suggestion. thought it's a solution.

The sound-dai required here, and same is fallowed in SC7180 machine driver bindings.

Could You please suggest better approach on this?

Exactly what Stephen said, add:

required:
- sound-dai

additionalProperties: false

#7 lore raw

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

On 11/8/2021 7:30 PM, Rob Herring wrote:
Thanks for Your inputs Rob!!!

Quoted 89 lines
Quoted 87 lines · Srinivasa Rao Mandadapu

On 11/6/2021 7:00 AM, Rob Herring wrote:
Thanks for Your time Rob!!!

Quoted 73 lines
Quoted 71 lines · Srinivasa Rao Mandadapu

On 10/30/2021 12:37 AM, Stephen Boyd wrote:
Thanks for Your time Stephen!!!

Quoted 69 lines

Quoting Srinivasa Rao Mandadapu (2021-10-29 08:04:35)

Quoted 56 lines
Documentation/devicetree/bindings/sound/google,sc7280-herobrine.yaml new file +50 -0
new file mode 100644
index 0000000..3a781c8
@@ -0,0 +1,170 @@
+# 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

Documentation/devicetree/bindings/sound/google,sc7280-herobrine.yaml line 60

Quoted 10 lines
Documentation/devicetree/bindings/sound/google,sc7280-herobrine.yaml new file +10 -0
+
+      reg:
+        maxItems: 1
+        description: dai link address.
+
+      cpu:
+        description: Holds subnode which indicates cpu dai.
+        type: object
+        properties:
+          sound-dai: true

Is sound-dai required? And additionalProperties is false? I think we need that yet again.

Quoted 6 lines
Quoted 1 line

Okay. Will mark additionalPropertiesas true.

'additiionalProperties: true' is almost never right. It's generally only correct for schemas that are incomplete collections of properties.

Rob

As per Stephen Suggestion. thought it's a solution.

The sound-dai required here, and same is fallowed in SC7180 machine driver bindings.

Quoted 7 lines
Quoted 1 line

Could You please suggest better approach on this?

Exactly what Stephen said, add:

required:
- sound-dai

additionalProperties: false

Okay. Then changes looks like below snippet. Please correct me If I am wrong.

 ------
 ------

      codec:
        description: Holds subnode which indicates codec dai.
        type: object
        properties:
          sound-dai: true

    required:
      - link-name
      - cpu
      - codec
      - reg
*- sound-dai*

    additionalProperties: false

required:
  - compatible
  - model
  - "#address-cells"
  - "#size-cells"

additionalProperties: false

-------
-------

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
#8 lore raw

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

In reply to Srinivasa Rao Mandadapu
Quoted 9 lines · Srinivasa Rao Mandadapu

Add devicetree bindings documentation file for sc7280 sound card registration.

---
 .../bindings/sound/google,sc7280-herobrine.yaml    | 170 +++++++++++++++++++++
 1 file changed, 170 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:385: Documentation/devicetree/bindings/sound/google,sc7280-herobrine.example.dt.yaml] Error 1 make[1]: *** Waiting for unfinished jobs....
make: *** [Makefile:1441: dt_binding_check] Error 2

doc reference errors (make refcheckdocs):

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

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.

#9 lore raw

PATCH v4 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 | 343 ++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 357 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 +343 -0

343 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.
#10 lore raw

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

Quoting Srinivasa Rao Mandadapu (2021-10-29 08:04:36)

sound/soc/qcom/Kconfig config SND_SOC_SC7180 · line 157

Quoted 11 lines
sound/soc/qcom/Kconfig +3 -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

Add || COMPILE_TEST so we can compile test this driver?

sound/soc/qcom/Kconfig config SND_SOC_SC7180 · line 163

Quoted 6 lines
sound/soc/qcom/Kconfig +6 -0
+       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.

Drop "To"?

Quoted 10 lines
sound/soc/qcom/Kconfig +3 -0
+         SC7280 SoC-based systems.
+         Say Y if you want to use audio device on this SoCs.
+
 endif #SND_SOC_QCOM
sound/soc/qcom/sc7280.c new file +0 -0
new file mode 100644
index 0000000..1d73b4f

sound/soc/qcom/sc7280.c line 5

Quoted 5 lines
sound/soc/qcom/sc7280.c new file +5 -0
@@ -0,0 +1,343 @@
+// 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

Please remove filename from the comment as it's not useful and may change.

Quoted 2 lines
sound/soc/qcom/sc7280.c new file +2 -0
+
+#include <linux/gpio.h>

[...]

Quoted 9 lines
sound/soc/qcom/sc7280.c new file +9 -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:

sound/soc/qcom/sc7280.c line 279

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 %d\n", __func__, cpu_dai->id);
+               break;
+       }

The function doesn't do anything though. Why do we care?

Quoted 38 lines
sound/soc/qcom/sc7280.c new file +38 -0
+}
+
+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;
+
+       data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
+       if (!data)
+               return -ENOMEM;
+
+       card = &data->card;
+       snd_soc_card_set_drvdata(card, data);
+
+       card->owner = THIS_MODULE;
+       card->driver_name = "SC7280";
+       card->dev = dev;
+
+       ret = qcom_snd_parse_of(card);
+       if (ret)
+               return ret;
+

sound/soc/qcom/sc7280.c line 327

Quoted 10 lines
sound/soc/qcom/sc7280.c new file +10 -0
+       for_each_card_prelinks(card, i, link) {
+               link->init = sc7280_init;
+               link->ops = &sc7280_ops;
+       }
+
+       return devm_snd_soc_register_card(dev, card);
+}
+
+static const struct of_device_id sc7280_snd_device_id[]  = {
+       {.compatible = "google,sc7280-herobrine"},

Please add space after { and before }

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

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

On 10/30/2021 12:40 AM, Stephen Boyd wrote:
Thanks for our time Stephen!!!

Quoted 9 lines

Quoting Srinivasa Rao Mandadapu (2021-10-29 08:04:36)

Quoted 8 lines
sound/soc/qcom/Kconfig +0 -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.
 
Quoted 4 lines

sound/soc/qcom/Kconfig config SND_SOC_SC7180 · line 157

Quoted 3 lines
sound/soc/qcom/Kconfig +3 -0
+config SND_SOC_SC7280
+       tristate "SoC Machine driver for SC7280 boards"
+       depends on I2C && SOUNDWIRE

Add || COMPILE_TEST so we can compile test this driver?

Okay. Will add it.

Quoted 8 lines

sound/soc/qcom/Kconfig config SND_SOC_SC7180 · line 163

Quoted 7 lines
sound/soc/qcom/Kconfig +6 -0
+       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.

Drop "To"?

Okay.

Quoted 10 lines
Quoted 10 lines
sound/soc/qcom/Kconfig +3 -0
+         SC7280 SoC-based systems.
+         Say Y if you want to use audio device on this SoCs.
+
  endif #SND_SOC_QCOM
sound/soc/qcom/sc7280.c new file +0 -0
new file mode 100644
index 0000000..1d73b4f
Quoted 8 lines

sound/soc/qcom/sc7280.c line 5

Quoted 6 lines
sound/soc/qcom/sc7280.c new file +5 -0
@@ -0,0 +1,343 @@
+// 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

Please remove filename from the comment as it's not useful and may change.

Okay.

Quoted 15 lines
Quoted 2 lines
sound/soc/qcom/sc7280.c new file +2 -0
+
+#include <linux/gpio.h>

[...]

Quoted 12 lines
sound/soc/qcom/sc7280.c new file +12 -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:
+               break;
+       case MI2S_SECONDARY:
Quoted 8 lines

sound/soc/qcom/sc7280.c line 279

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 %d\n", __func__, cpu_dai->id);
+               break;
+       }

The function doesn't do anything though. Why do we care?

Okay. will remove 'sc7280_snd_startup' and 'sc7280_snd_shutdown'.

Quoted 42 lines
Quoted 42 lines
sound/soc/qcom/sc7280.c new file +41 -0
+}
+
+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;
+
+       data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
+       if (!data)
+               return -ENOMEM;
+
+       card = &data->card;
+       snd_soc_card_set_drvdata(card, data);
+
+       card->owner = THIS_MODULE;
+       card->driver_name = "SC7280";
+       card->dev = dev;
+
+       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;
Quoted 8 lines

sound/soc/qcom/sc7280.c line 327

Quoted 7 lines
sound/soc/qcom/sc7280.c new file +7 -0
+       }
+
+       return devm_snd_soc_register_card(dev, card);
+}
+
+static const struct of_device_id sc7280_snd_device_id[]  = {
+       {.compatible = "google,sc7280-herobrine"},

Please add space after { and before }

Okay.

Quoted 3 lines
Quoted 3 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.
#12 lore raw

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

In reply to Srinivasa Rao Mandadapu
Quoted 9 lines · Srinivasa Rao Mandadapu
sound/soc/qcom/Kconfig +1 -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

sound/soc/qcom/Kconfig config SND_SOC_SC7180 · line 165

Quoted 10 lines
sound/soc/qcom/Kconfig +10 -0
+	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.

Say Y or M if you want to use audio devices on this SoC.

Signature · 1 line
~Randy
#13 lore raw

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

On 10/30/2021 5:04 AM, Randy Dunlap wrote:
Thanks for your time Randy!!!

Quoted 13 lines · Srinivasa Rao Mandadapu
Quoted 12 lines
sound/soc/qcom/Kconfig +0 -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

Quoted 9 lines
Quoted 6 lines

+    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.

      Say Y or M if you want to use audio devices on this SoC.

Okay. Will change accordingly.

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.