ASoC: SOF: Intel: initial support to JasperLake.
Add Kconfig, PCI ID and chip info for JSL platform. The DSP only has 2 cores for this platform. Signed-off-by: Pan Xiuli <xiuli.pan@linux.intel.com> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Link: https://lore.kernel.org/r/20191022194705.23347-3-pierre-louis.bossart@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Родитель
4f0637eae5
Коммит
6fd9903527
|
@ -29,6 +29,7 @@ config SND_SOC_SOF_INTEL_PCI
|
|||
select SND_SOC_SOF_COMETLAKE_H if SND_SOC_SOF_COMETLAKE_H_SUPPORT
|
||||
select SND_SOC_SOF_TIGERLAKE if SND_SOC_SOF_TIGERLAKE_SUPPORT
|
||||
select SND_SOC_SOF_ELKHARTLAKE if SND_SOC_SOF_ELKHARTLAKE_SUPPORT
|
||||
select SND_SOC_SOF_JASPERLAKE if SND_SOC_SOF_JASPERLAKE_SUPPORT
|
||||
help
|
||||
This option is not user-selectable but automagically handled by
|
||||
'select' statements at a higher level
|
||||
|
@ -244,6 +245,21 @@ config SND_SOC_SOF_ELKHARTLAKE
|
|||
This option is not user-selectable but automagically handled by
|
||||
'select' statements at a higher level
|
||||
|
||||
config SND_SOC_SOF_JASPERLAKE_SUPPORT
|
||||
bool "SOF support for JasperLake"
|
||||
help
|
||||
This adds support for Sound Open Firmware for Intel(R) platforms
|
||||
using the JasperLake processors.
|
||||
Say Y if you have such a device.
|
||||
If unsure select "N".
|
||||
|
||||
config SND_SOC_SOF_JASPERLAKE
|
||||
tristate
|
||||
select SND_SOC_SOF_HDA_COMMON
|
||||
help
|
||||
This option is not user-selectable but automagically handled by
|
||||
'select' statements at a higher level
|
||||
|
||||
config SND_SOC_SOF_HDA_COMMON
|
||||
tristate
|
||||
select SND_SOC_SOF_INTEL_COMMON
|
||||
|
|
|
@ -327,3 +327,20 @@ const struct sof_intel_dsp_desc ehl_chip_info = {
|
|||
.ssp_base_offset = CNL_SSP_BASE_OFFSET,
|
||||
};
|
||||
EXPORT_SYMBOL(ehl_chip_info);
|
||||
|
||||
const struct sof_intel_dsp_desc jsl_chip_info = {
|
||||
/* Jasperlake */
|
||||
.cores_num = 2,
|
||||
.init_core_mask = 1,
|
||||
.cores_mask = HDA_DSP_CORE_MASK(0) |
|
||||
HDA_DSP_CORE_MASK(1),
|
||||
.ipc_req = CNL_DSP_REG_HIPCIDR,
|
||||
.ipc_req_mask = CNL_DSP_REG_HIPCIDR_BUSY,
|
||||
.ipc_ack = CNL_DSP_REG_HIPCIDA,
|
||||
.ipc_ack_mask = CNL_DSP_REG_HIPCIDA_DONE,
|
||||
.ipc_ctl = CNL_DSP_REG_HIPCCTL,
|
||||
.rom_init_timeout = 300,
|
||||
.ssp_count = ICL_SSP_COUNT,
|
||||
.ssp_base_offset = CNL_SSP_BASE_OFFSET,
|
||||
};
|
||||
EXPORT_SYMBOL(jsl_chip_info);
|
||||
|
|
|
@ -604,5 +604,6 @@ extern const struct sof_intel_dsp_desc skl_chip_info;
|
|||
extern const struct sof_intel_dsp_desc icl_chip_info;
|
||||
extern const struct sof_intel_dsp_desc tgl_chip_info;
|
||||
extern const struct sof_intel_dsp_desc ehl_chip_info;
|
||||
extern const struct sof_intel_dsp_desc jsl_chip_info;
|
||||
|
||||
#endif
|
||||
|
|
|
@ -245,6 +245,24 @@ static const struct sof_dev_desc ehl_desc = {
|
|||
};
|
||||
#endif
|
||||
|
||||
#if IS_ENABLED(CONFIG_SND_SOC_SOF_JASPERLAKE)
|
||||
static const struct sof_dev_desc jsl_desc = {
|
||||
.machines = snd_soc_acpi_intel_jsl_machines,
|
||||
.resindex_lpe_base = 0,
|
||||
.resindex_pcicfg_base = -1,
|
||||
.resindex_imr_base = -1,
|
||||
.irqindex_host_ipc = -1,
|
||||
.resindex_dma_base = -1,
|
||||
.chip_info = &jsl_chip_info,
|
||||
.default_fw_path = "intel/sof",
|
||||
.default_tplg_path = "intel/sof-tplg",
|
||||
.nocodec_fw_filename = "sof-jsl.ri",
|
||||
.nocodec_tplg_filename = "sof-jsl-nocodec.tplg",
|
||||
.ops = &sof_cnl_ops,
|
||||
.arch_ops = &sof_xtensa_arch_ops
|
||||
};
|
||||
#endif
|
||||
|
||||
static const struct dev_pm_ops sof_pci_pm = {
|
||||
SET_SYSTEM_SLEEP_PM_OPS(snd_sof_suspend, snd_sof_resume)
|
||||
SET_RUNTIME_PM_OPS(snd_sof_runtime_suspend, snd_sof_runtime_resume,
|
||||
|
@ -423,6 +441,10 @@ static const struct pci_device_id sof_pci_ids[] = {
|
|||
{ PCI_DEVICE(0x8086, 0x34C8),
|
||||
.driver_data = (unsigned long)&icl_desc},
|
||||
#endif
|
||||
#if IS_ENABLED(CONFIG_SND_SOC_SOF_JASPERLAKE)
|
||||
{ PCI_DEVICE(0x8086, 0x38c8),
|
||||
.driver_data = (unsigned long)&jsl_desc},
|
||||
#endif
|
||||
#if IS_ENABLED(CONFIG_SND_SOC_SOF_COMETLAKE_LP)
|
||||
{ PCI_DEVICE(0x8086, 0x02c8),
|
||||
.driver_data = (unsigned long)&cml_desc},
|
||||
|
|
Загрузка…
Ссылка в новой задаче