Unverified Commit 36b90846 authored by Mark Brown's avatar Mark Brown
Browse files

Merge series "ASoC: codecs: add support for LPASS Codec macros" from Srinivas... 

Merge series "ASoC: codecs: add support for LPASS Codec macros" from Srinivas Kandagatla <srinivas.kandagatla@linaro.org>:

This patchset adds support for two Codec Macro blocks( WSA and VA) available in
Qualcomm LPASS (Low Power Audio SubSystem).

There are WSA, VA, TX and RX Macros on LPASS IP, each of the Macro block
has specific connectivity like WSA Macros are intended to connect
to WSA Smart speaker codecs via SoundWire. VA Macro is intended for DMICs,
and TX/RX for Analog codecs via SoundWire like other WCD Codecs to provide
headphone/ear/lineout etc ..

Most of the work is derived from downstream Qualcomm kernels.
Credits to various Qualcomm authors from Patrick Lai's team who have
contributed to this code.

This patchset has been tested on support to Qualcomm Robotics RB5 Development
Kit based on QRB5165 Robotics SoC. This board has 2 WSA881X smart speakers
with onboard DMIC connected to internal LPASS codec via WSA  and VA macros
respectively.

Thanks,
srini

-Changes since v2:
 - various unnecessary variable intializations removed, suggested by Pierre
 - fixed a static checker error
 - collected reviews for dt-bindings.
 - fixed licence headers as suggested by Pierre.

Srinivas Kandagatla (6):
  ASoC: qcom: dt-bindings: add bindings for lpass wsa macro codec
  ASoC: codecs: lpass-wsa-macro: Add support to WSA Macro
  ASoC: codecs: lpass-wsa-macro: add dapm widgets and route
  ASoC: qcom: dt-bindings: add bindings for lpass va macro codec
  ASoC: codecs: lpass-va-macro: Add support to VA Macro
  ASoC: codecs: lpass-va-macro: add dapm widgets and routes

 .../bindings/sound/qcom,lpass-va-macro.yaml   |   67 +
 .../bindings/sound/qcom,lpass-wsa-macro.yaml  |   69 +
 sound/soc/codecs/Kconfig                      |    8 +
 sound/soc/codecs/Makefile                     |    4 +
 sound/soc/codecs/lpass-va-macro.c             | 1503 ++++++++++
 sound/soc/codecs/lpass-wsa-macro.c            | 2464 +++++++++++++++++
 sound/soc/codecs/lpass-wsa-macro.h            |   17 +
 7 files changed, 4132 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/sound/qcom,lpass-va-macro.yaml
 create mode 100644 Documentation/devicetree/bindings/sound/qcom,lpass-wsa-macro.yaml
 create mode 100644 sound/soc/codecs/lpass-va-macro.c
 create mode 100644 sound/soc/codecs/lpass-wsa-macro.c
 create mode 100644 sound/soc/codecs/lpass-wsa-macro.h

--
2.21.0
parents a27b421f 58aad930

Documentation/devicetree/bindings/sound/qcom,lpass-va-macro.yaml

0 → 100644
+67 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/sound/qcom,lpass-va-macro.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: LPASS(Low Power Audio Subsystem) VA Macro audio codec DT bindings



maintainers:

  - Srinivas Kandagatla <srinivas.kandagatla@linaro.org>



properties:

  compatible:

    const: qcom,sm8250-lpass-va-macro



  reg:

    maxItems: 1



  "#sound-dai-cells":

    const: 1



  '#clock-cells':

    const: 0



  clocks:

    maxItems: 3



  clock-names:

    items:

      - const: mclk

      - const: core

      - const: dcodec



  clock-output-names:

    items:

      - const: fsgen



  qcom,dmic-sample-rate:

    description: dmic sample rate

    $ref: /schemas/types.yaml#/definitions/uint32



  vdd-micb-supply:

    description: phandle to voltage regulator of MIC Bias



required:

  - compatible

  - reg

  - "#sound-dai-cells"



additionalProperties: false



