* [alsa-devel] [PATCH] ASoC: SOF - remove the dead code (skylake/kabylake)
@ 2019-10-28 17:33 Jaroslav Kysela
2019-10-28 17:40 ` Pierre-Louis Bossart
2019-10-29 12:57 ` [alsa-devel] Applied "ASoC: SOF - remove the dead code (skylake/kabylake)" to the asoc tree Mark Brown
0 siblings, 2 replies; 3+ messages in thread
From: Jaroslav Kysela @ 2019-10-28 17:33 UTC (permalink / raw)
To: ALSA development; +Cc: Takashi Iwai, Mark Brown, Pierre-Louis Bossart
Appearently the CONFIG_SND_SOC_SOF_KABYLAKE and CONFIG_SND_SOC_SOF_SKYLAKE
options are not present in Kconfig and 'struct snd_sof_dsp_ops sof_skl_ops'
is not declared in the code, too.
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Cc: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Cc: Mark Brown <broonie@kernel.org>
---
sound/soc/sof/intel/hda.h | 1 -
sound/soc/sof/sof-pci-dev.c | 44 -------------------------------------
2 files changed, 45 deletions(-)
diff --git a/sound/soc/sof/intel/hda.h b/sound/soc/sof/intel/hda.h
index 23e430d3e056..f521c48ec2eb 100644
--- a/sound/soc/sof/intel/hda.h
+++ b/sound/soc/sof/intel/hda.h
@@ -596,7 +596,6 @@ extern struct snd_soc_dai_driver skl_dai[];
*/
extern const struct snd_sof_dsp_ops sof_apl_ops;
extern const struct snd_sof_dsp_ops sof_cnl_ops;
-extern const struct snd_sof_dsp_ops sof_skl_ops;
extern const struct sof_intel_dsp_desc apl_chip_info;
extern const struct sof_intel_dsp_desc cnl_chip_info;
diff --git a/sound/soc/sof/sof-pci-dev.c b/sound/soc/sof/sof-pci-dev.c
index 3a9e0e2a150d..bca3fb791a6b 100644
--- a/sound/soc/sof/sof-pci-dev.c
+++ b/sound/soc/sof/sof-pci-dev.c
@@ -168,42 +168,6 @@ static const struct sof_dev_desc icl_desc = {
};
#endif
-#if IS_ENABLED(CONFIG_SND_SOC_SOF_SKYLAKE)
-static const struct sof_dev_desc skl_desc = {
- .machines = snd_soc_acpi_intel_skl_machines,
- .resindex_lpe_base = 0,
- .resindex_pcicfg_base = -1,
- .resindex_imr_base = -1,
- .irqindex_host_ipc = -1,
- .resindex_dma_base = -1,
- .chip_info = &skl_chip_info,
- .default_fw_path = "intel/sof",
- .default_tplg_path = "intel/sof-tplg",
- .nocodec_fw_filename = "sof-skl.ri",
- .nocodec_tplg_filename = "sof-skl-nocodec.tplg",
- .ops = &sof_skl_ops,
- .arch_ops = &sof_xtensa_arch_ops
-};
-#endif
-
-#if IS_ENABLED(CONFIG_SND_SOC_SOF_KABYLAKE)
-static const struct sof_dev_desc kbl_desc = {
- .machines = snd_soc_acpi_intel_kbl_machines,
- .resindex_lpe_base = 0,
- .resindex_pcicfg_base = -1,
- .resindex_imr_base = -1,
- .irqindex_host_ipc = -1,
- .resindex_dma_base = -1,
- .chip_info = &skl_chip_info,
- .default_fw_path = "intel/sof",
- .default_tplg_path = "intel/sof-tplg",
- .nocodec_fw_filename = "sof-kbl.ri",
- .nocodec_tplg_filename = "sof-kbl-nocodec.tplg",
- .ops = &sof_skl_ops,
- .arch_ops = &sof_xtensa_arch_ops
-};
-#endif
-
#if IS_ENABLED(CONFIG_SND_SOC_SOF_TIGERLAKE)
static const struct sof_dev_desc tgl_desc = {
.machines = snd_soc_acpi_intel_tgl_machines,
@@ -407,14 +371,6 @@ static const struct pci_device_id sof_pci_ids[] = {
{ PCI_DEVICE(0x8086, 0xa348),
.driver_data = (unsigned long)&cfl_desc},
#endif
-#if IS_ENABLED(CONFIG_SND_SOC_SOF_KABYLAKE)
- { PCI_DEVICE(0x8086, 0x9d71),
- .driver_data = (unsigned long)&kbl_desc},
-#endif
-#if IS_ENABLED(CONFIG_SND_SOC_SOF_SKYLAKE)
- { PCI_DEVICE(0x8086, 0x9d70),
- .driver_data = (unsigned long)&skl_desc},
-#endif
#if IS_ENABLED(CONFIG_SND_SOC_SOF_ICELAKE)
{ PCI_DEVICE(0x8086, 0x34C8),
.driver_data = (unsigned long)&icl_desc},
--
2.20.1
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [alsa-devel] [PATCH] ASoC: SOF - remove the dead code (skylake/kabylake)
2019-10-28 17:33 [alsa-devel] [PATCH] ASoC: SOF - remove the dead code (skylake/kabylake) Jaroslav Kysela
@ 2019-10-28 17:40 ` Pierre-Louis Bossart
2019-10-29 12:57 ` [alsa-devel] Applied "ASoC: SOF - remove the dead code (skylake/kabylake)" to the asoc tree Mark Brown
1 sibling, 0 replies; 3+ messages in thread
From: Pierre-Louis Bossart @ 2019-10-28 17:40 UTC (permalink / raw)
To: Jaroslav Kysela, ALSA development; +Cc: Takashi Iwai, Mark Brown
On 10/28/19 12:33 PM, Jaroslav Kysela wrote:
> Appearently the CONFIG_SND_SOC_SOF_KABYLAKE and CONFIG_SND_SOC_SOF_SKYLAKE
> options are not present in Kconfig and 'struct snd_sof_dsp_ops sof_skl_ops'
> is not declared in the code, too.
>
> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
> Cc: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
> Cc: Mark Brown <broonie@kernel.org>
Right, but there is still a plan to "at some point" support those
platforms.
I don't mind if we remove this code, just be aware that it'll come back.
> ---
> sound/soc/sof/intel/hda.h | 1 -
> sound/soc/sof/sof-pci-dev.c | 44 -------------------------------------
> 2 files changed, 45 deletions(-)
>
> diff --git a/sound/soc/sof/intel/hda.h b/sound/soc/sof/intel/hda.h
> index 23e430d3e056..f521c48ec2eb 100644
> --- a/sound/soc/sof/intel/hda.h
> +++ b/sound/soc/sof/intel/hda.h
> @@ -596,7 +596,6 @@ extern struct snd_soc_dai_driver skl_dai[];
> */
> extern const struct snd_sof_dsp_ops sof_apl_ops;
> extern const struct snd_sof_dsp_ops sof_cnl_ops;
> -extern const struct snd_sof_dsp_ops sof_skl_ops;
>
> extern const struct sof_intel_dsp_desc apl_chip_info;
> extern const struct sof_intel_dsp_desc cnl_chip_info;
> diff --git a/sound/soc/sof/sof-pci-dev.c b/sound/soc/sof/sof-pci-dev.c
> index 3a9e0e2a150d..bca3fb791a6b 100644
> --- a/sound/soc/sof/sof-pci-dev.c
> +++ b/sound/soc/sof/sof-pci-dev.c
> @@ -168,42 +168,6 @@ static const struct sof_dev_desc icl_desc = {
> };
> #endif
>
> -#if IS_ENABLED(CONFIG_SND_SOC_SOF_SKYLAKE)
> -static const struct sof_dev_desc skl_desc = {
> - .machines = snd_soc_acpi_intel_skl_machines,
> - .resindex_lpe_base = 0,
> - .resindex_pcicfg_base = -1,
> - .resindex_imr_base = -1,
> - .irqindex_host_ipc = -1,
> - .resindex_dma_base = -1,
> - .chip_info = &skl_chip_info,
> - .default_fw_path = "intel/sof",
> - .default_tplg_path = "intel/sof-tplg",
> - .nocodec_fw_filename = "sof-skl.ri",
> - .nocodec_tplg_filename = "sof-skl-nocodec.tplg",
> - .ops = &sof_skl_ops,
> - .arch_ops = &sof_xtensa_arch_ops
> -};
> -#endif
> -
> -#if IS_ENABLED(CONFIG_SND_SOC_SOF_KABYLAKE)
> -static const struct sof_dev_desc kbl_desc = {
> - .machines = snd_soc_acpi_intel_kbl_machines,
> - .resindex_lpe_base = 0,
> - .resindex_pcicfg_base = -1,
> - .resindex_imr_base = -1,
> - .irqindex_host_ipc = -1,
> - .resindex_dma_base = -1,
> - .chip_info = &skl_chip_info,
> - .default_fw_path = "intel/sof",
> - .default_tplg_path = "intel/sof-tplg",
> - .nocodec_fw_filename = "sof-kbl.ri",
> - .nocodec_tplg_filename = "sof-kbl-nocodec.tplg",
> - .ops = &sof_skl_ops,
> - .arch_ops = &sof_xtensa_arch_ops
> -};
> -#endif
> -
> #if IS_ENABLED(CONFIG_SND_SOC_SOF_TIGERLAKE)
> static const struct sof_dev_desc tgl_desc = {
> .machines = snd_soc_acpi_intel_tgl_machines,
> @@ -407,14 +371,6 @@ static const struct pci_device_id sof_pci_ids[] = {
> { PCI_DEVICE(0x8086, 0xa348),
> .driver_data = (unsigned long)&cfl_desc},
> #endif
> -#if IS_ENABLED(CONFIG_SND_SOC_SOF_KABYLAKE)
> - { PCI_DEVICE(0x8086, 0x9d71),
> - .driver_data = (unsigned long)&kbl_desc},
> -#endif
> -#if IS_ENABLED(CONFIG_SND_SOC_SOF_SKYLAKE)
> - { PCI_DEVICE(0x8086, 0x9d70),
> - .driver_data = (unsigned long)&skl_desc},
> -#endif
> #if IS_ENABLED(CONFIG_SND_SOC_SOF_ICELAKE)
> { PCI_DEVICE(0x8086, 0x34C8),
> .driver_data = (unsigned long)&icl_desc},
>
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
^ permalink raw reply [flat|nested] 3+ messages in thread* [alsa-devel] Applied "ASoC: SOF - remove the dead code (skylake/kabylake)" to the asoc tree
2019-10-28 17:33 [alsa-devel] [PATCH] ASoC: SOF - remove the dead code (skylake/kabylake) Jaroslav Kysela
2019-10-28 17:40 ` Pierre-Louis Bossart
@ 2019-10-29 12:57 ` Mark Brown
1 sibling, 0 replies; 3+ messages in thread
From: Mark Brown @ 2019-10-29 12:57 UTC (permalink / raw)
To: Jaroslav Kysela
Cc: Takashi Iwai, ALSA development, Mark Brown, Pierre-Louis Bossart
The patch
ASoC: SOF - remove the dead code (skylake/kabylake)
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.5
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
From c3ad1092e1069f27d0ca110dcaada8a5435ea3e0 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Mon, 28 Oct 2019 18:33:29 +0100
Subject: [PATCH] ASoC: SOF - remove the dead code (skylake/kabylake)
Appearently the CONFIG_SND_SOC_SOF_KABYLAKE and CONFIG_SND_SOC_SOF_SKYLAKE
options are not present in Kconfig and 'struct snd_sof_dsp_ops sof_skl_ops'
is not declared in the code, too.
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Cc: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Cc: Mark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20191028173329.29538-1-perex@perex.cz
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/sof/intel/hda.h | 1 -
sound/soc/sof/sof-pci-dev.c | 44 -------------------------------------
2 files changed, 45 deletions(-)
diff --git a/sound/soc/sof/intel/hda.h b/sound/soc/sof/intel/hda.h
index 52a87a47029d..16376f55e420 100644
--- a/sound/soc/sof/intel/hda.h
+++ b/sound/soc/sof/intel/hda.h
@@ -608,7 +608,6 @@ extern struct snd_soc_dai_driver skl_dai[];
*/
extern const struct snd_sof_dsp_ops sof_apl_ops;
extern const struct snd_sof_dsp_ops sof_cnl_ops;
-extern const struct snd_sof_dsp_ops sof_skl_ops;
extern const struct sof_intel_dsp_desc apl_chip_info;
extern const struct sof_intel_dsp_desc cnl_chip_info;
diff --git a/sound/soc/sof/sof-pci-dev.c b/sound/soc/sof/sof-pci-dev.c
index 487b1f29f84d..4de90d04a91b 100644
--- a/sound/soc/sof/sof-pci-dev.c
+++ b/sound/soc/sof/sof-pci-dev.c
@@ -173,42 +173,6 @@ static const struct sof_dev_desc icl_desc = {
};
#endif
-#if IS_ENABLED(CONFIG_SND_SOC_SOF_SKYLAKE)
-static const struct sof_dev_desc skl_desc = {
- .machines = snd_soc_acpi_intel_skl_machines,
- .resindex_lpe_base = 0,
- .resindex_pcicfg_base = -1,
- .resindex_imr_base = -1,
- .irqindex_host_ipc = -1,
- .resindex_dma_base = -1,
- .chip_info = &skl_chip_info,
- .default_fw_path = "intel/sof",
- .default_tplg_path = "intel/sof-tplg",
- .nocodec_fw_filename = "sof-skl.ri",
- .nocodec_tplg_filename = "sof-skl-nocodec.tplg",
- .ops = &sof_skl_ops,
- .arch_ops = &sof_xtensa_arch_ops
-};
-#endif
-
-#if IS_ENABLED(CONFIG_SND_SOC_SOF_KABYLAKE)
-static const struct sof_dev_desc kbl_desc = {
- .machines = snd_soc_acpi_intel_kbl_machines,
- .resindex_lpe_base = 0,
- .resindex_pcicfg_base = -1,
- .resindex_imr_base = -1,
- .irqindex_host_ipc = -1,
- .resindex_dma_base = -1,
- .chip_info = &skl_chip_info,
- .default_fw_path = "intel/sof",
- .default_tplg_path = "intel/sof-tplg",
- .nocodec_fw_filename = "sof-kbl.ri",
- .nocodec_tplg_filename = "sof-kbl-nocodec.tplg",
- .ops = &sof_skl_ops,
- .arch_ops = &sof_xtensa_arch_ops
-};
-#endif
-
#if IS_ENABLED(CONFIG_SND_SOC_SOF_TIGERLAKE)
static const struct sof_dev_desc tgl_desc = {
.machines = snd_soc_acpi_intel_tgl_machines,
@@ -431,14 +395,6 @@ static const struct pci_device_id sof_pci_ids[] = {
{ PCI_DEVICE(0x8086, 0xa348),
.driver_data = (unsigned long)&cfl_desc},
#endif
-#if IS_ENABLED(CONFIG_SND_SOC_SOF_KABYLAKE)
- { PCI_DEVICE(0x8086, 0x9d71),
- .driver_data = (unsigned long)&kbl_desc},
-#endif
-#if IS_ENABLED(CONFIG_SND_SOC_SOF_SKYLAKE)
- { PCI_DEVICE(0x8086, 0x9d70),
- .driver_data = (unsigned long)&skl_desc},
-#endif
#if IS_ENABLED(CONFIG_SND_SOC_SOF_ICELAKE)
{ PCI_DEVICE(0x8086, 0x34C8),
.driver_data = (unsigned long)&icl_desc},
--
2.20.1
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-10-29 12:58 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-10-28 17:33 [alsa-devel] [PATCH] ASoC: SOF - remove the dead code (skylake/kabylake) Jaroslav Kysela
2019-10-28 17:40 ` Pierre-Louis Bossart
2019-10-29 12:57 ` [alsa-devel] Applied "ASoC: SOF - remove the dead code (skylake/kabylake)" to the asoc tree Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox