mbox series

[v2,00/14] ASoC: Intel: Remove skylake driver

Message ID 20240814083929.1217319-1-cezary.rojewski@intel.com (mailing list archive)
Headers show
Series ASoC: Intel: Remove skylake driver | expand

Message

Cezary Rojewski Aug. 14, 2024, 8:39 a.m. UTC
A spiritual successor to haswell/baytrail removal series [1].

The avs-driver found in sound/soc/intel/avs is a direct replacement to
the existing skylake-driver. It covers all features supported by it and
more and aligns with the recommended flows and requirements based on
Windows driver equivalent.

The skylake-driver related UAPI has been removed with "ASoC: Drop
soc-topology ABI v4 support" [2].

For the official kernel tree the deprecation begun with v6.0. Most
skylake-drivers users moved to avs- or SOF-driver when AudioDSP
capabilities are available on the platform or to snd-hda-intel
(sound/pci/hda) when such capabilities are not.

For the supported trees the deprecation begun with v5.4 with v5.15 being
the first where the skylake-driver is disabled entirely.

All machine board drivers that consume this DSP driver have their
replacements present within sound/soc/intel/avs/boards/ directory.


Changes in v2:
- added two new patches (leading the series)
- the first moves all device entries previously under the skylake-driver
  dependency under the avs-driver
- the second patch drops struct skl_machine_pdata usage to fix
  compilation errors as pointed out by IKP
- no further changes, retained Acked-by tags for these

[1]: https://lore.kernel.org/alsa-devel/20201006064907.16277-1-cezary.rojewski@intel.com/
[2]: https://lore.kernel.org/alsa-devel/20240403091629.647267-1-cezary.rojewski@intel.com/


