Skip to content

L
linux
Commit a4d3712b authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge tag 'sound-5.8-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 

Pull sound fixes from Takashi Iwai:
 "A collection of small fixes gathered in the last two weeks.

  The major changes here are fixes for the recent DPCM regressions found
  on i.MX and Qualcomm platforms and fixes for resource leaks in ASoC
  DAI registrations.

  Other than those are mostly device-specific fixes including the usual
  USB- and HD-audio quirks, and a fix for syzkaller case and ID updates
  for new Intel platforms"

* tag 'sound-5.8-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (32 commits)
  ALSA: usb-audio: Fix OOB access of mixer element list
  ALSA: usb-audio: add quirk for Samsung USBC Headset (AKG)
  ALSA: usb-audio: Add registration quirk for Kingston HyperX Cloud Flight S
  ASoC: rockchip: Fix a reference count leak.
  ASoC: amd: closing specific instance.
  ALSA: hda: Intel: add missing PCI IDs for ICL-H, TGL-H and EKL
  ASoC: hdac_hda: fix memleak with regmap not freed on remove
  ASoC: SOF: Intel: add PCI IDs for ICL-H and TGL-H
  ASoC: SOF: Intel: add PCI ID for CometLake-S
  ASoC: Intel: SOF: merge COMETLAKE_LP and COMETLAKE_H
  ALSA: hda/realtek: Add mute LED and micmute LED support for HP systems
  ALSA: usb-audio: Fix potential use-after-free of streams
  ALSA: hda/realtek - Add quirk for MSI GE63 laptop
  ASoC: fsl_ssi: Fix bclk calculation for mono channel
  ASoC: SOF: Intel: hda: Clear RIRB status before reading WP
  ASoC: rt1015: Update rt1015 default register value according to spec modification.
  ASoC: qcom: common: set correct directions for dailinks
  ASoc: q6afe: add support to get port direction
  ASoC: soc-pcm: fix checks for multi-cpu FE dailinks
  ASoC: rt5682: Let dai clks be registered whether mclk exists or not
  ...