examples:

  - |

    #include <dt-bindings/sound/qcom,q6afe.h>

    codec@3370000 {

      compatible = "qcom,sm8250-lpass-va-macro";

      reg = <0x3370000 0x1000>;

      #sound-dai-cells = <1>;

      #clock-cells = <0>;

      clocks = <&aoncc 0>,

               <&q6afecc LPASS_HW_MACRO_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>,

               <&q6afecc LPASS_HW_DCODEC_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>;

      clock-names = "mclk", "core", "dcodec";

      clock-output-names = "fsgen";

      qcom,dmic-sample-rate = <600000>;

      vdd-micb-supply = <&vreg_s4a_1p8>;

    };

Documentation/devicetree/bindings/sound/qcom,lpass-wsa-macro.yaml

0 → 100644
+69 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/sound/qcom,lpass-wsa-macro.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: LPASS(Low Power Audio Subsystem) VA Macro audio codec DT bindings



maintainers:

  - Srinivas Kandagatla <srinivas.kandagatla@linaro.org>



properties:

  compatible:

    const: qcom,sm8250-lpass-wsa-macro



  reg:

    maxItems: 1



  "#sound-dai-cells":

    const: 1



  '#clock-cells':

    const: 0



  clocks:

    maxItems: 5



  clock-names:

    items:

      - const: mclk

      - const: npl

      - const: macro

      - const: dcodec

      - const: fsgen



  clock-output-names:

    items:

      - const: mclk



  qcom,dmic-sample-rate:

    description: dmic sample rate

    $ref: /schemas/types.yaml#/definitions/uint32



  vdd-micb-supply:

    description: phandle to voltage regulator of MIC Bias



required:

  - compatible

  - reg

  - "#sound-dai-cells"



additionalProperties: false



examples:

  - |

    #include <dt-bindings/sound/qcom,q6afe.h>

    codec@3240000 {

      compatible = "qcom,sm8250-lpass-wsa-macro";

      reg = <0x3240000 0x1000>;

      #sound-dai-cells = <1>;

      #clock-cells = <0>;

      clocks = <&audiocc 1>,

               <&audiocc 0>,

               <&q6afecc LPASS_HW_MACRO_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>,

               <&q6afecc LPASS_HW_DCODEC_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>,

               <&vamacro>;

      clock-names = "mclk", "npl", "macro", "dcodec", "fsgen";

      clock-output-names = "mclk";

    };

sound/soc/codecs/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -1789,4 +1789,12 @@ config SND_SOC_TPA6130A2 
	tristate "Texas Instruments TPA6130A2 headphone amplifier"

	depends on I2C



config SND_SOC_LPASS_WSA_MACRO

	depends on COMMON_CLK

	tristate "Qualcomm WSA Macro in LPASS(Low Power Audio SubSystem)"



config SND_SOC_LPASS_VA_MACRO

	depends on COMMON_CLK

	tristate "Qualcomm VA Macro in LPASS(Low Power Audio SubSystem)"



endmenu

sound/soc/codecs/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -103,6 +103,8 @@ snd-soc-l3-objs := l3.o 
snd-soc-lm4857-objs := lm4857.o

snd-soc-lm49453-objs := lm49453.o

snd-soc-lochnagar-sc-objs := lochnagar-sc.o

snd-soc-lpass-wsa-macro-objs := lpass-wsa-macro.o

snd-soc-lpass-va-macro-objs := lpass-va-macro.o

snd-soc-madera-objs := madera.o

snd-soc-max9759-objs := max9759.o

snd-soc-max9768-objs := max9768.o
@@ -615,3 +617,5 @@ obj-$(CONFIG_SND_SOC_MAX9877) += snd-soc-max9877.o 
obj-$(CONFIG_SND_SOC_MAX98504)	+= snd-soc-max98504.o

obj-$(CONFIG_SND_SOC_SIMPLE_AMPLIFIER)	+= snd-soc-simple-amplifier.o

obj-$(CONFIG_SND_SOC_TPA6130A2)	+= snd-soc-tpa6130a2.o

obj-$(CONFIG_SND_SOC_LPASS_WSA_MACRO)	+= snd-soc-lpass-wsa-macro.o

obj-$(CONFIG_SND_SOC_LPASS_VA_MACRO)	+= snd-soc-lpass-va-macro.o

sound/soc/codecs/lpass-va-macro.c

0 → 100644
+1503 −0

File added.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE