| Message ID | 20201004100128.5842-1-cezary.rojewski@intel.com |
|---|---|
| Headers | show |
| Series | ASoC: Intel: Remove obsolete solutions and | expand |
On Sun, Oct 04, 2020 at 12:01:15PM +0200, Cezary Rojewski wrote: > Follow up to catpt series as mentioned in: > [PATCH v10 00/14] ASoC: Intel: Catpt - Lynx and Wildcat point > https://www.spinics.net/lists/alsa-devel/msg116440.html > > As catpt is a direct replacement to sound/soc/intel/haswell, it leaves a > lot of code redudant. The second legacy solution - baytrail - is > deprecated for a long time by sound/soc/intel/atom with SOF flavor > available too. > > This series addresses the redudancy and removes obsolete code. Along > with the legacy solutions, all orphaned components are removed too. > > As a consequence, further cleanups are unlocked: sound/soc/intel/skylake > becomes the sole user of processing code found in > sound/soc/intel/common. Those are not part of this series. Completely in favour of this series, thanks! FWIW, Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > Cezary Rojewski (13): > ASoC: Intel: Remove haswell solution > ASoC: Intel: Remove max98090 support for baytrail solution > ASoC: Intel: Remove rt5640 support for baytrail solution > ASoC: Intel: Remove baytrail solution > ASoC: Intel: Remove SST ACPI component > ASoC: Intel: Remove SST firmware components > ASoC: Intel: Skylake: Unassign ram_read and read_write ops > ASoC: Intel: Remove unused DSP operations > ASoC: Intel: Remove unused DSP interface fields > ASoC: Intel: Remove SST-legacy specific constants > ASoC: Intel: Make atom components independent of sst-dsp > ASoC: Intel: Remove sst_pdata structure > ASoC: Intel: Remove sst_dsp_get_thread_context > > include/sound/soc-acpi-intel-match.h | 1 - > include/trace/events/hswadsp.h | 385 --- > sound/soc/intel/Kconfig | 26 - > sound/soc/intel/Makefile | 1 - > sound/soc/intel/atom/sst/sst.c | 1 - > sound/soc/intel/atom/sst/sst.h | 7 + > sound/soc/intel/atom/sst/sst_acpi.c | 1 - > sound/soc/intel/atom/sst/sst_drv_interface.c | 3 - > sound/soc/intel/atom/sst/sst_ipc.c | 1 - > sound/soc/intel/atom/sst/sst_loader.c | 1 - > sound/soc/intel/atom/sst/sst_pvt.c | 1 - > sound/soc/intel/atom/sst/sst_stream.c | 1 - > sound/soc/intel/baytrail/Makefile | 5 - > sound/soc/intel/baytrail/sst-baytrail-dsp.c | 358 --- > sound/soc/intel/baytrail/sst-baytrail-ipc.c | 772 ------ > sound/soc/intel/baytrail/sst-baytrail-ipc.h | 64 - > sound/soc/intel/baytrail/sst-baytrail-pcm.c | 459 ---- > sound/soc/intel/boards/Kconfig | 25 - > sound/soc/intel/boards/Makefile | 4 - > sound/soc/intel/boards/byt-max98090.c | 182 -- > sound/soc/intel/boards/byt-rt5640.c | 224 -- > sound/soc/intel/boards/bytcht_es8316.c | 1 - > sound/soc/intel/boards/bytcr_rt5640.c | 1 - > sound/soc/intel/common/Makefile | 4 - > .../intel/common/soc-acpi-intel-byt-match.c | 15 - > sound/soc/intel/common/sst-acpi.c | 236 -- > sound/soc/intel/common/sst-dsp-priv.h | 284 +-- > sound/soc/intel/common/sst-dsp.c | 162 -- > sound/soc/intel/common/sst-dsp.h | 222 -- > sound/soc/intel/common/sst-firmware.c | 1273 ---------- > sound/soc/intel/common/sst-ipc.c | 27 - > sound/soc/intel/common/sst-ipc.h | 3 - > sound/soc/intel/haswell/Makefile | 5 - > sound/soc/intel/haswell/sst-haswell-dsp.c | 705 ------ > sound/soc/intel/haswell/sst-haswell-ipc.c | 2222 ----------------- > sound/soc/intel/haswell/sst-haswell-ipc.h | 527 ---- > sound/soc/intel/haswell/sst-haswell-pcm.c | 1369 ---------- > sound/soc/intel/skylake/bxt-sst.c | 2 - > sound/soc/intel/skylake/cnl-sst.c | 4 +- > sound/soc/intel/skylake/skl-sst-dsp.c | 2 +- > sound/soc/intel/skylake/skl-sst-ipc.c | 2 +- > sound/soc/intel/skylake/skl-sst.c | 2 - > 42 files changed, 11 insertions(+), 9579 deletions(-) > delete mode 100644 include/trace/events/hswadsp.h > delete mode 100644 sound/soc/intel/baytrail/Makefile > delete mode 100644 sound/soc/intel/baytrail/sst-baytrail-dsp.c > delete mode 100644 sound/soc/intel/baytrail/sst-baytrail-ipc.c > delete mode 100644 sound/soc/intel/baytrail/sst-baytrail-ipc.h > delete mode 100644 sound/soc/intel/baytrail/sst-baytrail-pcm.c > delete mode 100644 sound/soc/intel/boards/byt-max98090.c > delete mode 100644 sound/soc/intel/boards/byt-rt5640.c > delete mode 100644 sound/soc/intel/common/sst-acpi.c > delete mode 100644 sound/soc/intel/common/sst-firmware.c > delete mode 100644 sound/soc/intel/haswell/Makefile > delete mode 100644 sound/soc/intel/haswell/sst-haswell-dsp.c > delete mode 100644 sound/soc/intel/haswell/sst-haswell-ipc.c > delete mode 100644 sound/soc/intel/haswell/sst-haswell-ipc.h > delete mode 100644 sound/soc/intel/haswell/sst-haswell-pcm.c > > -- > 2.17.1 >
On 10/4/20 5:01 AM, Cezary Rojewski wrote: > Follow up to catpt series as mentioned in: > [PATCH v10 00/14] ASoC: Intel: Catpt - Lynx and Wildcat point > https://www.spinics.net/lists/alsa-devel/msg116440.html > > As catpt is a direct replacement to sound/soc/intel/haswell, it leaves a > lot of code redudant. The second legacy solution - baytrail - is > deprecated for a long time by sound/soc/intel/atom with SOF flavor > available too. Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> I would go one step further and start deprecating sound/soc/intel/atom/ to use SOF instead. That atom/ thing is maintained only to the extent that static analysis tools report errors. Likewise there are no commercial platforms based on the haswell silicon so we could also only support Broadwell. Thanks Cezary. > > This series addresses the redudancy and removes obsolete code. Along > with the legacy solutions, all orphaned components are removed too. > > As a consequence, further cleanups are unlocked: sound/soc/intel/skylake > becomes the sole user of processing code found in > sound/soc/intel/common. Those are not part of this series. > > Cezary Rojewski (13): > ASoC: Intel: Remove haswell solution > ASoC: Intel: Remove max98090 support for baytrail solution > ASoC: Intel: Remove rt5640 support for baytrail solution > ASoC: Intel: Remove baytrail solution > ASoC: Intel: Remove SST ACPI component > ASoC: Intel: Remove SST firmware components > ASoC: Intel: Skylake: Unassign ram_read and read_write ops > ASoC: Intel: Remove unused DSP operations > ASoC: Intel: Remove unused DSP interface fields > ASoC: Intel: Remove SST-legacy specific constants > ASoC: Intel: Make atom components independent of sst-dsp > ASoC: Intel: Remove sst_pdata structure > ASoC: Intel: Remove sst_dsp_get_thread_context > > include/sound/soc-acpi-intel-match.h | 1 - > include/trace/events/hswadsp.h | 385 --- > sound/soc/intel/Kconfig | 26 - > sound/soc/intel/Makefile | 1 - > sound/soc/intel/atom/sst/sst.c | 1 - > sound/soc/intel/atom/sst/sst.h | 7 + > sound/soc/intel/atom/sst/sst_acpi.c | 1 - > sound/soc/intel/atom/sst/sst_drv_interface.c | 3 - > sound/soc/intel/atom/sst/sst_ipc.c | 1 - > sound/soc/intel/atom/sst/sst_loader.c | 1 - > sound/soc/intel/atom/sst/sst_pvt.c | 1 - > sound/soc/intel/atom/sst/sst_stream.c | 1 - > sound/soc/intel/baytrail/Makefile | 5 - > sound/soc/intel/baytrail/sst-baytrail-dsp.c | 358 --- > sound/soc/intel/baytrail/sst-baytrail-ipc.c | 772 ------ > sound/soc/intel/baytrail/sst-baytrail-ipc.h | 64 - > sound/soc/intel/baytrail/sst-baytrail-pcm.c | 459 ---- > sound/soc/intel/boards/Kconfig | 25 - > sound/soc/intel/boards/Makefile | 4 - > sound/soc/intel/boards/byt-max98090.c | 182 -- > sound/soc/intel/boards/byt-rt5640.c | 224 -- > sound/soc/intel/boards/bytcht_es8316.c | 1 - > sound/soc/intel/boards/bytcr_rt5640.c | 1 - > sound/soc/intel/common/Makefile | 4 - > .../intel/common/soc-acpi-intel-byt-match.c | 15 - > sound/soc/intel/common/sst-acpi.c | 236 -- > sound/soc/intel/common/sst-dsp-priv.h | 284 +-- > sound/soc/intel/common/sst-dsp.c | 162 -- > sound/soc/intel/common/sst-dsp.h | 222 -- > sound/soc/intel/common/sst-firmware.c | 1273 ---------- > sound/soc/intel/common/sst-ipc.c | 27 - > sound/soc/intel/common/sst-ipc.h | 3 - > sound/soc/intel/haswell/Makefile | 5 - > sound/soc/intel/haswell/sst-haswell-dsp.c | 705 ------ > sound/soc/intel/haswell/sst-haswell-ipc.c | 2222 ----------------- > sound/soc/intel/haswell/sst-haswell-ipc.h | 527 ---- > sound/soc/intel/haswell/sst-haswell-pcm.c | 1369 ---------- > sound/soc/intel/skylake/bxt-sst.c | 2 - > sound/soc/intel/skylake/cnl-sst.c | 4 +- > sound/soc/intel/skylake/skl-sst-dsp.c | 2 +- > sound/soc/intel/skylake/skl-sst-ipc.c | 2 +- > sound/soc/intel/skylake/skl-sst.c | 2 - > 42 files changed, 11 insertions(+), 9579 deletions(-) > delete mode 100644 include/trace/events/hswadsp.h > delete mode 100644 sound/soc/intel/baytrail/Makefile > delete mode 100644 sound/soc/intel/baytrail/sst-baytrail-dsp.c > delete mode 100644 sound/soc/intel/baytrail/sst-baytrail-ipc.c > delete mode 100644 sound/soc/intel/baytrail/sst-baytrail-ipc.h > delete mode 100644 sound/soc/intel/baytrail/sst-baytrail-pcm.c > delete mode 100644 sound/soc/intel/boards/byt-max98090.c > delete mode 100644 sound/soc/intel/boards/byt-rt5640.c > delete mode 100644 sound/soc/intel/common/sst-acpi.c > delete mode 100644 sound/soc/intel/common/sst-firmware.c > delete mode 100644 sound/soc/intel/haswell/Makefile > delete mode 100644 sound/soc/intel/haswell/sst-haswell-dsp.c > delete mode 100644 sound/soc/intel/haswell/sst-haswell-ipc.c > delete mode 100644 sound/soc/intel/haswell/sst-haswell-ipc.h > delete mode 100644 sound/soc/intel/haswell/sst-haswell-pcm.c >
On Sun, Oct 04, 2020 at 12:01:18PM +0200, Cezary Rojewski wrote: > byt-rt5640 is deprecated in favor of bytcr_rt5640 used by > sound/soc/intel/atom and SOF solutions both. Remove redundant machine > board and all related code. This doesn't apply against current code, please check and resend.
On 2020-10-05 6:40 PM, Mark Brown wrote: > On Sun, Oct 04, 2020 at 12:01:18PM +0200, Cezary Rojewski wrote: >> byt-rt5640 is deprecated in favor of bytcr_rt5640 used by >> sound/soc/intel/atom and SOF solutions both. Remove redundant machine >> board and all related code. > > This doesn't apply against current code, please check and resend. > Hmm, not seeing any problems when applying these 13 patches on broonie/sound branch: for-next on my end. For for-5.10 branch, I see that 'git am' failed on: PATCH 04/13 ASoC: Intel: Remove baytrail solution i.e. couldn't find sst-baytrail-pcm.c node (probably changed in between) but this is certainly not the 04/13 patch. What am I missing? Thanks, Czarek
On Mon, Oct 05, 2020 at 05:25:26PM +0000, Rojewski, Cezary wrote: > Hmm, not seeing any problems when applying these 13 patches on > broonie/sound branch: for-next on my end. > > For for-5.10 branch, I see that 'git am' failed on: > PATCH 04/13 ASoC: Intel: Remove baytrail solution > i.e. couldn't find sst-baytrail-pcm.c node (probably changed in between) > but this is certainly not the 04/13 patch. > What am I missing? I probably just replied to the wrong patch.
On Sun, 4 Oct 2020 12:01:15 +0200, Cezary Rojewski wrote: > Follow up to catpt series as mentioned in: > [PATCH v10 00/14] ASoC: Intel: Catpt - Lynx and Wildcat point > https://www.spinics.net/lists/alsa-devel/msg116440.html > > As catpt is a direct replacement to sound/soc/intel/haswell, it leaves a > lot of code redudant. The second legacy solution - baytrail - is > deprecated for a long time by sound/soc/intel/atom with SOF flavor > available too. > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [01/13] ASoC: Intel: Remove haswell solution commit: ca756120d4bcf28dfde5e3df8882153303d4010f [02/13] ASoC: Intel: Remove max98090 support for baytrail solution commit: 5f3941b63c25d8123ebe4406a714c603525b1b90 [03/13] ASoC: Intel: Remove rt5640 support for baytrail solution commit: 3056cb0082feccee9a0012440ee5e4ca6a6e80ac [04/13] ASoC: Intel: Remove baytrail solution commit: 07833cd0569bb73cc9f82814cdab921abb3dfb4a [05/13] ASoC: Intel: Remove SST ACPI component commit: 05668be1b3644f9bd25b22f62e79ad7a5adbd3e2 [06/13] ASoC: Intel: Remove SST firmware components commit: fb94b7b11c6a20b786c6a8aec3d701ced8854419 [07/13] ASoC: Intel: Skylake: Unassign ram_read and read_write ops commit: a4bebce26d560a4a1dff557ad7822bab90dd1c3f [08/13] ASoC: Intel: Remove unused DSP operations commit: 37465972015cf7aeb586a9245da2a87d3b531959 [09/13] ASoC: Intel: Remove unused DSP interface fields commit: b4e60807182a243d9dfe985e9e13d295f5868f81 [10/13] ASoC: Intel: Remove SST-legacy specific constants commit: 7d07f9c1ba0e670d1a967f16eda53e5c87411753 [11/13] ASoC: Intel: Make atom components independent of sst-dsp commit: b972153d6c53a89dc92d991c466a6b4800a9c91f [12/13] ASoC: Intel: Remove sst_pdata structure commit: 720811f0e4ac5a31d38aaee20905692dd7150997 [13/13] ASoC: Intel: Remove sst_dsp_get_thread_context commit: eb062e47f7c8cc28f19ba8f897481c22d13db1ec 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