Cezary Rojewski (14):
  ALSA: hda: Move SST device entries to AVS
  ASoC: Intel: Drop skl_machine_pdata usage
  ASoC: Intel: Remove bxt_rt298 board driver
  ASoC: Intel: Remove bxt_da7219_max98357a board driver
  ASoC: Intel: Remove kbl_rt5663_rt5514_max98927 board driver
  ASoC: Intel: Remove kbl_rt5663_max98927 board driver
  ASoC: Intel: Remove kbl_rt5660 board driver
  ASoC: Intel: Remove kbl_da7219_max98927 board driver
  ASoC: Intel: Remove kbl_da7219_max98357a board driver
  ASoC: Intel: Remove skl_rt286 board driver
  ASoC: Intel: Remove skl_nau88l25_ssm4567 board driver
  ASoC: Intel: Remove skl_nau88l25_max98357a board driver
  ASoC: Intel: Remove skylake driver
  ASoC: Intel: avs: Enable by default for all SST configurations

 sound/hda/intel-dsp-config.c                  |  111 +-
 sound/soc/intel/Kconfig                       |  120 -
 sound/soc/intel/Makefile                      |    1 -
 sound/soc/intel/avs/core.c                    |    8 +-
 sound/soc/intel/boards/Kconfig                |  152 +-
 sound/soc/intel/boards/Makefile               |   20 -
 sound/soc/intel/boards/bxt_da7219_max98357a.c |  720 ----
 sound/soc/intel/boards/bxt_rt298.c            |  670 ---
 sound/soc/intel/boards/kbl_da7219_max98357a.c |  688 ----
 sound/soc/intel/boards/kbl_da7219_max98927.c  | 1175 ------
 sound/soc/intel/boards/kbl_rt5660.c           |  567 ---
 sound/soc/intel/boards/kbl_rt5663_max98927.c  | 1073 -----
 .../intel/boards/kbl_rt5663_rt5514_max98927.c |  869 ----
 .../soc/intel/boards/skl_nau88l25_max98357a.c |  704 ----
 sound/soc/intel/boards/skl_nau88l25_ssm4567.c |  751 ----
 sound/soc/intel/boards/skl_rt286.c            |  568 ---
 .../intel/common/soc-acpi-intel-cnl-match.c   |    6 -
 .../intel/common/soc-acpi-intel-ehl-match.c   |    1 -
 .../intel/common/soc-acpi-intel-hda-match.c   |    6 -
 .../intel/common/soc-acpi-intel-icl-match.c   |    6 -
 .../intel/common/soc-acpi-intel-kbl-match.c   |   11 -
 .../intel/common/soc-acpi-intel-skl-match.c   |    5 -
 sound/soc/intel/skylake/Makefile              |   15 -
 sound/soc/intel/skylake/bxt-sst.c             |  629 ---
 sound/soc/intel/skylake/cnl-sst-dsp.c         |  266 --
 sound/soc/intel/skylake/cnl-sst-dsp.h         |  103 -
 sound/soc/intel/skylake/cnl-sst.c             |  508 ---
 sound/soc/intel/skylake/skl-debug.c           |  248 --
 sound/soc/intel/skylake/skl-i2s.h             |   87 -
 sound/soc/intel/skylake/skl-messages.c        | 1419 -------
 sound/soc/intel/skylake/skl-nhlt.c            |  269 --
 sound/soc/intel/skylake/skl-pcm.c             | 1507 -------
 sound/soc/intel/skylake/skl-ssp-clk.c         |  428 --
 sound/soc/intel/skylake/skl-ssp-clk.h         |  108 -
 sound/soc/intel/skylake/skl-sst-cldma.c       |  373 --
 sound/soc/intel/skylake/skl-sst-cldma.h       |  243 --
 sound/soc/intel/skylake/skl-sst-dsp.c         |  462 ---
 sound/soc/intel/skylake/skl-sst-dsp.h         |  256 --
 sound/soc/intel/skylake/skl-sst-ipc.c         | 1071 -----
 sound/soc/intel/skylake/skl-sst-ipc.h         |  169 -
 sound/soc/intel/skylake/skl-sst-utils.c       |  425 --
 sound/soc/intel/skylake/skl-sst.c             |  599 ---
 sound/soc/intel/skylake/skl-topology.c        | 3605 -----------------
 sound/soc/intel/skylake/skl-topology.h        |  524 ---
 sound/soc/intel/skylake/skl.c                 | 1177 ------
 sound/soc/intel/skylake/skl.h                 |  207 -
 46 files changed, 59 insertions(+), 22871 deletions(-)
 delete mode 100644 sound/soc/intel/boards/bxt_da7219_max98357a.c
 delete mode 100644 sound/soc/intel/boards/bxt_rt298.c
 delete mode 100644 sound/soc/intel/boards/kbl_da7219_max98357a.c
 delete mode 100644 sound/soc/intel/boards/kbl_da7219_max98927.c
 delete mode 100644 sound/soc/intel/boards/kbl_rt5660.c
 delete mode 100644 sound/soc/intel/boards/kbl_rt5663_max98927.c
 delete mode 100644 sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c
 delete mode 100644 sound/soc/intel/boards/skl_nau88l25_max98357a.c
 delete mode 100644 sound/soc/intel/boards/skl_nau88l25_ssm4567.c
 delete mode 100644 sound/soc/intel/boards/skl_rt286.c
 delete mode 100644 sound/soc/intel/skylake/Makefile
 delete mode 100644 sound/soc/intel/skylake/bxt-sst.c
 delete mode 100644 sound/soc/intel/skylake/cnl-sst-dsp.c
 delete mode 100644 sound/soc/intel/skylake/cnl-sst-dsp.h
 delete mode 100644 sound/soc/intel/skylake/cnl-sst.c
 delete mode 100644 sound/soc/intel/skylake/skl-debug.c
 delete mode 100644 sound/soc/intel/skylake/skl-i2s.h
 delete mode 100644 sound/soc/intel/skylake/skl-messages.c
 delete mode 100644 sound/soc/intel/skylake/skl-nhlt.c
 delete mode 100644 sound/soc/intel/skylake/skl-pcm.c
 delete mode 100644 sound/soc/intel/skylake/skl-ssp-clk.c
 delete mode 100644 sound/soc/intel/skylake/skl-ssp-clk.h
 delete mode 100644 sound/soc/intel/skylake/skl-sst-cldma.c
 delete mode 100644 sound/soc/intel/skylake/skl-sst-cldma.h
 delete mode 100644 sound/soc/intel/skylake/skl-sst-dsp.c
 delete mode 100644 sound/soc/intel/skylake/skl-sst-dsp.h
 delete mode 100644 sound/soc/intel/skylake/skl-sst-ipc.c
 delete mode 100644 sound/soc/intel/skylake/skl-sst-ipc.h
 delete mode 100644 sound/soc/intel/skylake/skl-sst-utils.c
 delete mode 100644 sound/soc/intel/skylake/skl-sst.c
 delete mode 100644 sound/soc/intel/skylake/skl-topology.c
 delete mode 100644 sound/soc/intel/skylake/skl-topology.h
 delete mode 100644 sound/soc/intel/skylake/skl.c
 delete mode 100644 sound/soc/intel/skylake/skl.h

Comments

Andy Shevchenko Aug. 14, 2024, 2:42 p.m. UTC | #1
On Wed, Aug 14, 2024 at 10:39:15AM +0200, Cezary Rojewski wrote:
> A spiritual successor to haswell/baytrail removal series [1].
> 
> The avs-driver found in sound/soc/intel/avs is a direct replacement to
> the existing skylake-driver. It covers all features supported by it and
> more and aligns with the recommended flows and requirements based on
> Windows driver equivalent.
> 
> The skylake-driver related UAPI has been removed with "ASoC: Drop
> soc-topology ABI v4 support" [2].
> 
> For the official kernel tree the deprecation begun with v6.0. Most
> skylake-drivers users moved to avs- or SOF-driver when AudioDSP
> capabilities are available on the platform or to snd-hda-intel
> (sound/pci/hda) when such capabilities are not.
> 
> For the supported trees the deprecation begun with v5.4 with v5.15 being
> the first where the skylake-driver is disabled entirely.
> 
> All machine board drivers that consume this DSP driver have their
> replacements present within sound/soc/intel/avs/boards/ directory.

