[PATCH 0/3] ALSA/PCI: add PantherLake audio support
Add the PCI ID for PantherLake.
Since there's a follow-up patchset for ASoC, these 3 patches could be applied to the ASoC tree. Otherwise an immutable branch would be needed.
Pierre-Louis Bossart (3): PCI: pci_ids: add INTEL_HDA_PTL ALSA: hda: hda-intel: add PantherLake support ALSA: hda: intel-dsp-config: Add PTL support
include/linux/pci_ids.h | 1 + sound/hda/intel-dsp-config.c | 9 +++++++++ sound/pci/hda/hda_intel.c | 2 ++ 3 files changed, 12 insertions(+)
More PCI ids for Intel audio.
Signed-off-by: Pierre-Louis Bossart pierre-louis.bossart@linux.intel.com Reviewed-by: Péter Ujfalusi peter.ujfalusi@linux.intel.com Reviewed-by: Ranjani Sridharan ranjani.sridharan@linux.intel.com Reviewed-by: Bard Liao yung-chuan.liao@linux.intel.com Reviewed-by: Péter Ujfalusi peter.ujfalusi@linux.intel.com --- include/linux/pci_ids.h | 1 + 1 file changed, 1 insertion(+)
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 942a587bb97e..0168c6a60148 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -3112,6 +3112,7 @@ #define PCI_DEVICE_ID_INTEL_HDA_LNL_P 0xa828 #define PCI_DEVICE_ID_INTEL_S21152BB 0xb152 #define PCI_DEVICE_ID_INTEL_HDA_BMG 0xe2f7 +#define PCI_DEVICE_ID_INTEL_HDA_PTL 0xe428 #define PCI_DEVICE_ID_INTEL_HDA_CML_R 0xf0c8 #define PCI_DEVICE_ID_INTEL_HDA_RKL_S 0xf1c8
On Wed, Jun 12, 2024 at 08:47:07AM +0200, Pierre-Louis Bossart wrote:
More PCI ids for Intel audio.
Signed-off-by: Pierre-Louis Bossart pierre-louis.bossart@linux.intel.com Reviewed-by: Péter Ujfalusi peter.ujfalusi@linux.intel.com Reviewed-by: Ranjani Sridharan ranjani.sridharan@linux.intel.com Reviewed-by: Bard Liao yung-chuan.liao@linux.intel.com Reviewed-by: Péter Ujfalusi peter.ujfalusi@linux.intel.com
Change subject to match history:
PCI: Add INTEL_HDA_PTL to pci_ids.h
It's helpful mention the places where this will be used in the commit log because we only add things here when they're used in more than one place.
Acked-by: Bjorn Helgaas bhelgaas@google.com
include/linux/pci_ids.h | 1 + 1 file changed, 1 insertion(+)
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 942a587bb97e..0168c6a60148 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -3112,6 +3112,7 @@ #define PCI_DEVICE_ID_INTEL_HDA_LNL_P 0xa828 #define PCI_DEVICE_ID_INTEL_S21152BB 0xb152 #define PCI_DEVICE_ID_INTEL_HDA_BMG 0xe2f7 +#define PCI_DEVICE_ID_INTEL_HDA_PTL 0xe428 #define PCI_DEVICE_ID_INTEL_HDA_CML_R 0xf0c8 #define PCI_DEVICE_ID_INTEL_HDA_RKL_S 0xf1c8
-- 2.43.0
On Wed, 12 Jun 2024 21:48:34 +0200, Bjorn Helgaas wrote:
On Wed, Jun 12, 2024 at 08:47:07AM +0200, Pierre-Louis Bossart wrote:
More PCI ids for Intel audio.
Signed-off-by: Pierre-Louis Bossart pierre-louis.bossart@linux.intel.com Reviewed-by: Péter Ujfalusi peter.ujfalusi@linux.intel.com Reviewed-by: Ranjani Sridharan ranjani.sridharan@linux.intel.com Reviewed-by: Bard Liao yung-chuan.liao@linux.intel.com Reviewed-by: Péter Ujfalusi peter.ujfalusi@linux.intel.com
Change subject to match history:
PCI: Add INTEL_HDA_PTL to pci_ids.h
It's helpful mention the places where this will be used in the commit log because we only add things here when they're used in more than one place.
Acked-by: Bjorn Helgaas bhelgaas@google.com
OK, I corrected the subject at applying.
thanks,
Takashi
One more PCI ID.
Signed-off-by: Pierre-Louis Bossart pierre-louis.bossart@linux.intel.com Reviewed-by: Péter Ujfalusi peter.ujfalusi@linux.intel.com Reviewed-by: Ranjani Sridharan ranjani.sridharan@linux.intel.com Reviewed-by: Bard Liao yung-chuan.liao@linux.intel.com Reviewed-by: Péter Ujfalusi peter.ujfalusi@linux.intel.com --- sound/pci/hda/hda_intel.c | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 3500108f6ba3..b33602e64d17 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -2495,6 +2495,8 @@ static const struct pci_device_id azx_ids[] = { { PCI_DEVICE_DATA(INTEL, HDA_ARL_S, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) }, /* Arrow Lake */ { PCI_DEVICE_DATA(INTEL, HDA_ARL, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) }, + /* Panther Lake */ + { PCI_DEVICE_DATA(INTEL, HDA_PTL, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_LNL) }, /* Apollolake (Broxton-P) */ { PCI_DEVICE_DATA(INTEL, HDA_APL, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_BROXTON) }, /* Gemini-Lake */
Same recipes as LNL
Signed-off-by: Pierre-Louis Bossart pierre-louis.bossart@linux.intel.com Reviewed-by: Péter Ujfalusi peter.ujfalusi@linux.intel.com Reviewed-by: Ranjani Sridharan ranjani.sridharan@linux.intel.com Reviewed-by: Bard Liao yung-chuan.liao@linux.intel.com Reviewed-by: Péter Ujfalusi peter.ujfalusi@linux.intel.com --- sound/hda/intel-dsp-config.c | 9 +++++++++ 1 file changed, 9 insertions(+)
diff --git a/sound/hda/intel-dsp-config.c b/sound/hda/intel-dsp-config.c index 537863447358..a7419d2e912e 100644 --- a/sound/hda/intel-dsp-config.c +++ b/sound/hda/intel-dsp-config.c @@ -543,6 +543,15 @@ static const struct config_entry config_table[] = { .device = PCI_DEVICE_ID_INTEL_HDA_LNL_P, }, #endif + + /* Panther Lake */ +#if IS_ENABLED(CONFIG_SND_SOC_SOF_PANTHERLAKE) + { + .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE, + .device = PCI_DEVICE_ID_INTEL_HDA_PTL, + }, +#endif + };
static const struct config_entry *snd_intel_dsp_find_config
On Wed, 12 Jun 2024 08:47:06 +0200, Pierre-Louis Bossart wrote:
Add the PCI ID for PantherLake.
Since there's a follow-up patchset for ASoC, these 3 patches could be applied to the ASoC tree. Otherwise an immutable branch would be needed.
Pierre-Louis Bossart (3): PCI: pci_ids: add INTEL_HDA_PTL ALSA: hda: hda-intel: add PantherLake support ALSA: hda: intel-dsp-config: Add PTL support
Applied now to for-next branch.
There were duplicated Reviewed-by tags by Peter as checkpatch complained, so I removed the one.
thanks,
Takashi
On 6/13/24 14:19, Takashi Iwai wrote:
On Wed, 12 Jun 2024 08:47:06 +0200, Pierre-Louis Bossart wrote:
Add the PCI ID for PantherLake.
Since there's a follow-up patchset for ASoC, these 3 patches could be applied to the ASoC tree. Otherwise an immutable branch would be needed.
Pierre-Louis Bossart (3): PCI: pci_ids: add INTEL_HDA_PTL ALSA: hda: hda-intel: add PantherLake support ALSA: hda: intel-dsp-config: Add PTL support
Applied now to for-next branch.
There were duplicated Reviewed-by tags by Peter as checkpatch complained, so I removed the one.
Thanks Takashi, how do we proceed to get those changes into AsoC?
the first patch is a dependency for the patchset "[PATCH v2 0/5] ASoC/SOF/PCI/Intel: add PantherLake support"
On Thu, 13 Jun 2024 16:16:33 +0200, Pierre-Louis Bossart wrote:
On 6/13/24 14:19, Takashi Iwai wrote:
On Wed, 12 Jun 2024 08:47:06 +0200, Pierre-Louis Bossart wrote:
Add the PCI ID for PantherLake.
Since there's a follow-up patchset for ASoC, these 3 patches could be applied to the ASoC tree. Otherwise an immutable branch would be needed.
Pierre-Louis Bossart (3): PCI: pci_ids: add INTEL_HDA_PTL ALSA: hda: hda-intel: add PantherLake support ALSA: hda: intel-dsp-config: Add PTL support
Applied now to for-next branch.
There were duplicated Reviewed-by tags by Peter as checkpatch complained, so I removed the one.
Thanks Takashi, how do we proceed to get those changes into AsoC?
the first patch is a dependency for the patchset "[PATCH v2 0/5] ASoC/SOF/PCI/Intel: add PantherLake support"
ASoC tree needs to merge for-next branch from my sound.git tree. Or vice versa, Mark sends a PR to sync the content. (It should be done more often, not only once per cycle, IMHO.)
thanks,
Takashi
participants (3)
-
Bjorn Helgaas -
Pierre-Louis Bossart -
Takashi Iwai