parents 8be3a53e 220345e9
Show whitespace changes
Inline Side-by-side
Showing with 347 additions and 160 deletions
include/sound/dmaengine_pcm.h
View file @ a4d3712b
...@@ -161,4 +161,15 @@ int snd_dmaengine_pcm_prepare_slave_config(struct snd_pcm_substream *substream, ...@@ -161,4 +161,15 @@ int snd_dmaengine_pcm_prepare_slave_config(struct snd_pcm_substream *substream,
#define SND_DMAENGINE_PCM_DRV_NAME "snd_dmaengine_pcm" #define SND_DMAENGINE_PCM_DRV_NAME "snd_dmaengine_pcm"
struct dmaengine_pcm {
struct dma_chan *chan[SNDRV_PCM_STREAM_LAST + 1];
const struct snd_dmaengine_pcm_config *config;
struct snd_soc_component component;
unsigned int flags;
};
static inline struct dmaengine_pcm *soc_component_to_pcm(struct snd_soc_component *p)
{
return container_of(p, struct dmaengine_pcm, component);
}
#endif #endif
include/sound/soc.h
View file @ a4d3712b
...@@ -444,6 +444,8 @@ int devm_snd_soc_register_component(struct device *dev, ...@@ -444,6 +444,8 @@ int devm_snd_soc_register_component(struct device *dev,
const struct snd_soc_component_driver *component_driver, const struct snd_soc_component_driver *component_driver,
struct snd_soc_dai_driver *dai_drv, int num_dai); struct snd_soc_dai_driver *dai_drv, int num_dai);
void snd_soc_unregister_component(struct device *dev); void snd_soc_unregister_component(struct device *dev);
struct snd_soc_component *snd_soc_lookup_component_nolocked(struct device *dev,
const char *driver_name);
struct snd_soc_component *snd_soc_lookup_component(struct device *dev, struct snd_soc_component *snd_soc_lookup_component(struct device *dev,
const char *driver_name); const char *driver_name);
...@@ -1361,6 +1363,10 @@ void snd_soc_remove_pcm_runtime(struct snd_soc_card *card, ...@@ -1361,6 +1363,10 @@ void snd_soc_remove_pcm_runtime(struct snd_soc_card *card,
struct snd_soc_dai *snd_soc_register_dai(struct snd_soc_component *component, struct snd_soc_dai *snd_soc_register_dai(struct snd_soc_component *component,
struct snd_soc_dai_driver *dai_drv, struct snd_soc_dai_driver *dai_drv,
bool legacy_dai_naming); bool legacy_dai_naming);
struct snd_soc_dai *devm_snd_soc_register_dai(struct device *dev,
struct snd_soc_component *component,
struct snd_soc_dai_driver *dai_drv,
bool legacy_dai_naming);
void snd_soc_unregister_dai(struct snd_soc_dai *dai); void snd_soc_unregister_dai(struct snd_soc_dai *dai);
struct snd_soc_dai *snd_soc_find_dai( struct snd_soc_dai *snd_soc_find_dai(
......
sound/hda/intel-dsp-config.c
View file @ a4d3712b
...@@ -208,8 +208,8 @@ static const struct config_entry config_table[] = { ...@@ -208,8 +208,8 @@ static const struct config_entry config_table[] = {
}, },
#endif #endif
#if IS_ENABLED(CONFIG_SND_SOC_SOF_COMETLAKE)
/* Cometlake-LP */ /* Cometlake-LP */
#if IS_ENABLED(CONFIG_SND_SOC_SOF_COMETLAKE_LP)
{ {
.flags = FLAG_SOF, .flags = FLAG_SOF,
.device = 0x02c8, .device = 0x02c8,
...@@ -240,9 +240,7 @@ static const struct config_entry config_table[] = { ...@@ -240,9 +240,7 @@ static const struct config_entry config_table[] = {
.flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE, .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,
.device = 0x02c8, .device = 0x02c8,
}, },
#endif
/* Cometlake-H */ /* Cometlake-H */
#if IS_ENABLED(CONFIG_SND_SOC_SOF_COMETLAKE_H)
{ {
.flags = FLAG_SOF, .flags = FLAG_SOF,
.device = 0x06c8, .device = 0x06c8,
......
sound/pci/hda/hda_intel.c
View file @ a4d3712b
...@@ -2470,6 +2470,9 @@ static const struct pci_device_id azx_ids[] = { ...@@ -2470,6 +2470,9 @@ static const struct pci_device_id azx_ids[] = {
/* Icelake */ /* Icelake */
{ PCI_DEVICE(0x8086, 0x34c8), { PCI_DEVICE(0x8086, 0x34c8),
.driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE}, .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
/* Icelake-H */
{ PCI_DEVICE(0x8086, 0x3dc8),
.driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
/* Jasperlake */ /* Jasperlake */
{ PCI_DEVICE(0x8086, 0x38c8), { PCI_DEVICE(0x8086, 0x38c8),
.driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE}, .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
...@@ -2478,9 +2481,14 @@ static const struct pci_device_id azx_ids[] = { ...@@ -2478,9 +2481,14 @@ static const struct pci_device_id azx_ids[] = {
/* Tigerlake */ /* Tigerlake */
{ PCI_DEVICE(0x8086, 0xa0c8), { PCI_DEVICE(0x8086, 0xa0c8),
.driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE}, .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
/* Tigerlake-H */
{ PCI_DEVICE(0x8086, 0x43c8),
.driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
/* Elkhart Lake */ /* Elkhart Lake */
{ PCI_DEVICE(0x8086, 0x4b55), { PCI_DEVICE(0x8086, 0x4b55),
.driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE}, .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
{ PCI_DEVICE(0x8086, 0x4b58),
.driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
/* Broxton-P(Apollolake) */ /* Broxton-P(Apollolake) */
{ PCI_DEVICE(0x8086, 0x5a98), { PCI_DEVICE(0x8086, 0x5a98),
.driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_BROXTON }, .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_BROXTON },
......
sound/pci/hda/patch_hdmi.c
View file @ a4d3712b
...@@ -4145,6 +4145,11 @@ HDA_CODEC_ENTRY(0x10de0095, "GPU 95 HDMI/DP", patch_nvhdmi), ...@@ -4145,6 +4145,11 @@ HDA_CODEC_ENTRY(0x10de0095, "GPU 95 HDMI/DP", patch_nvhdmi),
HDA_CODEC_ENTRY(0x10de0097, "GPU 97 HDMI/DP", patch_nvhdmi), HDA_CODEC_ENTRY(0x10de0097, "GPU 97 HDMI/DP", patch_nvhdmi),
HDA_CODEC_ENTRY(0x10de0098, "GPU 98 HDMI/DP", patch_nvhdmi), HDA_CODEC_ENTRY(0x10de0098, "GPU 98 HDMI/DP", patch_nvhdmi),
HDA_CODEC_ENTRY(0x10de0099, "GPU 99 HDMI/DP", patch_nvhdmi), HDA_CODEC_ENTRY(0x10de0099, "GPU 99 HDMI/DP", patch_nvhdmi),
HDA_CODEC_ENTRY(0x10de009a, "GPU 9a HDMI/DP", patch_nvhdmi),
HDA_CODEC_ENTRY(0x10de009d, "GPU 9d HDMI/DP", patch_nvhdmi),
HDA_CODEC_ENTRY(0x10de009e, "GPU 9e HDMI/DP", patch_nvhdmi),
HDA_CODEC_ENTRY(0x10de009f, "GPU 9f HDMI/DP", patch_nvhdmi),
HDA_CODEC_ENTRY(0x10de00a0, "GPU a0 HDMI/DP", patch_nvhdmi),
HDA_CODEC_ENTRY(0x10de8001, "MCP73 HDMI", patch_nvhdmi_2ch), HDA_CODEC_ENTRY(0x10de8001, "MCP73 HDMI", patch_nvhdmi_2ch),
HDA_CODEC_ENTRY(0x10de8067, "MCP67/68 HDMI", patch_nvhdmi_2ch), HDA_CODEC_ENTRY(0x10de8067, "MCP67/68 HDMI", patch_nvhdmi_2ch),
HDA_CODEC_ENTRY(0x11069f80, "VX900 HDMI/DP", patch_via_hdmi), HDA_CODEC_ENTRY(0x11069f80, "VX900 HDMI/DP", patch_via_hdmi),
......
sound/pci/hda/patch_realtek.c
View file @ a4d3712b
...@@ -2461,6 +2461,7 @@ static const struct snd_pci_quirk alc882_fixup_tbl[] = { ...@@ -2461,6 +2461,7 @@ static const struct snd_pci_quirk alc882_fixup_tbl[] = {
SND_PCI_QUIRK(0x1458, 0xa0b8, "Gigabyte AZ370-Gaming", ALC1220_FIXUP_GB_DUAL_CODECS), SND_PCI_QUIRK(0x1458, 0xa0b8, "Gigabyte AZ370-Gaming", ALC1220_FIXUP_GB_DUAL_CODECS),
SND_PCI_QUIRK(0x1458, 0xa0cd, "Gigabyte X570 Aorus Master", ALC1220_FIXUP_CLEVO_P950), SND_PCI_QUIRK(0x1458, 0xa0cd, "Gigabyte X570 Aorus Master", ALC1220_FIXUP_CLEVO_P950),
SND_PCI_QUIRK(0x1458, 0xa0ce, "Gigabyte X570 Aorus Xtreme", ALC1220_FIXUP_CLEVO_P950), SND_PCI_QUIRK(0x1458, 0xa0ce, "Gigabyte X570 Aorus Xtreme", ALC1220_FIXUP_CLEVO_P950),
SND_PCI_QUIRK(0x1462, 0x11f7, "MSI-GE63", ALC1220_FIXUP_CLEVO_P950),
SND_PCI_QUIRK(0x1462, 0x1228, "MSI-GP63", ALC1220_FIXUP_CLEVO_P950), SND_PCI_QUIRK(0x1462, 0x1228, "MSI-GP63", ALC1220_FIXUP_CLEVO_P950),
SND_PCI_QUIRK(0x1462, 0x1275, "MSI-GL63", ALC1220_FIXUP_CLEVO_P950), SND_PCI_QUIRK(0x1462, 0x1275, "MSI-GL63", ALC1220_FIXUP_CLEVO_P950),
SND_PCI_QUIRK(0x1462, 0x1276, "MSI-GL73", ALC1220_FIXUP_CLEVO_P950), SND_PCI_QUIRK(0x1462, 0x1276, "MSI-GL73", ALC1220_FIXUP_CLEVO_P950),
...@@ -7470,6 +7471,8 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { ...@@ -7470,6 +7471,8 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
SND_PCI_QUIRK(0x103c, 0x83b9, "HP Spectre x360", ALC269_FIXUP_HP_MUTE_LED_MIC3), SND_PCI_QUIRK(0x103c, 0x83b9, "HP Spectre x360", ALC269_FIXUP_HP_MUTE_LED_MIC3),
SND_PCI_QUIRK(0x103c, 0x8497, "HP Envy x360", ALC269_FIXUP_HP_MUTE_LED_MIC3), SND_PCI_QUIRK(0x103c, 0x8497, "HP Envy x360", ALC269_FIXUP_HP_MUTE_LED_MIC3),
SND_PCI_QUIRK(0x103c, 0x84e7, "HP Pavilion 15", ALC269_FIXUP_HP_MUTE_LED_MIC3), SND_PCI_QUIRK(0x103c, 0x84e7, "HP Pavilion 15", ALC269_FIXUP_HP_MUTE_LED_MIC3),
SND_PCI_QUIRK(0x103c, 0x869d, "HP", ALC236_FIXUP_HP_MUTE_LED),
SND_PCI_QUIRK(0x103c, 0x8729, "HP", ALC285_FIXUP_HP_GPIO_LED),
SND_PCI_QUIRK(0x103c, 0x8736, "HP", ALC285_FIXUP_HP_GPIO_LED), SND_PCI_QUIRK(0x103c, 0x8736, "HP", ALC285_FIXUP_HP_GPIO_LED),
SND_PCI_QUIRK(0x103c, 0x877a, "HP", ALC285_FIXUP_HP_MUTE_LED), SND_PCI_QUIRK(0x103c, 0x877a, "HP", ALC285_FIXUP_HP_MUTE_LED),
SND_PCI_QUIRK(0x103c, 0x877d, "HP", ALC236_FIXUP_HP_MUTE_LED), SND_PCI_QUIRK(0x103c, 0x877d, "HP", ALC236_FIXUP_HP_MUTE_LED),
......
sound/soc/amd/raven/acp3x-pcm-dma.c
View file @ a4d3712b
...@@ -342,25 +342,41 @@ static int acp3x_dma_close(struct snd_soc_component *component, ...@@ -342,25 +342,41 @@ static int acp3x_dma_close(struct snd_soc_component *component,
{ {
struct snd_soc_pcm_runtime *prtd; struct snd_soc_pcm_runtime *prtd;
struct i2s_dev_data *adata; struct i2s_dev_data *adata;
struct i2s_stream_instance *ins;
prtd = substream->private_data; prtd = substream->private_data;
component = snd_soc_rtdcom_lookup(prtd, DRV_NAME); component = snd_soc_rtdcom_lookup(prtd, DRV_NAME);
adata = dev_get_drvdata(component->dev); adata = dev_get_drvdata(component->dev);
ins = substream->runtime->private_data;
if (!ins)
return -EINVAL;
/* Disable ACP irq, when the current stream is being closed and
* another stream is also not active.
*/
if (!adata->play_stream && !adata->capture_stream &&
!adata->i2ssp_play_stream && !adata->i2ssp_capture_stream)
rv_writel(0, adata->acp3x_base + mmACP_EXTERNAL_INTR_ENB);
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
switch (ins->i2s_instance) {
case I2S_BT_INSTANCE:
adata->play_stream = NULL; adata->play_stream = NULL;
break;
case I2S_SP_INSTANCE:
default:
adata->i2ssp_play_stream = NULL; adata->i2ssp_play_stream = NULL;
}
} else { } else {
switch (ins->i2s_instance) {
case I2S_BT_INSTANCE:
adata->capture_stream = NULL; adata->capture_stream = NULL;
break;
case I2S_SP_INSTANCE:
default:
adata->i2ssp_capture_stream = NULL; adata->i2ssp_capture_stream = NULL;
} }
}
/* Disable ACP irq, when the current stream is being closed and
* another stream is also not active.
*/
if (!adata->play_stream && !adata->capture_stream &&
!adata->i2ssp_play_stream && !adata->i2ssp_capture_stream)
rv_writel(0, adata->acp3x_base + mmACP_EXTERNAL_INTR_ENB);
return 0; return 0;
} }
......
sound/soc/codecs/hdac_hda.c
View file @ a4d3712b
...@@ -441,13 +441,13 @@ static int hdac_hda_codec_probe(struct snd_soc_component *component) ...@@ -441,13 +441,13 @@ static int hdac_hda_codec_probe(struct snd_soc_component *component)
ret = snd_hda_codec_set_name(hcodec, hcodec->preset->name); ret = snd_hda_codec_set_name(hcodec, hcodec->preset->name);
if (ret < 0) { if (ret < 0) {
dev_err(&hdev->dev, "name failed %s\n", hcodec->preset->name); dev_err(&hdev->dev, "name failed %s\n", hcodec->preset->name);
goto error; goto error_pm;
} }
ret = snd_hdac_regmap_init(&hcodec->core); ret = snd_hdac_regmap_init(&hcodec->core);
if (ret < 0) { if (ret < 0) {
dev_err(&hdev->dev, "regmap init failed\n"); dev_err(&hdev->dev, "regmap init failed\n");
goto error; goto error_pm;
} }
patch = (hda_codec_patch_t)hcodec->preset->driver_data; patch = (hda_codec_patch_t)hcodec->preset->driver_data;
...@@ -455,7 +455,7 @@ static int hdac_hda_codec_probe(struct snd_soc_component *component) ...@@ -455,7 +455,7 @@ static int hdac_hda_codec_probe(struct snd_soc_component *component)
ret = patch(hcodec); ret = patch(hcodec);
if (ret < 0) { if (ret < 0) {
dev_err(&hdev->dev, "patch failed %d\n", ret); dev_err(&hdev->dev, "patch failed %d\n", ret);
goto error; goto error_regmap;
} }
} else { } else {
dev_dbg(&hdev->dev, "no patch file found\n"); dev_dbg(&hdev->dev, "no patch file found\n");
...@@ -467,7 +467,7 @@ static int hdac_hda_codec_probe(struct snd_soc_component *component) ...@@ -467,7 +467,7 @@ static int hdac_hda_codec_probe(struct snd_soc_component *component)
ret = snd_hda_codec_parse_pcms(hcodec); ret = snd_hda_codec_parse_pcms(hcodec);
if (ret < 0) { if (ret < 0) {
dev_err(&hdev->dev, "unable to map pcms to dai %d\n", ret); dev_err(&hdev->dev, "unable to map pcms to dai %d\n", ret);
goto error; goto error_regmap;
} }
/* HDMI controls need to be created in machine drivers */ /* HDMI controls need to be created in machine drivers */
...@@ -476,7 +476,7 @@ static int hdac_hda_codec_probe(struct snd_soc_component *component) ...@@ -476,7 +476,7 @@ static int hdac_hda_codec_probe(struct snd_soc_component *component)
if (ret < 0) { if (ret < 0) {
dev_err(&hdev->dev, "unable to create controls %d\n", dev_err(&hdev->dev, "unable to create controls %d\n",
ret); ret);
goto error; goto error_regmap;
} }
} }
...@@ -496,7 +496,9 @@ static int hdac_hda_codec_probe(struct snd_soc_component *component) ...@@ -496,7 +496,9 @@ static int hdac_hda_codec_probe(struct snd_soc_component *component)
return 0; return 0;
error: error_regmap:
snd_hdac_regmap_exit(hdev);
error_pm:
pm_runtime_put(&hdev->dev); pm_runtime_put(&hdev->dev);
error_no_pm: error_no_pm:
snd_hdac_ext_bus_link_put(hdev->bus, hlink); snd_hdac_ext_bus_link_put(hdev->bus, hlink);
...@@ -518,6 +520,8 @@ static void hdac_hda_codec_remove(struct snd_soc_component *component) ...@@ -518,6 +520,8 @@ static void hdac_hda_codec_remove(struct snd_soc_component *component)
pm_runtime_disable(&hdev->dev); pm_runtime_disable(&hdev->dev);
snd_hdac_ext_bus_link_put(hdev->bus, hlink); snd_hdac_ext_bus_link_put(hdev->bus, hlink);
snd_hdac_regmap_exit(hdev);
} }
static const struct snd_soc_dapm_route hdac_hda_dapm_routes[] = { static const struct snd_soc_dapm_route hdac_hda_dapm_routes[] = {
......
sound/soc/codecs/max98390.c
View file @ a4d3712b
...@@ -700,8 +700,8 @@ static bool max98390_readable_register(struct device *dev, unsigned int reg) ...@@ -700,8 +700,8 @@ static bool max98390_readable_register(struct device *dev, unsigned int reg)
case MAX98390_IRQ_CTRL ... MAX98390_WDOG_CTRL: case MAX98390_IRQ_CTRL ... MAX98390_WDOG_CTRL:
case MAX98390_MEAS_ADC_THERM_WARN_THRESH case MAX98390_MEAS_ADC_THERM_WARN_THRESH
... MAX98390_BROWNOUT_INFINITE_HOLD: ... MAX98390_BROWNOUT_INFINITE_HOLD:
case MAX98390_BROWNOUT_LVL_HOLD ... THERMAL_COILTEMP_RD_BACK_BYTE0: case MAX98390_BROWNOUT_LVL_HOLD ... DSMIG_DEBUZZER_THRESHOLD:
case DSMIG_DEBUZZER_THRESHOLD ... MAX98390_R24FF_REV_ID: case DSM_VOL_ENA ... MAX98390_R24FF_REV_ID:
return true; return true;
default: default:
return false; return false;
...@@ -717,7 +717,7 @@ static bool max98390_volatile_reg(struct device *dev, unsigned int reg) ...@@ -717,7 +717,7 @@ static bool max98390_volatile_reg(struct device *dev, unsigned int reg)
case MAX98390_BROWNOUT_LOWEST_STATUS: case MAX98390_BROWNOUT_LOWEST_STATUS:
case MAX98390_ENV_TRACK_BOOST_VOUT_READ: case MAX98390_ENV_TRACK_BOOST_VOUT_READ:
case DSM_STBASS_HPF_B0_BYTE0 ... DSM_DEBUZZER_ATTACK_TIME_BYTE2: case DSM_STBASS_HPF_B0_BYTE0 ... DSM_DEBUZZER_ATTACK_TIME_BYTE2:
case THERMAL_RDC_RD_BACK_BYTE1 ... THERMAL_COILTEMP_RD_BACK_BYTE0: case THERMAL_RDC_RD_BACK_BYTE1 ... DSMIG_DEBUZZER_THRESHOLD:
case DSM_THERMAL_GAIN ... DSM_WBDRC_GAIN: case DSM_THERMAL_GAIN ... DSM_WBDRC_GAIN:
return true; return true;
default: default:
......
sound/soc/codecs/rt1015.c
View file @ a4d3712b
...@@ -34,30 +34,32 @@ static const struct reg_default rt1015_reg[] = { ...@@ -34,30 +34,32 @@ static const struct reg_default rt1015_reg[] = {
{ 0x0000, 0x0000 }, { 0x0000, 0x0000 },
{ 0x0004, 0xa000 }, { 0x0004, 0xa000 },
{ 0x0006, 0x0003 }, { 0x0006, 0x0003 },
{ 0x000a, 0x0802 }, { 0x000a, 0x081e },
{ 0x000c, 0x0020 }, { 0x000c, 0x0006 },
{ 0x000e, 0x0000 }, { 0x000e, 0x0000 },
{ 0x0010, 0x0000 }, { 0x0010, 0x0000 },
{ 0x0012, 0x0000 }, { 0x0012, 0x0000 },
{ 0x0014, 0x0000 },
{ 0x0016, 0x0000 },
{ 0x0018, 0x0000 },
{ 0x0020, 0x8000 }, { 0x0020, 0x8000 },
{ 0x0022, 0x471b }, { 0x0022, 0x8043 },
{ 0x006a, 0x0000 },
{ 0x006c, 0x4020 },
{ 0x0076, 0x0000 }, { 0x0076, 0x0000 },
{ 0x0078, 0x0000 }, { 0x0078, 0x0000 },
{ 0x007a, 0x0000 }, { 0x007a, 0x0002 },
{ 0x007c, 0x10ec }, { 0x007c, 0x10ec },
{ 0x007d, 0x1015 }, { 0x007d, 0x1015 },
{ 0x00f0, 0x5000 }, { 0x00f0, 0x5000 },
{ 0x00f2, 0x0774 }, { 0x00f2, 0x004c },
{ 0x00f3, 0x8400 }, { 0x00f3, 0xecfe },
{ 0x00f4, 0x0000 }, { 0x00f4, 0x0000 },
{ 0x00f6, 0x0400 },
{ 0x0100, 0x0028 }, { 0x0100, 0x0028 },
{ 0x0102, 0xff02 }, { 0x0102, 0xff02 },
{ 0x0104, 0x8232 }, { 0x0104, 0xa213 },
{ 0x0106, 0x200c }, { 0x0106, 0x200c },
{ 0x010c, 0x002f }, { 0x010c, 0x0000 },
{ 0x010e, 0xc000 }, { 0x010e, 0x0058 },
{ 0x0111, 0x0200 }, { 0x0111, 0x0200 },
{ 0x0112, 0x0400 }, { 0x0112, 0x0400 },
{ 0x0114, 0x0022 }, { 0x0114, 0x0022 },
...@@ -65,38 +67,46 @@ static const struct reg_default rt1015_reg[] = { ...@@ -65,38 +67,46 @@ static const struct reg_default rt1015_reg[] = {
{ 0x0118, 0x0000 }, { 0x0118, 0x0000 },
{ 0x011a, 0x0123 }, { 0x011a, 0x0123 },
{ 0x011c, 0x4567 }, { 0x011c, 0x4567 },
{ 0x0300, 0xdddd }, { 0x0300, 0x203d },
{ 0x0302, 0x0000 }, { 0x0302, 0x001e },
{ 0x0311, 0x9330 }, { 0x0311, 0x0000 },
{ 0x0313, 0x0000 }, { 0x0313, 0x6014 },
{ 0x0314, 0x0000 }, { 0x0314, 0x00a2 },
{ 0x031a, 0x00a0 }, { 0x031a, 0x00a0 },
{ 0x031c, 0x001f }, { 0x031c, 0x001f },
{ 0x031d, 0xffff }, { 0x031d, 0xffff },
{ 0x031e, 0x0000 }, { 0x031e, 0x0000 },
{ 0x031f, 0x0000 }, { 0x031f, 0x0000 },
{ 0x0320, 0x0000 },
{ 0x0321, 0x0000 }, { 0x0321, 0x0000 },
{ 0x0322, 0x0000 }, { 0x0322, 0xd7df },
{ 0x0328, 0x0000 }, { 0x0328, 0x10b2 },
{ 0x0329, 0x0000 }, { 0x0329, 0x0175 },
{ 0x032a, 0x0000 }, { 0x032a, 0x36ad },
{ 0x032b, 0x0000 }, { 0x032b, 0x7e55 },
{ 0x032c, 0x0000 }, { 0x032c, 0x0520 },
{ 0x032d, 0x0000 }, { 0x032d, 0xaa00 },
{ 0x032e, 0x030e }, { 0x032e, 0x570e },
{ 0x0330, 0x0080 }, { 0x0330, 0xe180 },
{ 0x0332, 0x0034 }, { 0x0332, 0x0034 },
{ 0x0334, 0x0000 }, { 0x0334, 0x0001 },
{ 0x0336, 0x0000 }, { 0x0336, 0x0010 },
{ 0x0338, 0x0000 },
{ 0x04fa, 0x0030 },
{ 0x04fc, 0x35c8 },
{ 0x04fe, 0x0800 },
{ 0x0500, 0x0400 },
{ 0x0502, 0x1000 },
{ 0x0504, 0x0000 },
{ 0x0506, 0x04ff }, { 0x0506, 0x04ff },
{ 0x0508, 0x0030 }, { 0x0508, 0x0010 },
{ 0x050a, 0x0018 }, { 0x050a, 0x001a },
{ 0x0519, 0x307f }, { 0x0519, 0x1c68 },
{ 0x051a, 0xffff }, { 0x051a, 0x0ccc },
{ 0x051b, 0x4000 }, { 0x051b, 0x0666 },
{ 0x051d, 0x0000 }, { 0x051d, 0x0000 },
{ 0x051f, 0x0000 }, { 0x051f, 0x0000 },
{ 0x0536, 0x1000 }, { 0x0536, 0x061c },
{ 0x0538, 0x0000 }, { 0x0538, 0x0000 },
{ 0x053a, 0x0000 }, { 0x053a, 0x0000 },
{ 0x053c, 0x0000 }, { 0x053c, 0x0000 },
...@@ -110,19 +120,18 @@ static const struct reg_default rt1015_reg[] = { ...@@ -110,19 +120,18 @@ static const struct reg_default rt1015_reg[] = {
{ 0x0544, 0x0000 }, { 0x0544, 0x0000 },
{ 0x0568, 0x0000 }, { 0x0568, 0x0000 },
{ 0x056a, 0x0000 }, { 0x056a, 0x0000 },
{ 0x1000, 0x0000 }, { 0x1000, 0x0040 },
{ 0x1002, 0x6505 }, { 0x1002, 0x5405 },
{ 0x1006, 0x5515 }, { 0x1006, 0x5515 },
{ 0x1007, 0x003f }, { 0x1007, 0x05f7 },
{ 0x1009, 0x770f }, { 0x1009, 0x0b0a },
{ 0x100a, 0x01ff }, { 0x100a, 0x00ef },
{ 0x100c, 0x0000 },
{ 0x100d, 0x0003 }, { 0x100d, 0x0003 },
{ 0x1010, 0xa433 }, { 0x1010, 0xa433 },
{ 0x1020, 0x0000 }, { 0x1020, 0x0000 },
{ 0x1200, 0x3d02 }, { 0x1200, 0x5a01 },
{ 0x1202, 0x0813 }, { 0x1202, 0x6524 },
{ 0x1204, 0x0211 }, { 0x1204, 0x1f00 },
{ 0x1206, 0x0000 }, { 0x1206, 0x0000 },
{ 0x1208, 0x0000 }, { 0x1208, 0x0000 },
{ 0x120a, 0x0000 }, { 0x120a, 0x0000 },
...@@ -130,16 +139,16 @@ static const struct reg_default rt1015_reg[] = { ...@@ -130,16 +139,16 @@ static const struct reg_default rt1015_reg[] = {
{ 0x120e, 0x0000 }, { 0x120e, 0x0000 },
{ 0x1210, 0x0000 }, { 0x1210, 0x0000 },
{ 0x1212, 0x0000 }, { 0x1212, 0x0000 },
{ 0x1300, 0x0701 }, { 0x1300, 0x10a1 },
{ 0x1302, 0x12f9 }, { 0x1302, 0x12ff },
{ 0x1304, 0x3405 }, { 0x1304, 0x0400 },
{ 0x1305, 0x0844 }, { 0x1305, 0x0844 },
{ 0x1306, 0x1611 }, { 0x1306, 0x4611 },
{ 0x1308, 0x555e }, { 0x1308, 0x555e },
{ 0x130a, 0x0000 }, { 0x130a, 0x0000 },
{ 0x130c, 0x2400}, { 0x130c, 0x2000 },
{ 0x130e, 0x7700 }, { 0x130e, 0x0100 },
{ 0x130f, 0x0000 }, { 0x130f, 0x0001 },
{ 0x1310, 0x0000 }, { 0x1310, 0x0000 },
{ 0x1312, 0x0000 }, { 0x1312, 0x0000 },
{ 0x1314, 0x0000 }, { 0x1314, 0x0000 },
...@@ -209,6 +218,9 @@ static bool rt1015_volatile_register(struct device *dev, unsigned int reg) ...@@ -209,6 +218,9 @@ static bool rt1015_volatile_register(struct device *dev, unsigned int reg)
case RT1015_DC_CALIB_CLSD7: case RT1015_DC_CALIB_CLSD7:
case RT1015_DC_CALIB_CLSD8: case RT1015_DC_CALIB_CLSD8:
case RT1015_S_BST_TIMING_INTER1: case RT1015_S_BST_TIMING_INTER1:
case RT1015_OSCK_STA:
case RT1015_MONO_DYNA_CTRL1:
case RT1015_MONO_DYNA_CTRL5:
return true; return true;
default: default:
...@@ -224,6 +236,12 @@ static bool rt1015_readable_register(struct device *dev, unsigned int reg) ...@@ -224,6 +236,12 @@ static bool rt1015_readable_register(struct device *dev, unsigned int reg)
case RT1015_CLK3: case RT1015_CLK3:
case RT1015_PLL1: case RT1015_PLL1:
case RT1015_PLL2: case RT1015_PLL2:
case RT1015_DUM_RW1:
case RT1015_DUM_RW2:
case RT1015_DUM_RW3:
case RT1015_DUM_RW4:
case RT1015_DUM_RW5:
case RT1015_DUM_RW6:
case RT1015_CLK_DET: case RT1015_CLK_DET:
case RT1015_SIL_DET: case RT1015_SIL_DET:
case RT1015_CUSTOMER_ID: case RT1015_CUSTOMER_ID:
...@@ -235,6 +253,7 @@ static bool rt1015_readable_register(struct device *dev, unsigned int reg) ...@@ -235,6 +253,7 @@ static bool rt1015_readable_register(struct device *dev, unsigned int reg)
case RT1015_PAD_DRV2: case RT1015_PAD_DRV2:
case RT1015_GAT_BOOST: case RT1015_GAT_BOOST:
case RT1015_PRO_ALT: case RT1015_PRO_ALT:
case RT1015_OSCK_STA:
case RT1015_MAN_I2C: case RT1015_MAN_I2C:
case RT1015_DAC1: case RT1015_DAC1:
case RT1015_DAC2: case RT1015_DAC2:
...@@ -272,6 +291,13 @@ static bool rt1015_readable_register(struct device *dev, unsigned int reg) ...@@ -272,6 +291,13 @@ static bool rt1015_readable_register(struct device *dev, unsigned int reg)
case RT1015_SMART_BST_CTRL2: case RT1015_SMART_BST_CTRL2:
case RT1015_ANA_CTRL1: case RT1015_ANA_CTRL1:
case RT1015_ANA_CTRL2: case RT1015_ANA_CTRL2:
case RT1015_PWR_STATE_CTRL:
case RT1015_MONO_DYNA_CTRL:
case RT1015_MONO_DYNA_CTRL1:
case RT1015_MONO_DYNA_CTRL2:
case RT1015_MONO_DYNA_CTRL3:
case RT1015_MONO_DYNA_CTRL4:
case RT1015_MONO_DYNA_CTRL5:
case RT1015_SPK_VOL: case RT1015_SPK_VOL:
case RT1015_SHORT_DETTOP1: case RT1015_SHORT_DETTOP1:
case RT1015_SHORT_DETTOP2: case RT1015_SHORT_DETTOP2:
......
sound/soc/codecs/rt1015.h
View file @ a4d3712b
...@@ -21,6 +21,12 @@ ...@@ -21,6 +21,12 @@
#define RT1015_CLK3 0x0006 #define RT1015_CLK3 0x0006
#define RT1015_PLL1 0x000a #define RT1015_PLL1 0x000a
#define RT1015_PLL2 0x000c #define RT1015_PLL2 0x000c
#define RT1015_DUM_RW1 0x000e
#define RT1015_DUM_RW2 0x0010
#define RT1015_DUM_RW3 0x0012
#define RT1015_DUM_RW4 0x0014
#define RT1015_DUM_RW5 0x0016
#define RT1015_DUM_RW6 0x0018
#define RT1015_CLK_DET 0x0020 #define RT1015_CLK_DET 0x0020
#define RT1015_SIL_DET 0x0022 #define RT1015_SIL_DET 0x0022
#define RT1015_CUSTOMER_ID 0x0076 #define RT1015_CUSTOMER_ID 0x0076
...@@ -32,6 +38,7 @@ ...@@ -32,6 +38,7 @@
#define RT1015_PAD_DRV2 0x00f2 #define RT1015_PAD_DRV2 0x00f2
#define RT1015_GAT_BOOST 0x00f3 #define RT1015_GAT_BOOST 0x00f3
#define RT1015_PRO_ALT 0x00f4 #define RT1015_PRO_ALT 0x00f4
#define RT1015_OSCK_STA 0x00f6
#define RT1015_MAN_I2C 0x0100 #define RT1015_MAN_I2C 0x0100
#define RT1015_DAC1 0x0102 #define RT1015_DAC1 0x0102
#define RT1015_DAC2 0x0104 #define RT1015_DAC2 0x0104
...@@ -70,6 +77,12 @@ ...@@ -70,6 +77,12 @@
#define RT1015_ANA_CTRL1 0x0334 #define RT1015_ANA_CTRL1 0x0334
#define RT1015_ANA_CTRL2 0x0336 #define RT1015_ANA_CTRL2 0x0336
#define RT1015_PWR_STATE_CTRL 0x0338 #define RT1015_PWR_STATE_CTRL 0x0338
#define RT1015_MONO_DYNA_CTRL 0x04fa
#define RT1015_MONO_DYNA_CTRL1 0x04fc
#define RT1015_MONO_DYNA_CTRL2 0x04fe
#define RT1015_MONO_DYNA_CTRL3 0x0500
#define RT1015_MONO_DYNA_CTRL4 0x0502
#define RT1015_MONO_DYNA_CTRL5 0x0504
#define RT1015_SPK_VOL 0x0506 #define RT1015_SPK_VOL 0x0506
#define RT1015_SHORT_DETTOP1 0x0508 #define RT1015_SHORT_DETTOP1 0x0508
#define RT1015_SHORT_DETTOP2 0x050a #define RT1015_SHORT_DETTOP2 0x050a
......
sound/soc/codecs/rt5682.c
View file @ a4d3712b
...@@ -2829,12 +2829,13 @@ static int rt5682_probe(struct snd_soc_component *component) ...@@ -2829,12 +2829,13 @@ static int rt5682_probe(struct snd_soc_component *component)
return ret; return ret;
} }
rt5682->mclk = NULL; rt5682->mclk = NULL;
} else { }
/* Register CCF DAI clock control */ /* Register CCF DAI clock control */
ret = rt5682_register_dai_clks(component); ret = rt5682_register_dai_clks(component);
if (ret) if (ret)
return ret; return ret;
}
/* Initial setup for CCF */ /* Initial setup for CCF */
rt5682->lrck[RT5682_AIF1] = CLK_48; rt5682->lrck[RT5682_AIF1] = CLK_48;
#endif #endif
......
sound/soc/fsl/fsl_asrc_common.h
View file @ a4d3712b
...@@ -32,6 +32,7 @@ enum asrc_pair_index { ...@@ -32,6 +32,7 @@ enum asrc_pair_index {
* @dma_chan: inputer and output DMA channels * @dma_chan: inputer and output DMA channels
* @dma_data: private dma data * @dma_data: private dma data
* @pos: hardware pointer position * @pos: hardware pointer position
* @req_dma_chan: flag to release dev_to_dev chan
* @private: pair private area * @private: pair private area
*/ */
struct fsl_asrc_pair { struct fsl_asrc_pair {
...@@ -45,6 +46,7 @@ struct fsl_asrc_pair { ...@@ -45,6 +46,7 @@ struct fsl_asrc_pair {
struct dma_chan *dma_chan[2]; struct dma_chan *dma_chan[2];
struct imx_dma_data dma_data; struct imx_dma_data dma_data;
unsigned int pos; unsigned int pos;
bool req_dma_chan;
void *private; void *private;
}; };
......
sound/soc/fsl/fsl_asrc_dma.c
View file @ a4d3712b
...@@ -135,6 +135,8 @@ static int fsl_asrc_dma_hw_params(struct snd_soc_component *component, ...@@ -135,6 +135,8 @@ static int fsl_asrc_dma_hw_params(struct snd_soc_component *component,
struct snd_dmaengine_dai_dma_data *dma_params_be = NULL; struct snd_dmaengine_dai_dma_data *dma_params_be = NULL;
struct snd_pcm_runtime *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
struct fsl_asrc_pair *pair = runtime->private_data; struct fsl_asrc_pair *pair = runtime->private_data;
struct dma_chan *tmp_chan = NULL, *be_chan = NULL;
struct snd_soc_component *component_be = NULL;
struct fsl_asrc *asrc = pair->asrc; struct fsl_asrc *asrc = pair->asrc;
struct dma_slave_config config_fe, config_be; struct dma_slave_config config_fe, config_be;
enum asrc_pair_index index = pair->index; enum asrc_pair_index index = pair->index;
...@@ -142,7 +144,6 @@ static int fsl_asrc_dma_hw_params(struct snd_soc_component *component, ...@@ -142,7 +144,6 @@ static int fsl_asrc_dma_hw_params(struct snd_soc_component *component,
int stream = substream->stream; int stream = substream->stream;
struct imx_dma_data *tmp_data; struct imx_dma_data *tmp_data;
struct snd_soc_dpcm *dpcm; struct snd_soc_dpcm *dpcm;
struct dma_chan *tmp_chan;
struct device *dev_be; struct device *dev_be;
u8 dir = tx ? OUT : IN; u8 dir = tx ? OUT : IN;
dma_cap_mask_t mask; dma_cap_mask_t mask;
...@@ -197,17 +198,29 @@ static int fsl_asrc_dma_hw_params(struct snd_soc_component *component, ...@@ -197,17 +198,29 @@ static int fsl_asrc_dma_hw_params(struct snd_soc_component *component,
dma_cap_set(DMA_SLAVE, mask); dma_cap_set(DMA_SLAVE, mask);
dma_cap_set(DMA_CYCLIC, mask); dma_cap_set(DMA_CYCLIC, mask);
/*
* The Back-End device might have already requested a DMA channel,
* so try to reuse it first, and then request a new one upon NULL.
*/
component_be = snd_soc_lookup_component_nolocked(dev_be, SND_DMAENGINE_PCM_DRV_NAME);
if (component_be) {
be_chan = soc_component_to_pcm(component_be)->chan[substream->stream];
tmp_chan = be_chan;
}
if (!tmp_chan)
tmp_chan = dma_request_slave_channel(dev_be, tx ? "tx" : "rx");
/* /*
* An EDMA DEV_TO_DEV channel is fixed and bound with DMA event of each * An EDMA DEV_TO_DEV channel is fixed and bound with DMA event of each
* peripheral, unlike SDMA channel that is allocated dynamically. So no * peripheral, unlike SDMA channel that is allocated dynamically. So no
* need to configure dma_request and dma_request2, but get dma_chan via * need to configure dma_request and dma_request2, but get dma_chan of
* dma_request_slave_channel directly with dma name of Front-End device * Back-End device directly via dma_request_slave_channel.
*/ */
if (!asrc->use_edma) { if (!asrc->use_edma) {
/* Get DMA request of Back-End */ /* Get DMA request of Back-End */
tmp_chan = dma_request_slave_channel(dev_be, tx ? "tx" : "rx");
tmp_data = tmp_chan->private; tmp_data = tmp_chan->private;
pair->dma_data.dma_request = tmp_data->dma_request; pair->dma_data.dma_request = tmp_data->dma_request;
if (!be_chan)
dma_release_channel(tmp_chan); dma_release_channel(tmp_chan);
/* Get DMA request of Front-End */ /* Get DMA request of Front-End */
...@@ -220,9 +233,11 @@ static int fsl_asrc_dma_hw_params(struct snd_soc_component *component, ...@@ -220,9 +233,11 @@ static int fsl_asrc_dma_hw_params(struct snd_soc_component *component,
pair->dma_chan[dir] = pair->dma_chan[dir] =
dma_request_channel(mask, filter, &pair->dma_data); dma_request_channel(mask, filter, &pair->dma_data);
pair->req_dma_chan = true;
} else { } else {
pair->dma_chan[dir] = pair->dma_chan[dir] = tmp_chan;
asrc->get_dma_channel(pair, dir); /* Do not flag to release if we are reusing the Back-End one */
pair->req_dma_chan = !be_chan;
} }
if (!pair->dma_chan[dir]) { if (!pair->dma_chan[dir]) {
...@@ -261,6 +276,7 @@ static int fsl_asrc_dma_hw_params(struct snd_soc_component *component, ...@@ -261,6 +276,7 @@ static int fsl_asrc_dma_hw_params(struct snd_soc_component *component,
ret = dmaengine_slave_config(pair->dma_chan[dir], &config_be); ret = dmaengine_slave_config(pair->dma_chan[dir], &config_be);
if (ret) { if (ret) {
dev_err(dev, "failed to config DMA channel for Back-End\n"); dev_err(dev, "failed to config DMA channel for Back-End\n");
if (pair->req_dma_chan)
dma_release_channel(pair->dma_chan[dir]); dma_release_channel(pair->dma_chan[dir]);
return ret; return ret;
} }
...@@ -273,19 +289,22 @@ static int fsl_asrc_dma_hw_params(struct snd_soc_component *component, ...@@ -273,19 +289,22 @@ static int fsl_asrc_dma_hw_params(struct snd_soc_component *component,
static int fsl_asrc_dma_hw_free(struct snd_soc_component *component, static int fsl_asrc_dma_hw_free(struct snd_soc_component *component,
struct snd_pcm_substream *substream) struct snd_pcm_substream *substream)
{ {
bool tx = substream->stream == SNDRV_PCM_STREAM_PLAYBACK;
struct snd_pcm_runtime *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
struct fsl_asrc_pair *pair = runtime->private_data; struct fsl_asrc_pair *pair = runtime->private_data;
u8 dir = tx ? OUT : IN;
snd_pcm_set_runtime_buffer(substream, NULL); snd_pcm_set_runtime_buffer(substream, NULL);
if (pair->dma_chan[IN]) if (pair->dma_chan[!dir])
dma_release_channel(pair->dma_chan[IN]); dma_release_channel(pair->dma_chan[!dir]);
if (pair->dma_chan[OUT]) /* release dev_to_dev chan if we aren't reusing the Back-End one */
dma_release_channel(pair->dma_chan[OUT]); if (pair->dma_chan[dir] && pair->req_dma_chan)
dma_release_channel(pair->dma_chan[dir]);
pair->dma_chan[IN] = NULL; pair->dma_chan[!dir] = NULL;
pair->dma_chan[OUT] = NULL; pair->dma_chan[dir] = NULL;
return 0; return 0;
} }
......
sound/soc/fsl/fsl_ssi.c
View file @ a4d3712b
...@@ -678,8 +678,9 @@ static int fsl_ssi_set_bclk(struct snd_pcm_substream *substream, ...@@ -678,8 +678,9 @@ static int fsl_ssi_set_bclk(struct snd_pcm_substream *substream,
struct regmap *regs = ssi->regs; struct regmap *regs = ssi->regs;
u32 pm = 999, div2, psr, stccr, mask, afreq, factor, i; u32 pm = 999, div2, psr, stccr, mask, afreq, factor, i;
unsigned long clkrate, baudrate, tmprate; unsigned long clkrate, baudrate, tmprate;
unsigned int slots = params_channels(hw_params); unsigned int channels = params_channels(hw_params);
unsigned int slot_width = 32; unsigned int slot_width = params_width(hw_params);
unsigned int slots = 2;
u64 sub, savesub = 100000; u64 sub, savesub = 100000;
unsigned int freq; unsigned int freq;
bool baudclk_is_used; bool baudclk_is_used;
...@@ -688,10 +689,14 @@ static int fsl_ssi_set_bclk(struct snd_pcm_substream *substream, ...@@ -688,10 +689,14 @@ static int fsl_ssi_set_bclk(struct snd_pcm_substream *substream,
/* Override slots and slot_width if being specifically set... */ /* Override slots and slot_width if being specifically set... */
if (ssi->slots) if (ssi->slots)
slots = ssi->slots; slots = ssi->slots;
/* ...but keep 32 bits if slots is 2 -- I2S Master mode */ if (ssi->slot_width)
if (ssi->slot_width && slots != 2)
slot_width = ssi->slot_width; slot_width = ssi->slot_width;
/* ...but force 32 bits for stereo audio using I2S Master Mode */
if (channels == 2 &&
(ssi->i2s_net & SSI_SCR_I2S_MODE_MASK) == SSI_SCR_I2S_MODE_MASTER)
slot_width = 32;
/* Generate bit clock based on the slot number and slot width */ /* Generate bit clock based on the slot number and slot width */
freq = slots * slot_width * params_rate(hw_params); freq = slots * slot_width * params_rate(hw_params);
......
sound/soc/intel/boards/Kconfig
View file @ a4d3712b
...@@ -492,7 +492,7 @@ config SND_SOC_INTEL_SOF_PCM512x_MACH ...@@ -492,7 +492,7 @@ config SND_SOC_INTEL_SOF_PCM512x_MACH
endif ## SND_SOC_SOF_HDA_LINK || SND_SOC_SOF_BAYTRAIL endif ## SND_SOC_SOF_HDA_LINK || SND_SOC_SOF_BAYTRAIL
if (SND_SOC_SOF_COMETLAKE_LP && SND_SOC_SOF_HDA_LINK) if (SND_SOC_SOF_COMETLAKE && SND_SOC_SOF_HDA_LINK)
config SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH config SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH
tristate "CML_LP with DA7219 and MAX98357A in I2S Mode" tristate "CML_LP with DA7219 and MAX98357A in I2S Mode"
...@@ -520,7 +520,7 @@ config SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH ...@@ -520,7 +520,7 @@ config SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH
Say Y if you have such a device. Say Y if you have such a device.
If unsure select "N". If unsure select "N".
endif ## SND_SOC_SOF_COMETLAKE_LP && SND_SOC_SOF_HDA_LINK endif ## SND_SOC_SOF_COMETLAKE && SND_SOC_SOF_HDA_LINK
if SND_SOC_SOF_JASPERLAKE if SND_SOC_SOF_JASPERLAKE
......
sound/soc/qcom/common.c
View file @ a4d3712b
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#include <linux/module.h> #include <linux/module.h>
#include "common.h" #include "common.h"
#include "qdsp6/q6afe.h"
int qcom_snd_parse_of(struct snd_soc_card *card) int qcom_snd_parse_of(struct snd_soc_card *card)
{ {
...@@ -101,6 +102,15 @@ int qcom_snd_parse_of(struct snd_soc_card *card) ...@@ -101,6 +102,15 @@ int qcom_snd_parse_of(struct snd_soc_card *card)
} }
link->no_pcm = 1; link->no_pcm = 1;
link->ignore_pmdown_time = 1; link->ignore_pmdown_time = 1;
if (q6afe_is_rx_port(link->id)) {
link->dpcm_playback = 1;
link->dpcm_capture = 0;
} else {
link->dpcm_playback = 0;
link->dpcm_capture = 1;
}
} else { } else {
dlc = devm_kzalloc(dev, sizeof(*dlc), GFP_KERNEL); dlc = devm_kzalloc(dev, sizeof(*dlc), GFP_KERNEL);
if (!dlc) if (!dlc)
...@@ -113,12 +123,12 @@ int qcom_snd_parse_of(struct snd_soc_card *card) ...@@ -113,12 +123,12 @@ int qcom_snd_parse_of(struct snd_soc_card *card)
link->codecs->dai_name = "snd-soc-dummy-dai"; link->codecs->dai_name = "snd-soc-dummy-dai";
link->codecs->name = "snd-soc-dummy"; link->codecs->name = "snd-soc-dummy";
link->dynamic = 1; link->dynamic = 1;
link->dpcm_playback = 1;
link->dpcm_capture = 1;
} }
link->ignore_suspend = 1; link->ignore_suspend = 1;
link->nonatomic = 1; link->nonatomic = 1;
link->dpcm_playback = 1;
link->dpcm_capture = 1;
link->stream_name = link->name; link->stream_name = link->name;
link++; link++;
......
sound/soc/qcom/qdsp6/q6afe.c
View file @ a4d3712b
...@@ -800,6 +800,14 @@ int q6afe_get_port_id(int index) ...@@ -800,6 +800,14 @@ int q6afe_get_port_id(int index)
} }
EXPORT_SYMBOL_GPL(q6afe_get_port_id); EXPORT_SYMBOL_GPL(q6afe_get_port_id);
int q6afe_is_rx_port(int index)
{
if (index < 0 || index >= AFE_PORT_MAX)
return -EINVAL;
return port_maps[index].is_rx;
}
EXPORT_SYMBOL_GPL(q6afe_is_rx_port);
static int afe_apr_send_pkt(struct q6afe *afe, struct apr_pkt *pkt, static int afe_apr_send_pkt(struct q6afe *afe, struct apr_pkt *pkt,
struct q6afe_port *port) struct q6afe_port *port)
{ {
......
sound/soc/qcom/qdsp6/q6afe.h
View file @ a4d3712b
...@@ -198,6 +198,7 @@ int q6afe_port_start(struct q6afe_port *port); ...@@ -198,6 +198,7 @@ int q6afe_port_start(struct q6afe_port *port);
int q6afe_port_stop(struct q6afe_port *port); int q6afe_port_stop(struct q6afe_port *port);
void q6afe_port_put(struct q6afe_port *port); void q6afe_port_put(struct q6afe_port *port);
int q6afe_get_port_id(int index); int q6afe_get_port_id(int index);
int q6afe_is_rx_port(int index);
void q6afe_hdmi_port_prepare(struct q6afe_port *port, void q6afe_hdmi_port_prepare(struct q6afe_port *port,
struct q6afe_hdmi_cfg *cfg); struct q6afe_hdmi_cfg *cfg);
void q6afe_slim_port_prepare(struct q6afe_port *port, void q6afe_slim_port_prepare(struct q6afe_port *port,
......
sound/soc/qcom/qdsp6/q6asm.c
View file @ a4d3712b
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#define ASM_STREAM_CMD_FLUSH 0x00010BCE #define ASM_STREAM_CMD_FLUSH 0x00010BCE
#define ASM_SESSION_CMD_PAUSE 0x00010BD3 #define ASM_SESSION_CMD_PAUSE 0x00010BD3
#define ASM_DATA_CMD_EOS 0x00010BDB #define ASM_DATA_CMD_EOS 0x00010BDB
#define ASM_DATA_EVENT_RENDERED_EOS 0x00010C1C
#define ASM_NULL_POPP_TOPOLOGY 0x00010C68 #define ASM_NULL_POPP_TOPOLOGY 0x00010C68
#define ASM_STREAM_CMD_FLUSH_READBUFS 0x00010C09 #define ASM_STREAM_CMD_FLUSH_READBUFS 0x00010C09
#define ASM_STREAM_CMD_SET_ENCDEC_PARAM 0x00010C10 #define ASM_STREAM_CMD_SET_ENCDEC_PARAM 0x00010C10
...@@ -622,9 +623,6 @@ static int32_t q6asm_stream_callback(struct apr_device *adev, ...@@ -622,9 +623,6 @@ static int32_t q6asm_stream_callback(struct apr_device *adev,
case ASM_SESSION_CMD_SUSPEND: case ASM_SESSION_CMD_SUSPEND:
client_event = ASM_CLIENT_EVENT_CMD_SUSPEND_DONE; client_event = ASM_CLIENT_EVENT_CMD_SUSPEND_DONE;
break; break;
case ASM_DATA_CMD_EOS:
client_event = ASM_CLIENT_EVENT_CMD_EOS_DONE;
break;
case ASM_STREAM_CMD_FLUSH: case ASM_STREAM_CMD_FLUSH:
client_event = ASM_CLIENT_EVENT_CMD_FLUSH_DONE; client_event = ASM_CLIENT_EVENT_CMD_FLUSH_DONE;
break; break;
...@@ -727,6 +725,9 @@ static int32_t q6asm_stream_callback(struct apr_device *adev, ...@@ -727,6 +725,9 @@ static int32_t q6asm_stream_callback(struct apr_device *adev,
spin_unlock_irqrestore(&ac->lock, flags); spin_unlock_irqrestore(&ac->lock, flags);
} }
break;
case ASM_DATA_EVENT_RENDERED_EOS:
client_event = ASM_CLIENT_EVENT_CMD_EOS_DONE;
break; break;
} }
......
sound/soc/rockchip/rockchip_pdm.c
View file @ a4d3712b
...@@ -590,8 +590,10 @@ static int rockchip_pdm_resume(struct device *dev) ...@@ -590,8 +590,10 @@ static int rockchip_pdm_resume(struct device *dev)
int ret; int ret;
ret = pm_runtime_get_sync(dev); ret = pm_runtime_get_sync(dev);
if (ret < 0) if (ret < 0) {
pm_runtime_put(dev);
return ret; return ret;
}
ret = regcache_sync(pdm->regmap); ret = regcache_sync(pdm->regmap);
......
sound/soc/soc-core.c
View file @ a4d3712b
...@@ -310,7 +310,7 @@ struct snd_soc_component *snd_soc_rtdcom_lookup(struct snd_soc_pcm_runtime *rtd, ...@@ -310,7 +310,7 @@ struct snd_soc_component *snd_soc_rtdcom_lookup(struct snd_soc_pcm_runtime *rtd,
} }
EXPORT_SYMBOL_GPL(snd_soc_rtdcom_lookup); EXPORT_SYMBOL_GPL(snd_soc_rtdcom_lookup);
static struct snd_soc_component struct snd_soc_component
*snd_soc_lookup_component_nolocked(struct device *dev, const char *driver_name) *snd_soc_lookup_component_nolocked(struct device *dev, const char *driver_name)
{ {
struct snd_soc_component *component; struct snd_soc_component *component;
...@@ -329,6 +329,7 @@ static struct snd_soc_component ...@@ -329,6 +329,7 @@ static struct snd_soc_component
return found_component; return found_component;
} }
EXPORT_SYMBOL_GPL(snd_soc_lookup_component_nolocked);
struct snd_soc_component *snd_soc_lookup_component(struct device *dev, struct snd_soc_component *snd_soc_lookup_component(struct device *dev,
const char *driver_name) const char *driver_name)
......
sound/soc/soc-devres.c
View file @ a4d3712b
...@@ -9,6 +9,43 @@ ...@@ -9,6 +9,43 @@
#include <sound/soc.h> #include <sound/soc.h>
#include <sound/dmaengine_pcm.h> #include <sound/dmaengine_pcm.h>
static void devm_dai_release(struct device *dev, void *res)
{
snd_soc_unregister_dai(*(struct snd_soc_dai **)res);
}
/**
* devm_snd_soc_register_dai - resource-managed dai registration
* @dev: Device used to manage component
* @component: The component the DAIs are registered for
* @dai_drv: DAI driver to use for the DAI
* @legacy_dai_naming: if %true, use legacy single-name format;
* if %false, use multiple-name format;
*/
struct snd_soc_dai *devm_snd_soc_register_dai(struct device *dev,
struct snd_soc_component *component,
struct snd_soc_dai_driver *dai_drv,
bool legacy_dai_naming)
{
struct snd_soc_dai **ptr;
struct snd_soc_dai *dai;
ptr = devres_alloc(devm_dai_release, sizeof(*ptr), GFP_KERNEL);
if (!ptr)
return NULL;
dai = snd_soc_register_dai(component, dai_drv, legacy_dai_naming);
if (dai) {
*ptr = dai;
devres_add(dev, ptr);
} else {
devres_free(ptr);
}
return dai;
}
EXPORT_SYMBOL_GPL(devm_snd_soc_register_dai);
static void devm_component_release(struct device *dev, void *res) static void devm_component_release(struct device *dev, void *res)
{ {
snd_soc_unregister_component(*(struct device **)res); snd_soc_unregister_component(*(struct device **)res);
......
sound/soc/soc-generic-dmaengine-pcm.c
View file @ a4d3712b
...@@ -21,18 +21,6 @@ ...@@ -21,18 +21,6 @@
*/ */
#define SND_DMAENGINE_PCM_FLAG_NO_RESIDUE BIT(31) #define SND_DMAENGINE_PCM_FLAG_NO_RESIDUE BIT(31)
struct dmaengine_pcm {
struct dma_chan *chan[SNDRV_PCM_STREAM_LAST + 1];
const struct snd_dmaengine_pcm_config *config;
struct snd_soc_component component;
unsigned int flags;
};
static struct dmaengine_pcm *soc_component_to_pcm(struct snd_soc_component *p)
{
return container_of(p, struct dmaengine_pcm, component);
}
static struct device *dmaengine_dma_dev(struct dmaengine_pcm *pcm, static struct device *dmaengine_dma_dev(struct dmaengine_pcm *pcm,
struct snd_pcm_substream *substream) struct snd_pcm_substream *substream)
{ {
......
sound/soc/soc-pcm.c
View file @ a4d3712b
...@@ -2630,15 +2630,15 @@ static int soc_dpcm_fe_runtime_update(struct snd_soc_pcm_runtime *fe, int new) ...@@ -2630,15 +2630,15 @@ static int soc_dpcm_fe_runtime_update(struct snd_soc_pcm_runtime *fe, int new)
int count, paths; int count, paths;
int ret; int ret;
if (!fe->dai_link->dynamic)
return 0;
if (fe->num_cpus > 1) { if (fe->num_cpus > 1) {
dev_err(fe->dev, dev_err(fe->dev,
"%s doesn't support Multi CPU yet\n", __func__); "%s doesn't support Multi CPU yet\n", __func__);
return -EINVAL; return -EINVAL;
} }
if (!fe->dai_link->dynamic)
return 0;
/* only check active links */ /* only check active links */
if (!snd_soc_dai_active(asoc_rtd_to_cpu(fe, 0))) if (!snd_soc_dai_active(asoc_rtd_to_cpu(fe, 0)))
return 0; return 0;
......
sound/soc/soc-topology.c
View file @ a4d3712b
...@@ -1851,7 +1851,7 @@ static int soc_tplg_dai_create(struct soc_tplg *tplg, ...@@ -1851,7 +1851,7 @@ static int soc_tplg_dai_create(struct soc_tplg *tplg,
list_add(&dai_drv->dobj.list, &tplg->comp->dobj_list); list_add(&dai_drv->dobj.list, &tplg->comp->dobj_list);
/* register the DAI to the component */ /* register the DAI to the component */
dai = snd_soc_register_dai(tplg->comp, dai_drv, false); dai = devm_snd_soc_register_dai(tplg->comp->dev, tplg->comp, dai_drv, false);
if (!dai) if (!dai)
return -ENOMEM; return -ENOMEM;
...@@ -1859,7 +1859,6 @@ static int soc_tplg_dai_create(struct soc_tplg *tplg, ...@@ -1859,7 +1859,6 @@ static int soc_tplg_dai_create(struct soc_tplg *tplg,
ret = snd_soc_dapm_new_dai_widgets(dapm, dai); ret = snd_soc_dapm_new_dai_widgets(dapm, dai);
if (ret != 0) { if (ret != 0) {
dev_err(dai->dev, "Failed to create DAI widgets %d\n", ret); dev_err(dai->dev, "Failed to create DAI widgets %d\n", ret);
snd_soc_unregister_dai(dai);
return ret; return ret;
} }
......
sound/soc/sof/intel/Kconfig
View file @ a4d3712b
...@@ -25,8 +25,7 @@ config SND_SOC_SOF_INTEL_PCI ...@@ -25,8 +25,7 @@ config SND_SOC_SOF_INTEL_PCI
select SND_SOC_SOF_CANNONLAKE if SND_SOC_SOF_CANNONLAKE_SUPPORT select SND_SOC_SOF_CANNONLAKE if SND_SOC_SOF_CANNONLAKE_SUPPORT
select SND_SOC_SOF_COFFEELAKE if SND_SOC_SOF_COFFEELAKE_SUPPORT select SND_SOC_SOF_COFFEELAKE if SND_SOC_SOF_COFFEELAKE_SUPPORT
select SND_SOC_SOF_ICELAKE if SND_SOC_SOF_ICELAKE_SUPPORT select SND_SOC_SOF_ICELAKE if SND_SOC_SOF_ICELAKE_SUPPORT
select SND_SOC_SOF_COMETLAKE_LP if SND_SOC_SOF_COMETLAKE_LP_SUPPORT select SND_SOC_SOF_COMETLAKE if SND_SOC_SOF_COMETLAKE_SUPPORT
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_TIGERLAKE if SND_SOC_SOF_TIGERLAKE_SUPPORT
select SND_SOC_SOF_ELKHARTLAKE if SND_SOC_SOF_ELKHARTLAKE_SUPPORT select SND_SOC_SOF_ELKHARTLAKE if SND_SOC_SOF_ELKHARTLAKE_SUPPORT
select SND_SOC_SOF_JASPERLAKE if SND_SOC_SOF_JASPERLAKE_SUPPORT select SND_SOC_SOF_JASPERLAKE if SND_SOC_SOF_JASPERLAKE_SUPPORT
...@@ -201,34 +200,22 @@ config SND_SOC_SOF_ICELAKE ...@@ -201,34 +200,22 @@ config SND_SOC_SOF_ICELAKE
This option is not user-selectable but automagically handled by This option is not user-selectable but automagically handled by
'select' statements at a higher level 'select' statements at a higher level
config SND_SOC_SOF_COMETLAKE_LP config SND_SOC_SOF_COMETLAKE
tristate tristate
select SND_SOC_SOF_HDA_COMMON select SND_SOC_SOF_HDA_COMMON
help help
This option is not user-selectable but automagically handled by This option is not user-selectable but automagically handled by
'select' statements at a higher level 'select' statements at a higher level
config SND_SOC_SOF_COMETLAKE_LP_SUPPORT config SND_SOC_SOF_COMETLAKE_SUPPORT
bool "SOF support for CometLake-LP" bool
help
This adds support for Sound Open Firmware for Intel(R) platforms
using the Cometlake-LP processors.
Say Y if you have such a device.
If unsure select "N".
config SND_SOC_SOF_COMETLAKE_H config SND_SOC_SOF_COMETLAKE_LP_SUPPORT
tristate bool "SOF support for CometLake"
select SND_SOC_SOF_HDA_COMMON select SND_SOC_SOF_COMETLAKE_SUPPORT
help
This option is not user-selectable but automagically handled by
'select' statements at a higher level
config SND_SOC_SOF_COMETLAKE_H_SUPPORT
bool "SOF support for CometLake-H"
help help
This adds support for Sound Open Firmware for Intel(R) platforms This adds support for Sound Open Firmware for Intel(R) platforms
using the Cometlake-H processors. using the Cometlake processors.
Say Y if you have such a device.
If unsure select "N". If unsure select "N".
config SND_SOC_SOF_TIGERLAKE_SUPPORT config SND_SOC_SOF_TIGERLAKE_SUPPORT
......
sound/soc/sof/intel/hda-stream.c
View file @ a4d3712b
...@@ -653,11 +653,16 @@ irqreturn_t hda_dsp_stream_threaded_handler(int irq, void *context) ...@@ -653,11 +653,16 @@ irqreturn_t hda_dsp_stream_threaded_handler(int irq, void *context)
if (status & AZX_INT_CTRL_EN) { if (status & AZX_INT_CTRL_EN) {
rirb_status = snd_hdac_chip_readb(bus, RIRBSTS); rirb_status = snd_hdac_chip_readb(bus, RIRBSTS);
if (rirb_status & RIRB_INT_MASK) { if (rirb_status & RIRB_INT_MASK) {
/*
* Clearing the interrupt status here ensures
* that no interrupt gets masked after the RIRB
* wp is read in snd_hdac_bus_update_rirb.
*/
snd_hdac_chip_writeb(bus, RIRBSTS,
RIRB_INT_MASK);
active = true; active = true;
if (rirb_status & RIRB_INT_RESPONSE) if (rirb_status & RIRB_INT_RESPONSE)
snd_hdac_bus_update_rirb(bus); snd_hdac_bus_update_rirb(bus);
snd_hdac_chip_writeb(bus, RIRBSTS,
RIRB_INT_MASK);
} }
} }
#endif #endif
......
sound/soc/sof/sof-pci-dev.c
View file @ a4d3712b
...@@ -151,9 +151,7 @@ static const struct sof_dev_desc cfl_desc = { ...@@ -151,9 +151,7 @@ static const struct sof_dev_desc cfl_desc = {
}; };
#endif #endif
#if IS_ENABLED(CONFIG_SND_SOC_SOF_COMETLAKE_LP) || \ #if IS_ENABLED(CONFIG_SND_SOC_SOF_COMETLAKE)
IS_ENABLED(CONFIG_SND_SOC_SOF_COMETLAKE_H)
static const struct sof_dev_desc cml_desc = { static const struct sof_dev_desc cml_desc = {
.machines = snd_soc_acpi_intel_cml_machines, .machines = snd_soc_acpi_intel_cml_machines,
.alt_machines = snd_soc_acpi_intel_cml_sdw_machines, .alt_machines = snd_soc_acpi_intel_cml_sdw_machines,
...@@ -411,8 +409,11 @@ static const struct pci_device_id sof_pci_ids[] = { ...@@ -411,8 +409,11 @@ static const struct pci_device_id sof_pci_ids[] = {
.driver_data = (unsigned long)&cfl_desc}, .driver_data = (unsigned long)&cfl_desc},
#endif #endif
#if IS_ENABLED(CONFIG_SND_SOC_SOF_ICELAKE) #if IS_ENABLED(CONFIG_SND_SOC_SOF_ICELAKE)
{ PCI_DEVICE(0x8086, 0x34C8), { PCI_DEVICE(0x8086, 0x34C8), /* ICL-LP */
.driver_data = (unsigned long)&icl_desc},
{ PCI_DEVICE(0x8086, 0x3dc8), /* ICL-H */
.driver_data = (unsigned long)&icl_desc}, .driver_data = (unsigned long)&icl_desc},
#endif #endif
#if IS_ENABLED(CONFIG_SND_SOC_SOF_JASPERLAKE) #if IS_ENABLED(CONFIG_SND_SOC_SOF_JASPERLAKE)
{ PCI_DEVICE(0x8086, 0x38c8), { PCI_DEVICE(0x8086, 0x38c8),
...@@ -420,17 +421,20 @@ static const struct pci_device_id sof_pci_ids[] = { ...@@ -420,17 +421,20 @@ static const struct pci_device_id sof_pci_ids[] = {
{ PCI_DEVICE(0x8086, 0x4dc8), { PCI_DEVICE(0x8086, 0x4dc8),
.driver_data = (unsigned long)&jsl_desc}, .driver_data = (unsigned long)&jsl_desc},
#endif #endif
#if IS_ENABLED(CONFIG_SND_SOC_SOF_COMETLAKE_LP) #if IS_ENABLED(CONFIG_SND_SOC_SOF_COMETLAKE)
{ PCI_DEVICE(0x8086, 0x02c8), { PCI_DEVICE(0x8086, 0x02c8), /* CML-LP */
.driver_data = (unsigned long)&cml_desc}, .driver_data = (unsigned long)&cml_desc},
#endif { PCI_DEVICE(0x8086, 0x06c8), /* CML-H */
#if IS_ENABLED(CONFIG_SND_SOC_SOF_COMETLAKE_H) .driver_data = (unsigned long)&cml_desc},
{ PCI_DEVICE(0x8086, 0x06c8), { PCI_DEVICE(0x8086, 0xa3f0), /* CML-S */
.driver_data = (unsigned long)&cml_desc}, .driver_data = (unsigned long)&cml_desc},
#endif #endif
#if IS_ENABLED(CONFIG_SND_SOC_SOF_TIGERLAKE) #if IS_ENABLED(CONFIG_SND_SOC_SOF_TIGERLAKE)
{ PCI_DEVICE(0x8086, 0xa0c8), { PCI_DEVICE(0x8086, 0xa0c8), /* TGL-LP */
.driver_data = (unsigned long)&tgl_desc},
{ PCI_DEVICE(0x8086, 0x43c8), /* TGL-H */
.driver_data = (unsigned long)&tgl_desc}, .driver_data = (unsigned long)&tgl_desc},
#endif #endif
#if IS_ENABLED(CONFIG_SND_SOC_SOF_ELKHARTLAKE) #if IS_ENABLED(CONFIG_SND_SOC_SOF_ELKHARTLAKE)
{ PCI_DEVICE(0x8086, 0x4b55), { PCI_DEVICE(0x8086, 0x4b55),
......
sound/usb/format.c
View file @ a4d3712b
...@@ -394,8 +394,9 @@ static int parse_uac2_sample_rate_range(struct snd_usb_audio *chip, ...@@ -394,8 +394,9 @@ static int parse_uac2_sample_rate_range(struct snd_usb_audio *chip,
return nr_rates; return nr_rates;
} }
/* Line6 Helix series don't support the UAC2_CS_RANGE usb function /* Line6 Helix series and the Rode Rodecaster Pro don't support the
* call. Return a static table of known clock rates. * UAC2_CS_RANGE usb function call. Return a static table of known
* clock rates.
*/ */
static int line6_parse_audio_format_rates_quirk(struct snd_usb_audio *chip, static int line6_parse_audio_format_rates_quirk(struct snd_usb_audio *chip,
struct audioformat *fp) struct audioformat *fp)
...@@ -408,6 +409,7 @@ static int line6_parse_audio_format_rates_quirk(struct snd_usb_audio *chip, ...@@ -408,6 +409,7 @@ static int line6_parse_audio_format_rates_quirk(struct snd_usb_audio *chip,
case USB_ID(0x0e41, 0x4248): /* Line6 Helix >= fw 2.82 */ case USB_ID(0x0e41, 0x4248): /* Line6 Helix >= fw 2.82 */
case USB_ID(0x0e41, 0x4249): /* Line6 Helix Rack >= fw 2.82 */ case USB_ID(0x0e41, 0x4249): /* Line6 Helix Rack >= fw 2.82 */
case USB_ID(0x0e41, 0x424a): /* Line6 Helix LT >= fw 2.82 */ case USB_ID(0x0e41, 0x424a): /* Line6 Helix LT >= fw 2.82 */
case USB_ID(0x19f7, 0x0011): /* Rode Rodecaster Pro */
return set_fixed_rate(fp, 48000, SNDRV_PCM_RATE_48000); return set_fixed_rate(fp, 48000, SNDRV_PCM_RATE_48000);
} }
......
sound/usb/mixer.c
View file @ a4d3712b
...@@ -581,8 +581,9 @@ static int check_matrix_bitmap(unsigned char *bmap, ...@@ -581,8 +581,9 @@ static int check_matrix_bitmap(unsigned char *bmap,
* if failed, give up and free the control instance. * if failed, give up and free the control instance.
*/ */
int snd_usb_mixer_add_control(struct usb_mixer_elem_list *list, int snd_usb_mixer_add_list(struct usb_mixer_elem_list *list,
struct snd_kcontrol *kctl) struct snd_kcontrol *kctl,
bool is_std_info)
{ {
struct usb_mixer_interface *mixer = list->mixer; struct usb_mixer_interface *mixer = list->mixer;
int err; int err;
...@@ -596,6 +597,7 @@ int snd_usb_mixer_add_control(struct usb_mixer_elem_list *list, ...@@ -596,6 +597,7 @@ int snd_usb_mixer_add_control(struct usb_mixer_elem_list *list,
return err; return err;
} }
list->kctl = kctl; list->kctl = kctl;
list->is_std_info = is_std_info;
list->next_id_elem = mixer->id_elems[list->id]; list->next_id_elem = mixer->id_elems[list->id];
mixer->id_elems[list->id] = list; mixer->id_elems[list->id] = list;
return 0; return 0;
...@@ -3234,8 +3236,11 @@ void snd_usb_mixer_notify_id(struct usb_mixer_interface *mixer, int unitid) ...@@ -3234,8 +3236,11 @@ void snd_usb_mixer_notify_id(struct usb_mixer_interface *mixer, int unitid)
unitid = delegate_notify(mixer, unitid, NULL, NULL); unitid = delegate_notify(mixer, unitid, NULL, NULL);
for_each_mixer_elem(list, mixer, unitid) { for_each_mixer_elem(list, mixer, unitid) {
struct usb_mixer_elem_info *info = struct usb_mixer_elem_info *info;
mixer_elem_list_to_info(list);
if (!list->is_std_info)
continue;
info = mixer_elem_list_to_info(list);
/* invalidate cache, so the value is read from the device */ /* invalidate cache, so the value is read from the device */
info->cached = 0; info->cached = 0;
snd_ctl_notify(mixer->chip->card, SNDRV_CTL_EVENT_MASK_VALUE, snd_ctl_notify(mixer->chip->card, SNDRV_CTL_EVENT_MASK_VALUE,
...@@ -3315,6 +3320,8 @@ static void snd_usb_mixer_interrupt_v2(struct usb_mixer_interface *mixer, ...@@ -3315,6 +3320,8 @@ static void snd_usb_mixer_interrupt_v2(struct usb_mixer_interface *mixer,
if (!list->kctl) if (!list->kctl)
continue; continue;
if (!list->is_std_info)
continue;
info = mixer_elem_list_to_info(list); info = mixer_elem_list_to_info(list);
if (count > 1 && info->control != control) if (count > 1 && info->control != control)
......
sound/usb/mixer.h
View file @ a4d3712b
...@@ -66,6 +66,7 @@ struct usb_mixer_elem_list { ...@@ -66,6 +66,7 @@ struct usb_mixer_elem_list {
struct usb_mixer_elem_list *next_id_elem; /* list of controls with same id */ struct usb_mixer_elem_list *next_id_elem; /* list of controls with same id */
struct snd_kcontrol *kctl; struct snd_kcontrol *kctl;
unsigned int id; unsigned int id;
bool is_std_info;
usb_mixer_elem_dump_func_t dump; usb_mixer_elem_dump_func_t dump;
usb_mixer_elem_resume_func_t resume; usb_mixer_elem_resume_func_t resume;
}; };
...@@ -103,8 +104,12 @@ void snd_usb_mixer_notify_id(struct usb_mixer_interface *mixer, int unitid); ...@@ -103,8 +104,12 @@ void snd_usb_mixer_notify_id(struct usb_mixer_interface *mixer, int unitid);
int snd_usb_mixer_set_ctl_value(struct usb_mixer_elem_info *cval, int snd_usb_mixer_set_ctl_value(struct usb_mixer_elem_info *cval,
int request, int validx, int value_set); int request, int validx, int value_set);
int snd_usb_mixer_add_control(struct usb_mixer_elem_list *list, int snd_usb_mixer_add_list(struct usb_mixer_elem_list *list,
struct snd_kcontrol *kctl); struct snd_kcontrol *kctl,
bool is_std_info);
#define snd_usb_mixer_add_control(list, kctl) \
snd_usb_mixer_add_list(list, kctl, true)
void snd_usb_mixer_elem_init_std(struct usb_mixer_elem_list *list, void snd_usb_mixer_elem_init_std(struct usb_mixer_elem_list *list,
struct usb_mixer_interface *mixer, struct usb_mixer_interface *mixer,
......
sound/usb/mixer_quirks.c
View file @ a4d3712b
...@@ -158,7 +158,8 @@ static int add_single_ctl_with_resume(struct usb_mixer_interface *mixer, ...@@ -158,7 +158,8 @@ static int add_single_ctl_with_resume(struct usb_mixer_interface *mixer,
return -ENOMEM; return -ENOMEM;
} }
kctl->private_free = snd_usb_mixer_elem_free; kctl->private_free = snd_usb_mixer_elem_free;
return snd_usb_mixer_add_control(list, kctl); /* don't use snd_usb_mixer_add_control() here, this is a special list element */
return snd_usb_mixer_add_list(list, kctl, false);
} }
/* /*
......
sound/usb/pcm.c
View file @ a4d3712b
...@@ -367,6 +367,7 @@ static int set_sync_ep_implicit_fb_quirk(struct snd_usb_substream *subs, ...@@ -367,6 +367,7 @@ static int set_sync_ep_implicit_fb_quirk(struct snd_usb_substream *subs,
ifnum = 0; ifnum = 0;
goto add_sync_ep_from_ifnum; goto add_sync_ep_from_ifnum;
case USB_ID(0x07fd, 0x0008): /* MOTU M Series */ case USB_ID(0x07fd, 0x0008): /* MOTU M Series */
case USB_ID(0x31e9, 0x0002): /* Solid State Logic SSL2+ */
ep = 0x81; ep = 0x81;
ifnum = 2; ifnum = 2;
goto add_sync_ep_from_ifnum; goto add_sync_ep_from_ifnum;
...@@ -1786,6 +1787,7 @@ static int snd_usb_substream_capture_trigger(struct snd_pcm_substream *substream ...@@ -1786,6 +1787,7 @@ static int snd_usb_substream_capture_trigger(struct snd_pcm_substream *substream
return 0; return 0;
case SNDRV_PCM_TRIGGER_STOP: case SNDRV_PCM_TRIGGER_STOP:
stop_endpoints(subs); stop_endpoints(subs);
subs->data_endpoint->retire_data_urb = NULL;
subs->running = 0; subs->running = 0;
return 0; return 0;
case SNDRV_PCM_TRIGGER_PAUSE_PUSH: case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
......
sound/usb/quirks.c
View file @ a4d3712b
...@@ -1532,6 +1532,7 @@ bool snd_usb_get_sample_rate_quirk(struct snd_usb_audio *chip) ...@@ -1532,6 +1532,7 @@ bool snd_usb_get_sample_rate_quirk(struct snd_usb_audio *chip)
static bool is_itf_usb_dsd_dac(unsigned int id) static bool is_itf_usb_dsd_dac(unsigned int id)
{ {
switch (id) { switch (id) {
case USB_ID(0x154e, 0x1002): /* Denon DCD-1500RE */
case USB_ID(0x154e, 0x1003): /* Denon DA-300USB */ case USB_ID(0x154e, 0x1003): /* Denon DA-300USB */
case USB_ID(0x154e, 0x3005): /* Marantz HD-DAC1 */ case USB_ID(0x154e, 0x3005): /* Marantz HD-DAC1 */
case USB_ID(0x154e, 0x3006): /* Marantz SA-14S1 */ case USB_ID(0x154e, 0x3006): /* Marantz SA-14S1 */
...@@ -1673,6 +1674,14 @@ void snd_usb_ctl_msg_quirk(struct usb_device *dev, unsigned int pipe, ...@@ -1673,6 +1674,14 @@ void snd_usb_ctl_msg_quirk(struct usb_device *dev, unsigned int pipe,
chip->usb_id == USB_ID(0x0951, 0x16ad)) && chip->usb_id == USB_ID(0x0951, 0x16ad)) &&
(requesttype & USB_TYPE_MASK) == USB_TYPE_CLASS) (requesttype & USB_TYPE_MASK) == USB_TYPE_CLASS)
usleep_range(1000, 2000); usleep_range(1000, 2000);
/*
* Samsung USBC Headset (AKG) need a tiny delay after each
* class compliant request. (Model number: AAM625R or AAM627R)
*/
if (chip->usb_id == USB_ID(0x04e8, 0xa051) &&
(requesttype & USB_TYPE_MASK) == USB_TYPE_CLASS)
usleep_range(5000, 6000);
} }
/* /*
...@@ -1856,6 +1865,7 @@ struct registration_quirk { ...@@ -1856,6 +1865,7 @@ struct registration_quirk {
static const struct registration_quirk registration_quirks[] = { static const struct registration_quirk registration_quirks[] = {
REG_QUIRK_ENTRY(0x0951, 0x16d8, 2), /* Kingston HyperX AMP */ REG_QUIRK_ENTRY(0x0951, 0x16d8, 2), /* Kingston HyperX AMP */
REG_QUIRK_ENTRY(0x0951, 0x16ed, 2), /* Kingston HyperX Cloud Alpha S */ REG_QUIRK_ENTRY(0x0951, 0x16ed, 2), /* Kingston HyperX Cloud Alpha S */
REG_QUIRK_ENTRY(0x0951, 0x16ea, 2), /* Kingston HyperX Cloud Flight S */
{ 0 } /* terminator */ { 0 } /* terminator */
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7