Unverified Commit cc93a1a1 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Add a driver for the Cirrus Logic CS35L45 Smart Amplifier 

Merge series from Richard Fitzgerald <rf@opensource.cirrus.com>:

This adds basic audio support for the Cirrus Logic CS35L45 amplifier.

The first two patches add two generic helpers to ASoC, and patch 3 is
a kunit test for patch 2.
parents 7704a82e 0d463d01

Documentation/devicetree/bindings/sound/cirrus,cs35l45.yaml

0 → 100644
+75 −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/cirrus,cs35l45.yaml#

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



title: Cirrus Logic CS35L45 Speaker Amplifier



maintainers:

  - Ricardo Rivera-Matos <rriveram@opensource.cirrus.com>

  - Richard Fitzgerald <rf@opensource.cirrus.com>



description: |

  CS35L45 is a Boosted Mono Class D Amplifier with DSP

  Speaker Protection and Adaptive Battery Management.



properties:

  compatible:

    enum:

      - cirrus,cs35l45



  reg:

    maxItems: 1



  '#sound-dai-cells':

    const: 1



  reset-gpios:

    maxItems: 1



  vdd-a-supply:

    description: voltage regulator phandle for the VDD_A supply



  vdd-batt-supply:

    description: voltage regulator phandle for the VDD_BATT supply



  spi-max-frequency:

    maximum: 5000000



  cirrus,asp-sdout-hiz-ctrl:

    description:

      Audio serial port SDOUT Hi-Z control. Sets the Hi-Z

      configuration for SDOUT pin of amplifier. Logical OR of

      CS35L45_ASP_TX_HIZ_xxx values.

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

    minimum: 0

    maximum: 3

    default: 2



required:

  - compatible

  - reg

  - "#sound-dai-cells"



additionalProperties: false



examples:

  - |

    #include <dt-bindings/sound/cs35l45.h>

    spi {

        #address-cells = <1>;

        #size-cells = <0>;



        cs35l45: cs35l45@2 {

          #sound-dai-cells = <1>;

          compatible = "cirrus,cs35l45";

          reg = <2>;

          spi-max-frequency = <5000000>;

          vdd-a-supply = <&dummy_vreg>;

          vdd-batt-supply = <&dummy_vreg>;

          reset-gpios = <&gpio 110 0>;

          cirrus,asp-sdout-hiz-ctrl = <(CS35L45_ASP_TX_HIZ_UNUSED |

                                        CS35L45_ASP_TX_HIZ_DISABLED)>;

        };

    };

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -4688,10 +4688,12 @@ CIRRUS LOGIC AUDIO CODEC DRIVERS 
M:	James Schulman <james.schulman@cirrus.com>

M:	David Rhodes <david.rhodes@cirrus.com>

M:	Lucas Tanure <tanureal@opensource.cirrus.com>

M:	Richard Fitzgerald <rf@opensource.cirrus.com>

L:	alsa-devel@alsa-project.org (moderated for non-subscribers)

L:	patches@opensource.cirrus.com

S:	Maintained

F:	Documentation/devicetree/bindings/sound/cirrus,cs*

F:	include/dt-bindings/sound/cs*

F:	sound/pci/hda/cs*

F:	sound/soc/codecs/cs*
































include/dt-bindings/sound/cs35l45.h
0 → 100644



+20
−0






























Original line number
Diff line number
Diff line









/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */









/*









 * cs35l45.h -- CS35L45 ALSA SoC audio driver DT bindings header









 *









 * Copyright 2022 Cirrus Logic, Inc.









 */



















#ifndef DT_CS35L45_H









#define DT_CS35L45_H



















/*









 * cirrus,asp-sdout-hiz-ctrl









 *









 * TX_HIZ_UNUSED:   TX pin high-impedance during unused slots.









 * TX_HIZ_DISABLED: TX pin high-impedance when all channels disabled.









 */









#define CS35L45_ASP_TX_HIZ_UNUSED	0x1









#define CS35L45_ASP_TX_HIZ_DISABLED	0x2



















#endif /* DT_CS35L45_H */
























include/sound/soc.h



+4
−0






























Original line number
Diff line number
Diff line







@@ -176,6 +176,8 @@







	.get = snd_soc_get_volsw, .put = snd_soc_put_volsw, \









	.private_value = SOC_DOUBLE_R_S_VALUE(reg_left, reg_right, xshift, \









					    xmin, xmax, xsign_bit, xinvert) }









#define SOC_SINGLE_S_TLV(xname, xreg, xshift, xmin, xmax, xsign_bit, xinvert, tlv_array) \









	SOC_DOUBLE_R_S_TLV(xname, xreg, xreg, xshift, xmin, xmax, xsign_bit, xinvert, tlv_array)









#define SOC_SINGLE_S8_TLV(xname, xreg, xmin, xmax, tlv_array) \









{	.iface  = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname), \









	.access = SNDRV_CTL_ELEM_ACCESS_TLV_READ | \








@@ -485,6 +487,8 @@ int snd_soc_calc_frame_size(int sample_size, int channels, int tdm_slots);







int snd_soc_params_to_frame_size(struct snd_pcm_hw_params *params);









int snd_soc_calc_bclk(int fs, int sample_size, int channels, int tdm_slots);









int snd_soc_params_to_bclk(struct snd_pcm_hw_params *parms);









int snd_soc_tdm_params_to_bclk(struct snd_pcm_hw_params *params,









			       int tdm_width, int tdm_slots, int slot_multiple);



















/* set runtime hw params */









int snd_soc_set_runtime_hwparams(struct snd_pcm_substream *substream,
































sound/soc/Kconfig



+8
−1






























Original line number
Diff line number
Diff line







@@ -55,6 +55,13 @@ config SND_SOC_TOPOLOGY_KUNIT_TEST







	  userspace applications such as pulseaudio, to prevent unnecessary









	  problems.



















config SND_SOC_UTILS_KUNIT_TEST









	tristate "KUnit tests for SoC utils"









	depends on KUNIT









	default KUNIT_ALL_TESTS









	help









	  If you want to perform tests on ALSA SoC utils library say Y here.



















config SND_SOC_ACPI









	tristate