> Changes in v2:
> - added two new patches (leading the series)
> - the first moves all device entries previously under the skylake-driver
>   dependency under the avs-driver
> - the second patch drops struct skl_machine_pdata usage to fix
>   compilation errors as pointed out by IKP
> - no further changes, retained Acked-by tags for these

Hmm... Have you received my tag for the v1?

Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cezary Rojewski Aug. 14, 2024, 2:48 p.m. UTC | #2
On 2024-08-14 4:42 PM, Andy Shevchenko wrote:
> On Wed, Aug 14, 2024 at 10:39:15AM +0200, Cezary Rojewski wrote:
>> A spiritual successor to haswell/baytrail removal series [1].
>>
>> The avs-driver found in sound/soc/intel/avs is a direct replacement to
>> the existing skylake-driver. It covers all features supported by it and
>> more and aligns with the recommended flows and requirements based on
>> Windows driver equivalent.
>>
>> The skylake-driver related UAPI has been removed with "ASoC: Drop
>> soc-topology ABI v4 support" [2].
>>
>> For the official kernel tree the deprecation begun with v6.0. Most
>> skylake-drivers users moved to avs- or SOF-driver when AudioDSP
>> capabilities are available on the platform or to snd-hda-intel
>> (sound/pci/hda) when such capabilities are not.
>>
>> For the supported trees the deprecation begun with v5.4 with v5.15 being
>> the first where the skylake-driver is disabled entirely.
>>
>> All machine board drivers that consume this DSP driver have their
>> replacements present within sound/soc/intel/avs/boards/ directory.
> 
>> Changes in v2:
>> - added two new patches (leading the series)
>> - the first moves all device entries previously under the skylake-driver
>>    dependency under the avs-driver
>> - the second patch drops struct skl_machine_pdata usage to fix
>>    compilation errors as pointed out by IKP
>> - no further changes, retained Acked-by tags for these
> 
> Hmm... Have you received my tag for the v1?
> 
> Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

Yeah, I've left the tags alone for patches 3-14 but for the newly added 
two I did not as that would be inappropriate. The first two patches 
address the problems reported by IKP bot - I've not been dealing with 
sound/soc/intel/common/ for a while and have forgotten about its existence.

Thank you for reviewing the series!

Kind regards,
Czarek
Mark Brown Aug. 20, 2024, 12:44 p.m. UTC | #3
On Wed, 14 Aug 2024 10:39:15 +0200, Cezary Rojewski wrote:
> A spiritual successor to haswell/baytrail removal series [1].
> 
> The avs-driver found in sound/soc/intel/avs is a direct replacement to
> the existing skylake-driver. It covers all features supported by it and
> more and aligns with the recommended flows and requirements based on
> Windows driver equivalent.
> 
> [...]

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[01/14] ALSA: hda: Move SST device entries to AVS
        commit: ec7bccd770b628a465458194aeac4408cdcc5ccd
[02/14] ASoC: Intel: Drop skl_machine_pdata usage
        commit: cd5c4dd97f35cd7cf772fc8c12738bd971cbb58e
[03/14] ASoC: Intel: Remove bxt_rt298 board driver
        commit: 4d61ed7609d8b8fef71f78db6a8ac3221a46ea17
[04/14] ASoC: Intel: Remove bxt_da7219_max98357a board driver
        commit: fa07502e01569b39265008bac783a1202a7560e5
[05/14] ASoC: Intel: Remove kbl_rt5663_rt5514_max98927 board driver
        commit: a08b5fde945ef8b427d2d29515a806fe571d7639
[06/14] ASoC: Intel: Remove kbl_rt5663_max98927 board driver
        commit: 1af24289751253e58850ba572c584f7e6b1caa87
[07/14] ASoC: Intel: Remove kbl_rt5660 board driver
        commit: 1a40ef882fee37006243ebf0b4848c7811672fe2
[08/14] ASoC: Intel: Remove kbl_da7219_max98927 board driver
        commit: 1daa8dce04619f39d4d8ee43ae2a0cec9ab31897
[09/14] ASoC: Intel: Remove kbl_da7219_max98357a board driver
        commit: 15d6966580f3e40fe2f4ecfcde2edd69cc5508e9
[10/14] ASoC: Intel: Remove skl_rt286 board driver
        commit: 51d8e9b20db840e78e0d1ff585cf4c8eb4e091b0
[11/14] ASoC: Intel: Remove skl_nau88l25_ssm4567 board driver
        commit: 4dbf2f9a725d1370d67f9a3bce2f33e913b57e52
[12/14] ASoC: Intel: Remove skl_nau88l25_max98357a board driver
        commit: 6de8dddc56b0577df996212b634f82f6f1fb013c
[13/14] ASoC: Intel: Remove skylake driver
        commit: 46e211411113932be1fd31580a03502466648f91
[14/14] ASoC: Intel: avs: Enable by default for all SST configurations
        commit: 526139aff1d14c5a2cc0a769c063f439444c61c2

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark