On 7/11/2023 4:16 PM, Andy Shevchenko wrote:
On Tue, Jul 11, 2023 at 02:57:25PM +0200, Amadeusz Sławiński wrote:
Use PCI device IDs from pci_ids.h header and while at it change to using PCI_DEVICE_DATA() macro, to simplify declarations.
FWIW, Reviewed-by: Andy Shevchenko andriy.shevchenko@linux.intel.com Oh, additional remark below.
Acked-by: Mark Brown broonie@kernel.org Signed-off-by: Amadeusz Sławiński amadeuszx.slawinski@linux.intel.com
sound/soc/sof/intel/pci-apl.c | 9 +++---- sound/soc/sof/intel/pci-cnl.c | 15 ++++-------- sound/soc/sof/intel/pci-icl.c | 12 ++++------ sound/soc/sof/intel/pci-mtl.c | 3 +-- sound/soc/sof/intel/pci-skl.c | 6 ++--- sound/soc/sof/intel/pci-tgl.c | 45 ++++++++++++----------------------- sound/soc/sof/intel/pci-tng.c | 3 +-- 7 files changed, 31 insertions(+), 62 deletions(-)
diff --git a/sound/soc/sof/intel/pci-apl.c b/sound/soc/sof/intel/pci-apl.c index 69cad5a6bc72..083659ddfe6b 100644 --- a/sound/soc/sof/intel/pci-apl.c +++ b/sound/soc/sof/intel/pci-apl.c @@ -85,12 +85,9 @@ static const struct sof_dev_desc glk_desc = {
/* PCI IDs */ 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},
- { PCI_DEVICE_DATA(INTEL, HDA_APL, &bxt_desc) },
- { PCI_DEVICE_DATA(INTEL, HDA_APL_T, &bxt_desc) },
Have we ever had APL-T? What is that? I remember that we have had two or three BXTs inside, and then products become for Broxton and Apollo Lake SoC codenames. I never have heard about -T...
I've talked a bit with Cezary and it seems that 0x1a98 is BXT-M (not -T) and it's an RVP, BXT-M B0 to be specific. From what we know no BXT is available on market. Perhaps we can just remove it?