1. 12 May, 2021 8 commits
  2. 11 May, 2021 8 commits
    • Charles Keepax's avatar
      4ac9b48a
    • Charles Keepax's avatar
      fd4e6baa
    • Charles Keepax's avatar
    • Mark Brown's avatar
      Merge series "PinePhone BT audio bringup" from Samuel Holland <samuel@sholland.org>: · ae062a71
      Mark Brown authored
      This series uses the additional DAIs added to the sun8i-codec driver to
      add hardware routing for BT SCO (headset) audio on the PinePhone.
      
      The BT audio connection is represented by the "dummy" bt-sco codec. The
      connection to the Quectel EG-25G modem via AIF2 works as well, but I do
      not include it here because there is no appropriate codec driver in
      tree. We have been using an out-of-tree "dummy" codec driver for the
      modem similar to bt-sco, and I'm not sure if such a driver would be
      desired upstream.
      
      Changes from v2:
        - Also accept #sound-dai-cells in the binding. Since dt-core.yaml
          already sets the type of this property, it is not possible to use
          oneOf, nor make a specific value deprecated.
      
      Changes from v1:
        - Fixed DT binding example to follow new binding
      
      Arnaud Ferraris (1):
        arm64: dts: allwinner: pinephone: Set audio card name
      
      Samuel Holland (6):
        ASoC: dt-bindings: sun8i-codec: Increase #sound-dai-cells
        ARM: dts: sun8i-a33: Allow using multiple codec DAIs
        arm64: dts: allwinner: a64: Allow using multiple codec DAIs
        arm64: dts: allwinner: a64: Add pinmux nodes for AIF2/AIF3
        arm64: dts: allwinner: a64: Allow multiple DAI links
        arm64: dts: allwinner: pinephone: Add support for Bluetooth audio
      
       .../sound/allwinner,sun8i-a33-codec.yaml      |  8 +++-
       arch/arm/boot/dts/sun8i-a33.dtsi              |  4 +-
       .../dts/allwinner/sun50i-a64-pinephone.dtsi   | 25 +++++++++++++
       arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 37 ++++++++++++++-----
       4 files changed, 60 insertions(+), 14 deletions(-)
      
      --
      2.26.3
      ae062a71
    • Mark Brown's avatar
      Merge series "Tidy up device ID reading on legacy Cirrus parts" from Charles... · b8ded8af
      Mark Brown authored
      Merge series "Tidy up device ID reading on legacy Cirrus parts" from Charles Keepax <ckeepax@opensource.cirrus.com>:
      
      Pierre requested I have a look at some cppcheck warnings in the cs42l42
      driver, since it is reassigning the ret variable without ever checking
      the result.  Looking a bit more broadly this happens in quite a few
      legacy Cirrus parts, as they all use the same process to read the ID,
      factor out a small helper so they can all share the same code. Whilst
      in there fix up a couple of other trivial error path issues as well.
      
      Thanks,
      Charles
      
      Charles Keepax (10):
        ASoC: cirrus: Add helper function for reading the device ID
        ASoC: cs35l32: Minor error paths fixups
        ASoC: cs35l33: Minor error paths fixups
        ASoC: cs35l34:  Minor error paths fixups
        ASoC: cs35l35:  Minor error paths fixups
        ASoC: cs35l35: Correct errata handling
        ASoC: cs42l42:  Minor error paths fixups
        ASoC: cs42l73:  Minor error paths fixups
        ASoC: cs43130:  Minor error paths fixups
        ASoC: cs53l30:  Minor error paths fixups
      
       sound/soc/codecs/cirrus_legacy.h | 21 +++++++++++++++++++++
       sound/soc/codecs/cs35l32.c       | 34 ++++++++++++++++++----------------
       sound/soc/codecs/cs35l33.c       | 15 +++++++++------
       sound/soc/codecs/cs35l34.c       | 39 ++++++++++++++++++++++-----------------
       sound/soc/codecs/cs35l35.c       | 21 ++++++++++-----------
       sound/soc/codecs/cs35l35.h       |  1 +
       sound/soc/codecs/cs42l42.c       | 18 ++++++++----------
       sound/soc/codecs/cs42l73.c       | 30 +++++++++++++++++-------------
       sound/soc/codecs/cs43130.c       | 31 +++++++++++++++++++------------
       sound/soc/codecs/cs53l30.c       | 22 +++++++++++-----------
       10 files changed, 136 insertions(+), 96 deletions(-)
       create mode 100644 sound/soc/codecs/cirrus_legacy.h
      
      --
      2.11.0
      b8ded8af
    • Mark Brown's avatar
      Merge series "ASoC: cppcheck fixes of the week" from Pierre-Louis Bossart... · 3b8fb1f7
      Mark Brown authored
      Merge series "ASoC: cppcheck fixes of the week" from Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>:
      
      While running some checks on a rebased branch, I realized I missed a
      couple of trivial cases on newer code.
      
      Pierre-Louis Bossart (4):
        ASoC: codecs: mt6359-accdet: remove useless initialization
        ASoc: codecs: mt6359: remove useless initializations
        ASoC: codecs: rt1019: clarify expression
        ASoC: fsl: imx-pcm-rpmsg: remove useless initialization
      
       sound/soc/codecs/mt6359-accdet.c | 2 +-
       sound/soc/codecs/mt6359.c        | 2 +-
       sound/soc/codecs/rt1019.c        | 4 ++--
       sound/soc/fsl/imx-pcm-rpmsg.c    | 2 +-
       4 files changed, 5 insertions(+), 5 deletions(-)
      
      --
      2.25.1
      3b8fb1f7
    • Mark Brown's avatar
      Merge series "ASoC: SOF: Intel: split Baytrail and Merrifield" from... · b748ad38
      Mark Brown authored
      Merge series "ASoC: SOF: Intel: split Baytrail and Merrifield" from Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>:
      
      We've had recurring randconfig issues with the two platforms relying
      on ACPI and PCI. I think it's time to split the two and introduce a
      common 'atom' module, so that dependencies are better handled.
      
      I chose not to add a Fixes tag since the changes are rather invasive,
      and the randconfig issues only happen in non-functional cases.
      
      There should be no functional changes with this patchset, only code
      moved and renamed.
      
      Pierre-Louis Bossart (2):
        ASoC: SOF: Intel: byt: prepare split between Baytrail and Merrifield
        ASoC: SOF: Intel: move common ATOM stuff to module
      
       sound/soc/sof/intel/Makefile  |   5 +-
       sound/soc/sof/intel/atom.c    | 463 ++++++++++++++++++++
       sound/soc/sof/intel/atom.h    |  74 ++++
       sound/soc/sof/intel/byt.c     | 768 ++++------------------------------
       sound/soc/sof/intel/pci-tng.c | 171 +++++++-
       5 files changed, 783 insertions(+), 698 deletions(-)
       create mode 100644 sound/soc/sof/intel/atom.c
       create mode 100644 sound/soc/sof/intel/atom.h
      
      --
      2.25.1
      b748ad38
    • Mark Brown's avatar
      Merge series "ASoC: Intel: machine driver updates for 5.14" from Pierre-Louis... · 93c964af
      Mark Brown authored
      Merge series "ASoC: Intel: machine driver updates for 5.14" from Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>:
      
      Some of the patches in this series for TigerLake and AlderLake
      SoundWire/Bluetooth support were missed in a previous submission,
      resend them as is, and add new patches for the CS42L42 machine driver.
      
      Brent Lu (3):
        ASoC: Intel: maxim-common: support max98357a
        ASoC: Intel: add sof-cs42l42 machine driver
        ASoC: Intel: sof_rt5682: code refactor for max98357a
      
      Libin Yang (1):
        ASoC: Intel: sof_sdw: add SOF_RT715_DAI_ID_FIX for AlderLake
      
      Pierre-Louis Bossart (4):
        ASoC: Intel: sof_sdw: add mutual exclusion between PCH DMIC and RT715
        ASoC: Intel: boards: handle hda-dsp-common as a module
        ASoC: Intel: boards: create sof-maxim-common module
        ASoC: Intel: boards: remove .nonatomic for BE dailinks
      
      Vamshi Krishna Gopal (2):
        ASoC: Intel: soc-acpi: add entries for i2s machines in ADL match table
        ASoC: Intel: boards: add support for adl boards in sof-rt5682
      
      Yong Zhi (3):
        ASoC: Intel: Boards: tgl_max98373: Add BT offload support
        ASoC: Intel: sof_sdw: add support for Bluetooth offload
        ASoC: Intel: sof_rt5682: Enable Bluetooth offload on tgl and adl
      
       sound/soc/intel/boards/Kconfig                |  36 +-
       sound/soc/intel/boards/Makefile               |  30 +-
       sound/soc/intel/boards/bxt_da7219_max98357a.c |   1 +
       sound/soc/intel/boards/bxt_rt298.c            |   1 +
       sound/soc/intel/boards/bytcht_cx2072x.c       |   1 -
       sound/soc/intel/boards/bytcht_da7213.c        |   1 -
       sound/soc/intel/boards/bytcht_es8316.c        |   1 -
       sound/soc/intel/boards/bytcht_nocodec.c       |   1 -
       sound/soc/intel/boards/bytcr_rt5640.c         |   1 -
       sound/soc/intel/boards/bytcr_rt5651.c         |   1 -
       sound/soc/intel/boards/bytcr_wm5102.c         |   1 -
       sound/soc/intel/boards/cht_bsw_rt5645.c       |   1 -
       sound/soc/intel/boards/cht_bsw_rt5672.c       |   1 -
       sound/soc/intel/boards/cml_rt1011_rt5682.c    |   1 +
       sound/soc/intel/boards/ehl_rt5660.c           |   2 +-
       sound/soc/intel/boards/glk_rt5682_max98357a.c |   1 +
       sound/soc/intel/boards/hda_dsp_common.c       |   5 +
       sound/soc/intel/boards/skl_hda_dsp_generic.c  |   1 +
       sound/soc/intel/boards/sof_cs42l42.c          | 509 ++++++++++++++++++
       sound/soc/intel/boards/sof_da7219_max98373.c  |   1 +
       sound/soc/intel/boards/sof_maxim_common.c     |  84 ++-
       sound/soc/intel/boards/sof_maxim_common.h     |  14 +-
       sound/soc/intel/boards/sof_pcm512x.c          |   2 +-
       sound/soc/intel/boards/sof_rt5682.c           | 119 +++-
       sound/soc/intel/boards/sof_sdw.c              |  55 +-
       sound/soc/intel/boards/sof_sdw_common.h       |   8 +
       sound/soc/intel/boards/sof_sdw_max98373.c     |   4 +-
       sound/soc/intel/boards/sof_wm8804.c           |   1 -
       .../intel/common/soc-acpi-intel-adl-match.c   |  26 +
       .../intel/common/soc-acpi-intel-glk-match.c   |  10 +
       30 files changed, 861 insertions(+), 59 deletions(-)
       create mode 100644 sound/soc/intel/boards/sof_cs42l42.c
      
      --
      2.25.1
      93c964af
  3. 10 May, 2021 24 commits