diff mbox series

[v3,03/15] ASoC: SOF: Remove unused Broxton PCI ID

Message ID 20230714202457.423866-4-amadeuszx.slawinski@linux.intel.com (mailing list archive)
State Superseded
Delegated to: Bjorn Helgaas
Headers show
Series PCI: Define Intel PCI IDs and use them in drivers | expand

Commit Message

Amadeusz Sławiński July 14, 2023, 8:24 p.m. UTC 
Current code references 0x1a98 which is BXT-M (not -T as it is
commented) and it's an RVP, BXT-M B0 to be specific. From what we know
no BXT is available on market.

Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
---
 sound/hda/intel-dsp-config.c  | 7 -------
 sound/soc/sof/intel/pci-apl.c | 2 --
 2 files changed, 9 deletions(-)

Comments

Andy Shevchenko July 14, 2023, 12:35 p.m. UTC | #1 
On Fri, Jul 14, 2023 at 10:24:45PM +0200, Amadeusz Sławiński wrote:
> Current code references 0x1a98 which is BXT-M (not -T as it is
> commented) and it's an RVP, BXT-M B0 to be specific. From what we know
> no BXT is available on market.

...

>  sound/hda/intel-dsp-config.c  | 7 -------
>  sound/soc/sof/intel/pci-apl.c | 2 --

I dunno how SOF and HDA are related to each other, but in the next patch you
also do something about HDA, either group all of them, or split HDA, or split
on per file basis. I'm not familiar with the relationship between them up to
you which way you choose.
Amadeusz Sławiński July 14, 2023, 12:44 p.m. UTC | #2 
On 7/14/2023 2:35 PM, Andy Shevchenko wrote:
> On Fri, Jul 14, 2023 at 10:24:45PM +0200, Amadeusz Sławiński wrote:
>> Current code references 0x1a98 which is BXT-M (not -T as it is
>> commented) and it's an RVP, BXT-M B0 to be specific. From what we know
>> no BXT is available on market.
> 
> ...
> 
>>   sound/hda/intel-dsp-config.c  | 7 -------
>>   sound/soc/sof/intel/pci-apl.c | 2 --
> 
> I dunno how SOF and HDA are related to each other, but in the next patch you
> also do something about HDA, either group all of them, or split HDA, or split
> on per file basis. I'm not familiar with the relationship between them up to
> you which way you choose.
> 

Well SOF is a DSP driver, so that's why I split it from HDA - 
intel-dsp-config.c file is used to perform checks to know if it should 
load DSP driver (and which one), hence the "weird" split.
Andy Shevchenko July 14, 2023, 12:46 p.m. UTC | #3 
On Fri, Jul 14, 2023 at 02:44:06PM +0200, Amadeusz Sławiński wrote:
> On 7/14/2023 2:35 PM, Andy Shevchenko wrote:
> > On Fri, Jul 14, 2023 at 10:24:45PM +0200, Amadeusz Sławiński wrote:

...

> > >   sound/hda/intel-dsp-config.c  | 7 -------
> > >   sound/soc/sof/intel/pci-apl.c | 2 --
> > 
> > I dunno how SOF and HDA are related to each other, but in the next patch you
> > also do something about HDA, either group all of them, or split HDA, or split
> > on per file basis. I'm not familiar with the relationship between them up to
> > you which way you choose.
> > 
> 
> Well SOF is a DSP driver, so that's why I split it from HDA -
> intel-dsp-config.c file is used to perform checks to know if it should load
> DSP driver (and which one), hence the "weird" split.

Ah, okay that explains!
diff mbox series

Patch

diff --git a/sound/hda/intel-dsp-config.c b/sound/hda/intel-dsp-config.c
index 317bdf6dcbef..5cee995f7a42 100644
--- a/sound/hda/intel-dsp-config.c
+++ b/sound/hda/intel-dsp-config.c
@@ -53,13 +53,6 @@  static const struct config_entry config_table[] = {
 		.device = 0x119a,
 	},
 #endif
-/* Broxton-T */
-#if IS_ENABLED(CONFIG_SND_SOC_SOF_APOLLOLAKE)
-	{
-		.flags = FLAG_SOF,
-		.device = 0x1a98,
-	},
-#endif
 /*
  * Apollolake (Broxton-P)
  * the legacy HDAudio driver is used except on Up Squared (SOF) and
diff --git a/sound/soc/sof/intel/pci-apl.c b/sound/soc/sof/intel/pci-apl.c
index 69cad5a6bc72..bc3ad64baec5 100644
--- a/sound/soc/sof/intel/pci-apl.c
+++ b/sound/soc/sof/intel/pci-apl.c
@@ -87,8 +87,6 @@  static const struct sof_dev_desc glk_desc = {
 static const struct pci_device_id sof_pci_ids[] = {
 	{ PCI_DEVICE(0x8086, 0x5a98), /* BXT-P (ApolloLake) */
 		.driver_data = (unsigned long)&bxt_desc},
-	{ PCI_DEVICE(0x8086, 0x1a98),/* BXT-T */
-		.driver_data = (unsigned long)&bxt_desc},
 	{ PCI_DEVICE(0x8086, 0x3198), /* GeminiLake */
 		.driver_data = (unsigned long)&glk_desc},
 	{ 0, }