sound fixes for 4.15-rc6
It seems that Santa overslept with a bunch of gifts; the majority of changes here are various device-specific ASoC fixes, most notably the revert of rcar IOMMU support and fsl_ssi AC97 fixes, but also lots of small fixes for codecs. Besides that, the usual HD-audio quirks and fixes are included, too. -----BEGIN PGP SIGNATURE----- iQJCBAABCAAsFiEEIXTw5fNLNI7mMiVaLtJE4w1nLE8FAlpDXYgOHHRpd2FpQHN1 c2UuZGUACgkQLtJE4w1nLE+72Q/8DlfeMksYIprOMn4kNLvn99fKCDwsYCdhlHX/ +EYVRwR8a320zKhSND5jkqBj4A0Dy98nMybB9ePOM9bE2PltdTVM3BDHUqvSP/18 GWjT3qaAK2GPCEpgwYdVEN4eDC778JFpIv5LouyO5Tib27Ar6MZhZU4Rzs5vtC3U lwQKOQkuND0zF++5lqKqO2fktXQmg0BtqK0xHvniB3rJTry4pjJJdVWmEUvatwaY 4HLMmC+EE1kwdVMCrKr2RzdEt+d79Ab89EhBxcNe4wRIap2XkTq8xHq9W3nPRRlQ aqeXu1ou9pP0S1ZXIWZZX3GxX94eZmtTiXYvhBG1+qCul0YhfiQug4HS7HaAnmQ+ +A/Q7UJQHXcNqKSdutaixmYhOYXTLQLIBqlMKmBlE3UU2HkiZHyMEnREElFh7qhh ZeYwJrYsTB6q+SaNnbBbVlRreq4+CatKYTvlyBLCjbUTdLc428P1rfacxHpJJNUY IQ4TyWu0PHld7+lvNLc1xvWymSkkrhxAHQbAAkGGpxNHzCK/pKLARkByn2DJ9EY8 Lo3mANkglVLITW5fsk6vZ063fHtO73Mn2I4/i74hVjYhXglbTzkUJpPzjVM/ydk4 gQ+cvZ9fImrHXgiUoc2tX1jYFugkfQd3j/WaZAg3sdWzJQsegD4unT6yspcZ5Qfx FQPBqHg= =JNH5 -----END PGP SIGNATURE----- Merge tag 'sound-4.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound Pull sound fixes from Takashi Iwai: "It seems that Santa overslept with a bunch of gifts; the majority of changes here are various device-specific ASoC fixes, most notably the revert of rcar IOMMU support and fsl_ssi AC97 fixes, but also lots of small fixes for codecs. Besides that, the usual HD-audio quirks and fixes are included, too" * tag 'sound-4.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (31 commits) ALSA: hda - Fix missing COEF init for ALC225/295/299 ALSA: hda: Drop useless WARN_ON() ALSA: hda - change the location for one mic on a Lenovo machine ALSA: hda - fix headset mic detection issue on a Dell machine ALSA: hda - Add MIC_NO_PRESENCE fixup for 2 HP machines ASoC: rsnd: fixup ADG register mask ASoC: rt5514-spi: only enable wakeup when fully initialized ASoC: nau8825: fix issue that pop noise when start capture ASoC: rt5663: Fix the wrong result of the first jack detection ASoC: rsnd: ssi: fix race condition in rsnd_ssi_pointer_update ASoC: Intel: Change kern log level to avoid unwanted messages ASoC: atmel-classd: select correct Kconfig symbol ASoC: wm_adsp: Fix validation of firmware and coeff lengths ASoC: Intel: Skylake: Do not check dev_type for dmic link type ASoC: rockchip: disable clock on error ASoC: tlv320aic31xx: Fix GPIO1 register definition ASoC: codecs: msm8916-wcd: Fix supported formats ASoC: fsl_asrc: Fix typo in a field define ASoC: rsnd: ssiu: clear SSI_MODE for non TDM Extended modes ASoC: da7218: Correct IRQ level in DT binding example ...
This commit is contained in:
Linus Torvalds
commit
9b9577948f
|
|
@ -73,7 +73,7 @@ Example:
|
|||
compatible = "dlg,da7218";
|
||||
reg = <0x1a>;
|
||||
interrupt-parent = <&gpio6>;
|
||||
interrupts = <11 IRQ_TYPE_LEVEL_HIGH>;
|
||||
interrupts = <11 IRQ_TYPE_LEVEL_LOW>;
|
||||
wakeup-source;
|
||||
|
||||
VDD-supply = <®_audio>;
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@ Example:
|
|||
reg = <0x1a>;
|
||||
|
||||
interrupt-parent = <&gpio6>;
|
||||
interrupts = <11 IRQ_TYPE_LEVEL_HIGH>;
|
||||
interrupts = <11 IRQ_TYPE_LEVEL_LOW>;
|
||||
|
||||
VDD-supply = <®_audio>;
|
||||
VDDMIC-supply = <®_audio>;
|
||||
|
|
|
|||
|
|
@ -325,7 +325,7 @@ static int hdac_component_master_match(struct device *dev, void *data)
|
|||
*/
|
||||
int snd_hdac_i915_register_notifier(const struct i915_audio_component_audio_ops *aops)
|
||||
{
|
||||
if (WARN_ON(!hdac_acomp))
|
||||
if (!hdac_acomp)
|
||||
return -ENODEV;
|
||||
|
||||
hdac_acomp->audio_ops = aops;
|
||||
|
|
|
|||
|
|
@ -271,6 +271,8 @@ enum {
|
|||
CXT_FIXUP_HP_SPECTRE,
|
||||
CXT_FIXUP_HP_GATE_MIC,
|
||||
CXT_FIXUP_MUTE_LED_GPIO,
|
||||
CXT_FIXUP_HEADSET_MIC,
|
||||
CXT_FIXUP_HP_MIC_NO_PRESENCE,
|
||||
};
|
||||
|
||||
/* for hda_fixup_thinkpad_acpi() */
|
||||
|
|
@ -350,6 +352,18 @@ static void cxt_fixup_headphone_mic(struct hda_codec *codec,
|
|||
}
|
||||
}
|
||||
|
||||
static void cxt_fixup_headset_mic(struct hda_codec *codec,
|
||||
const struct hda_fixup *fix, int action)
|
||||
{
|
||||
struct conexant_spec *spec = codec->spec;
|
||||
|
||||
switch (action) {
|
||||
case HDA_FIXUP_ACT_PRE_PROBE:
|
||||
spec->parse_flags |= HDA_PINCFG_HEADSET_MIC;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
/* OPLC XO 1.5 fixup */
|
||||
|
||||
/* OLPC XO-1.5 supports DC input mode (e.g. for use with analog sensors)
|
||||
|
|
@ -880,6 +894,19 @@ static const struct hda_fixup cxt_fixups[] = {
|
|||
.type = HDA_FIXUP_FUNC,
|
||||
.v.func = cxt_fixup_mute_led_gpio,
|
||||
},
|
||||
[CXT_FIXUP_HEADSET_MIC] = {
|
||||
.type = HDA_FIXUP_FUNC,
|
||||
.v.func = cxt_fixup_headset_mic,
|
||||
},
|
||||
[CXT_FIXUP_HP_MIC_NO_PRESENCE] = {
|
||||
.type = HDA_FIXUP_PINS,
|
||||
.v.pins = (const struct hda_pintbl[]) {
|
||||
{ 0x1a, 0x02a1113c },
|
||||
{ }
|
||||
},
|
||||
.chained = true,
|
||||
.chain_id = CXT_FIXUP_HEADSET_MIC,
|
||||
},
|
||||
};
|
||||
|
||||
static const struct snd_pci_quirk cxt5045_fixups[] = {
|
||||
|
|
@ -934,6 +961,8 @@ static const struct snd_pci_quirk cxt5066_fixups[] = {
|
|||
SND_PCI_QUIRK(0x103c, 0x8115, "HP Z1 Gen3", CXT_FIXUP_HP_GATE_MIC),
|
||||
SND_PCI_QUIRK(0x103c, 0x814f, "HP ZBook 15u G3", CXT_FIXUP_MUTE_LED_GPIO),
|
||||
SND_PCI_QUIRK(0x103c, 0x822e, "HP ProBook 440 G4", CXT_FIXUP_MUTE_LED_GPIO),
|
||||
SND_PCI_QUIRK(0x103c, 0x8299, "HP 800 G3 SFF", CXT_FIXUP_HP_MIC_NO_PRESENCE),
|
||||
SND_PCI_QUIRK(0x103c, 0x829a, "HP 800 G3 DM", CXT_FIXUP_HP_MIC_NO_PRESENCE),
|
||||
SND_PCI_QUIRK(0x1043, 0x138d, "Asus", CXT_FIXUP_HEADPHONE_MIC_PIN),
|
||||
SND_PCI_QUIRK(0x152d, 0x0833, "OLPC XO-1.5", CXT_FIXUP_OLPC_XO),
|
||||
SND_PCI_QUIRK(0x17aa, 0x20f2, "Lenovo T400", CXT_PINCFG_LENOVO_TP410),
|
||||
|
|
|
|||
|
|
@ -324,8 +324,12 @@ static void alc_fill_eapd_coef(struct hda_codec *codec)
|
|||
case 0x10ec0292:
|
||||
alc_update_coef_idx(codec, 0x4, 1<<15, 0);
|
||||
break;
|
||||
case 0x10ec0215:
|
||||
case 0x10ec0225:
|
||||
case 0x10ec0295:
|
||||
case 0x10ec0299:
|
||||
alc_update_coef_idx(codec, 0x67, 0xf000, 0x3000);
|
||||
/* fallthrough */
|
||||
case 0x10ec0215:
|
||||
case 0x10ec0233:
|
||||
case 0x10ec0236:
|
||||
case 0x10ec0255:
|
||||
|
|
@ -336,10 +340,8 @@ static void alc_fill_eapd_coef(struct hda_codec *codec)
|
|||
case 0x10ec0286:
|
||||
case 0x10ec0288:
|
||||
case 0x10ec0285:
|
||||
case 0x10ec0295:
|
||||
case 0x10ec0298:
|
||||
case 0x10ec0289:
|
||||
case 0x10ec0299:
|
||||
alc_update_coef_idx(codec, 0x10, 1<<9, 0);
|
||||
break;
|
||||
case 0x10ec0275:
|
||||
|
|
@ -6328,6 +6330,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
|
|||
SND_PCI_QUIRK(0x17aa, 0x30bb, "ThinkCentre AIO", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY),
|
||||
SND_PCI_QUIRK(0x17aa, 0x30e2, "ThinkCentre AIO", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY),
|
||||
SND_PCI_QUIRK(0x17aa, 0x310c, "ThinkCentre Station", ALC294_FIXUP_LENOVO_MIC_LOCATION),
|
||||
SND_PCI_QUIRK(0x17aa, 0x313c, "ThinkCentre Station", ALC294_FIXUP_LENOVO_MIC_LOCATION),
|
||||
SND_PCI_QUIRK(0x17aa, 0x3112, "ThinkCentre AIO", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY),
|
||||
SND_PCI_QUIRK(0x17aa, 0x3902, "Lenovo E50-80", ALC269_FIXUP_DMIC_THINKPAD_ACPI),
|
||||
SND_PCI_QUIRK(0x17aa, 0x3977, "IdeaPad S210", ALC283_FIXUP_INT_MIC),
|
||||
|
|
@ -6585,6 +6588,11 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = {
|
|||
SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
|
||||
{0x1b, 0x01011020},
|
||||
{0x21, 0x02211010}),
|
||||
SND_HDA_PIN_QUIRK(0x10ec0256, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
|
||||
{0x12, 0x90a60130},
|
||||
{0x14, 0x90170110},
|
||||
{0x1b, 0x01011020},
|
||||
{0x21, 0x0221101f}),
|
||||
SND_HDA_PIN_QUIRK(0x10ec0256, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
|
||||
{0x12, 0x90a60160},
|
||||
{0x14, 0x90170120},
|
||||
|
|
|
|||
|
|
@ -1051,6 +1051,11 @@ static int acp_audio_probe(struct platform_device *pdev)
|
|||
struct resource *res;
|
||||
const u32 *pdata = pdev->dev.platform_data;
|
||||
|
||||
if (!pdata) {
|
||||
dev_err(&pdev->dev, "Missing platform data\n");
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
audio_drv_data = devm_kzalloc(&pdev->dev, sizeof(struct audio_drv_data),
|
||||
GFP_KERNEL);
|
||||
if (audio_drv_data == NULL)
|
||||
|
|
@ -1058,6 +1063,8 @@ static int acp_audio_probe(struct platform_device *pdev)
|
|||
|
||||
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||
audio_drv_data->acp_mmio = devm_ioremap_resource(&pdev->dev, res);
|
||||
if (IS_ERR(audio_drv_data->acp_mmio))
|
||||
return PTR_ERR(audio_drv_data->acp_mmio);
|
||||
|
||||
/* The following members gets populated in device 'open'
|
||||
* function. Till then interrupts are disabled in 'acp_init'
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ config SND_AT91_SOC_SAM9X5_WM8731
|
|||
config SND_ATMEL_SOC_CLASSD
|
||||
tristate "Atmel ASoC driver for boards using CLASSD"
|
||||
depends on ARCH_AT91 || COMPILE_TEST
|
||||
select SND_ATMEL_SOC_DMA
|
||||
select SND_SOC_GENERIC_DMAENGINE_PCM
|
||||
select REGMAP_MMIO
|
||||
help
|
||||
Say Y if you want to add support for Atmel ASoC driver for boards using
|
||||
|
|
|
|||
|
|
@ -2520,7 +2520,7 @@ static struct da7218_pdata *da7218_of_to_pdata(struct snd_soc_codec *codec)
|
|||
}
|
||||
|
||||
if (da7218->dev_id == DA7218_DEV_ID) {
|
||||
hpldet_np = of_find_node_by_name(np, "da7218_hpldet");
|
||||
hpldet_np = of_get_child_by_name(np, "da7218_hpldet");
|
||||
if (!hpldet_np)
|
||||
return pdata;
|
||||
|
||||
|
|
|
|||
|
|
@ -267,7 +267,7 @@
|
|||
#define MSM8916_WCD_ANALOG_RATES (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000 |\
|
||||
SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_48000)
|
||||
#define MSM8916_WCD_ANALOG_FORMATS (SNDRV_PCM_FMTBIT_S16_LE |\
|
||||
SNDRV_PCM_FMTBIT_S24_LE)
|
||||
SNDRV_PCM_FMTBIT_S32_LE)
|
||||
|
||||
static int btn_mask = SND_JACK_BTN_0 | SND_JACK_BTN_1 |
|
||||
SND_JACK_BTN_2 | SND_JACK_BTN_3 | SND_JACK_BTN_4;
|
||||
|
|
|
|||
|
|
@ -194,7 +194,7 @@
|
|||
SNDRV_PCM_RATE_32000 | \
|
||||
SNDRV_PCM_RATE_48000)
|
||||
#define MSM8916_WCD_DIGITAL_FORMATS (SNDRV_PCM_FMTBIT_S16_LE |\
|
||||
SNDRV_PCM_FMTBIT_S24_LE)
|
||||
SNDRV_PCM_FMTBIT_S32_LE)
|
||||
|
||||
struct msm8916_wcd_digital_priv {
|
||||
struct clk *ahbclk, *mclk;
|
||||
|
|
@ -645,7 +645,7 @@ static int msm8916_wcd_digital_hw_params(struct snd_pcm_substream *substream,
|
|||
RX_I2S_CTL_RX_I2S_MODE_MASK,
|
||||
RX_I2S_CTL_RX_I2S_MODE_16);
|
||||
break;
|
||||
case SNDRV_PCM_FORMAT_S24_LE:
|
||||
case SNDRV_PCM_FORMAT_S32_LE:
|
||||
snd_soc_update_bits(dai->codec, LPASS_CDC_CLK_TX_I2S_CTL,
|
||||
TX_I2S_CTL_TX_I2S_MODE_MASK,
|
||||
TX_I2S_CTL_TX_I2S_MODE_32);
|
||||
|
|
|
|||
|
|
@ -905,6 +905,7 @@ static int nau8825_adc_event(struct snd_soc_dapm_widget *w,
|
|||
|
||||
switch (event) {
|
||||
case SND_SOC_DAPM_POST_PMU:
|
||||
msleep(125);
|
||||
regmap_update_bits(nau8825->regmap, NAU8825_REG_ENA_CTRL,
|
||||
NAU8825_ENABLE_ADC, NAU8825_ENABLE_ADC);
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -289,6 +289,8 @@ static int rt5514_spi_pcm_probe(struct snd_soc_platform *platform)
|
|||
dev_err(&rt5514_spi->dev,
|
||||
"%s Failed to reguest IRQ: %d\n", __func__,
|
||||
ret);
|
||||
else
|
||||
device_init_wakeup(rt5514_dsp->dev, true);
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
|
@ -456,8 +458,6 @@ static int rt5514_spi_probe(struct spi_device *spi)
|
|||
return ret;
|
||||
}
|
||||
|
||||
device_init_wakeup(&spi->dev, true);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -482,10 +482,13 @@ static int __maybe_unused rt5514_resume(struct device *dev)
|
|||
if (device_may_wakeup(dev))
|
||||
disable_irq_wake(irq);
|
||||
|
||||
if (rt5514_dsp->substream) {
|
||||
rt5514_spi_burst_read(RT5514_IRQ_CTRL, (u8 *)&buf, sizeof(buf));
|
||||
if (buf[0] & RT5514_IRQ_STATUS_BIT)
|
||||
rt5514_schedule_copy(rt5514_dsp);
|
||||
if (rt5514_dsp) {
|
||||
if (rt5514_dsp->substream) {
|
||||
rt5514_spi_burst_read(RT5514_IRQ_CTRL, (u8 *)&buf,
|
||||
sizeof(buf));
|
||||
if (buf[0] & RT5514_IRQ_STATUS_BIT)
|
||||
rt5514_schedule_copy(rt5514_dsp);
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
|
|
|||
|
|
@ -496,7 +496,7 @@ static const struct snd_soc_dapm_widget rt5514_dapm_widgets[] = {
|
|||
SND_SOC_DAPM_PGA("DMIC1", SND_SOC_NOPM, 0, 0, NULL, 0),
|
||||
SND_SOC_DAPM_PGA("DMIC2", SND_SOC_NOPM, 0, 0, NULL, 0),
|
||||
|
||||
SND_SOC_DAPM_SUPPLY("DMIC CLK", SND_SOC_NOPM, 0, 0,
|
||||
SND_SOC_DAPM_SUPPLY_S("DMIC CLK", 1, SND_SOC_NOPM, 0, 0,
|
||||
rt5514_set_dmic_clk, SND_SOC_DAPM_PRE_PMU),
|
||||
|
||||
SND_SOC_DAPM_SUPPLY("ADC CLK", RT5514_CLK_CTRL1,
|
||||
|
|
|
|||
|
|
@ -3823,6 +3823,8 @@ static int rt5645_i2c_probe(struct i2c_client *i2c,
|
|||
regmap_read(regmap, RT5645_VENDOR_ID, &val);
|
||||
rt5645->v_id = val & 0xff;
|
||||
|
||||
regmap_write(rt5645->regmap, RT5645_AD_DA_MIXER, 0x8080);
|
||||
|
||||
ret = regmap_register_patch(rt5645->regmap, init_list,
|
||||
ARRAY_SIZE(init_list));
|
||||
if (ret != 0)
|
||||
|
|
|
|||
|
|
@ -1560,6 +1560,10 @@ static int rt5663_jack_detect(struct snd_soc_codec *codec, int jack_insert)
|
|||
RT5663_IRQ_POW_SAV_MASK, RT5663_IRQ_POW_SAV_EN);
|
||||
snd_soc_update_bits(codec, RT5663_IRQ_1,
|
||||
RT5663_EN_IRQ_JD1_MASK, RT5663_EN_IRQ_JD1_EN);
|
||||
snd_soc_update_bits(codec, RT5663_EM_JACK_TYPE_1,
|
||||
RT5663_EM_JD_MASK, RT5663_EM_JD_RST);
|
||||
snd_soc_update_bits(codec, RT5663_EM_JACK_TYPE_1,
|
||||
RT5663_EM_JD_MASK, RT5663_EM_JD_NOR);
|
||||
|
||||
while (true) {
|
||||
regmap_read(rt5663->regmap, RT5663_INT_ST_2, &val);
|
||||
|
|
|
|||
|
|
@ -1029,6 +1029,10 @@
|
|||
#define RT5663_POL_EXT_JD_SHIFT 10
|
||||
#define RT5663_POL_EXT_JD_EN (0x1 << 10)
|
||||
#define RT5663_POL_EXT_JD_DIS (0x0 << 10)
|
||||
#define RT5663_EM_JD_MASK (0x1 << 7)
|
||||
#define RT5663_EM_JD_SHIFT 7
|
||||
#define RT5663_EM_JD_NOR (0x1 << 7)
|
||||
#define RT5663_EM_JD_RST (0x0 << 7)
|
||||
|
||||
/* DACREF LDO Control (0x0112)*/
|
||||
#define RT5663_PWR_LDO_DACREFL_MASK (0x1 << 9)
|
||||
|
|
|
|||
|
|
@ -116,7 +116,7 @@ struct aic31xx_pdata {
|
|||
/* INT2 interrupt control */
|
||||
#define AIC31XX_INT2CTRL AIC31XX_REG(0, 49)
|
||||
/* GPIO1 control */
|
||||
#define AIC31XX_GPIO1 AIC31XX_REG(0, 50)
|
||||
#define AIC31XX_GPIO1 AIC31XX_REG(0, 51)
|
||||
|
||||
#define AIC31XX_DACPRB AIC31XX_REG(0, 60)
|
||||
/* ADC Instruction Set Register */
|
||||
|
|
|
|||
|
|
@ -232,7 +232,7 @@ static struct twl4030_codec_data *twl4030_get_pdata(struct snd_soc_codec *codec)
|
|||
struct twl4030_codec_data *pdata = dev_get_platdata(codec->dev);
|
||||
struct device_node *twl4030_codec_node = NULL;
|
||||
|
||||
twl4030_codec_node = of_find_node_by_name(codec->dev->parent->of_node,
|
||||
twl4030_codec_node = of_get_child_by_name(codec->dev->parent->of_node,
|
||||
"codec");
|
||||
|
||||
if (!pdata && twl4030_codec_node) {
|
||||
|
|
@ -241,9 +241,11 @@ static struct twl4030_codec_data *twl4030_get_pdata(struct snd_soc_codec *codec)
|
|||
GFP_KERNEL);
|
||||
if (!pdata) {
|
||||
dev_err(codec->dev, "Can not allocate memory\n");
|
||||
of_node_put(twl4030_codec_node);
|
||||
return NULL;
|
||||
}
|
||||
twl4030_setup_pdata_of(pdata, twl4030_codec_node);
|
||||
of_node_put(twl4030_codec_node);
|
||||
}
|
||||
|
||||
return pdata;
|
||||
|
|
|
|||
|
|
@ -1733,7 +1733,7 @@ static int wm_adsp_load(struct wm_adsp *dsp)
|
|||
le64_to_cpu(footer->timestamp));
|
||||
|
||||
while (pos < firmware->size &&
|
||||
pos - firmware->size > sizeof(*region)) {
|
||||
sizeof(*region) < firmware->size - pos) {
|
||||
region = (void *)&(firmware->data[pos]);
|
||||
region_name = "Unknown";
|
||||
reg = 0;
|
||||
|
|
@ -1782,8 +1782,8 @@ static int wm_adsp_load(struct wm_adsp *dsp)
|
|||
regions, le32_to_cpu(region->len), offset,
|
||||
region_name);
|
||||
|
||||
if ((pos + le32_to_cpu(region->len) + sizeof(*region)) >
|
||||
firmware->size) {
|
||||
if (le32_to_cpu(region->len) >
|
||||
firmware->size - pos - sizeof(*region)) {
|
||||
adsp_err(dsp,
|
||||
"%s.%d: %s region len %d bytes exceeds file length %zu\n",
|
||||
file, regions, region_name,
|
||||
|
|
@ -2253,7 +2253,7 @@ static int wm_adsp_load_coeff(struct wm_adsp *dsp)
|
|||
|
||||
blocks = 0;
|
||||
while (pos < firmware->size &&
|
||||
pos - firmware->size > sizeof(*blk)) {
|
||||
sizeof(*blk) < firmware->size - pos) {
|
||||
blk = (void *)(&firmware->data[pos]);
|
||||
|
||||
type = le16_to_cpu(blk->type);
|
||||
|
|
@ -2327,8 +2327,8 @@ static int wm_adsp_load_coeff(struct wm_adsp *dsp)
|
|||
}
|
||||
|
||||
if (reg) {
|
||||
if ((pos + le32_to_cpu(blk->len) + sizeof(*blk)) >
|
||||
firmware->size) {
|
||||
if (le32_to_cpu(blk->len) >
|
||||
firmware->size - pos - sizeof(*blk)) {
|
||||
adsp_err(dsp,
|
||||
"%s.%d: %s region len %d bytes exceeds file length %zu\n",
|
||||
file, blocks, region_name,
|
||||
|
|
|
|||
|
|
@ -260,8 +260,8 @@
|
|||
#define ASRFSTi_OUTPUT_FIFO_SHIFT 12
|
||||
#define ASRFSTi_OUTPUT_FIFO_MASK (((1 << ASRFSTi_OUTPUT_FIFO_WIDTH) - 1) << ASRFSTi_OUTPUT_FIFO_SHIFT)
|
||||
#define ASRFSTi_IAEi_SHIFT 11
|
||||
#define ASRFSTi_IAEi_MASK (1 << ASRFSTi_OAFi_SHIFT)
|
||||
#define ASRFSTi_IAEi (1 << ASRFSTi_OAFi_SHIFT)
|
||||
#define ASRFSTi_IAEi_MASK (1 << ASRFSTi_IAEi_SHIFT)
|
||||
#define ASRFSTi_IAEi (1 << ASRFSTi_IAEi_SHIFT)
|
||||
#define ASRFSTi_INPUT_FIFO_WIDTH 7
|
||||
#define ASRFSTi_INPUT_FIFO_SHIFT 0
|
||||
#define ASRFSTi_INPUT_FIFO_MASK ((1 << ASRFSTi_INPUT_FIFO_WIDTH) - 1)
|
||||
|
|
|
|||
|
|
@ -38,6 +38,7 @@
|
|||
#include <linux/ctype.h>
|
||||
#include <linux/device.h>
|
||||
#include <linux/delay.h>
|
||||
#include <linux/mutex.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/spinlock.h>
|
||||
#include <linux/of.h>
|
||||
|
|
@ -265,6 +266,8 @@ struct fsl_ssi_private {
|
|||
|
||||
u32 fifo_watermark;
|
||||
u32 dma_maxburst;
|
||||
|
||||
struct mutex ac97_reg_lock;
|
||||
};
|
||||
|
||||
/*
|
||||
|
|
@ -1260,11 +1263,13 @@ static void fsl_ssi_ac97_write(struct snd_ac97 *ac97, unsigned short reg,
|
|||
if (reg > 0x7f)
|
||||
return;
|
||||
|
||||
mutex_lock(&fsl_ac97_data->ac97_reg_lock);
|
||||
|
||||
ret = clk_prepare_enable(fsl_ac97_data->clk);
|
||||
if (ret) {
|
||||
pr_err("ac97 write clk_prepare_enable failed: %d\n",
|
||||
ret);
|
||||
return;
|
||||
goto ret_unlock;
|
||||
}
|
||||
|
||||
lreg = reg << 12;
|
||||
|
|
@ -1278,6 +1283,9 @@ static void fsl_ssi_ac97_write(struct snd_ac97 *ac97, unsigned short reg,
|
|||
udelay(100);
|
||||
|
||||
clk_disable_unprepare(fsl_ac97_data->clk);
|
||||
|
||||
ret_unlock:
|
||||
mutex_unlock(&fsl_ac97_data->ac97_reg_lock);
|
||||
}
|
||||
|
||||
static unsigned short fsl_ssi_ac97_read(struct snd_ac97 *ac97,
|
||||
|
|
@ -1285,16 +1293,18 @@ static unsigned short fsl_ssi_ac97_read(struct snd_ac97 *ac97,
|
|||
{
|
||||
struct regmap *regs = fsl_ac97_data->regs;
|
||||
|
||||
unsigned short val = -1;
|
||||
unsigned short val = 0;
|
||||
u32 reg_val;
|
||||
unsigned int lreg;
|
||||
int ret;
|
||||
|
||||
mutex_lock(&fsl_ac97_data->ac97_reg_lock);
|
||||
|
||||
ret = clk_prepare_enable(fsl_ac97_data->clk);
|
||||
if (ret) {
|
||||
pr_err("ac97 read clk_prepare_enable failed: %d\n",
|
||||
ret);
|
||||
return -1;
|
||||
goto ret_unlock;
|
||||
}
|
||||
|
||||
lreg = (reg & 0x7f) << 12;
|
||||
|
|
@ -1309,6 +1319,8 @@ static unsigned short fsl_ssi_ac97_read(struct snd_ac97 *ac97,
|
|||
|
||||
clk_disable_unprepare(fsl_ac97_data->clk);
|
||||
|
||||
ret_unlock:
|
||||
mutex_unlock(&fsl_ac97_data->ac97_reg_lock);
|
||||
return val;
|
||||
}
|
||||
|
||||
|
|
@ -1458,12 +1470,6 @@ static int fsl_ssi_probe(struct platform_device *pdev)
|
|||
sizeof(fsl_ssi_ac97_dai));
|
||||
|
||||
fsl_ac97_data = ssi_private;
|
||||
|
||||
ret = snd_soc_set_ac97_ops_of_reset(&fsl_ssi_ac97_ops, pdev);
|
||||
if (ret) {
|
||||
dev_err(&pdev->dev, "could not set AC'97 ops\n");
|
||||
return ret;
|
||||
}
|
||||
} else {
|
||||
/* Initialize this copy of the CPU DAI driver structure */
|
||||
memcpy(&ssi_private->cpu_dai_drv, &fsl_ssi_dai_template,
|
||||
|
|
@ -1574,6 +1580,15 @@ static int fsl_ssi_probe(struct platform_device *pdev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
if (fsl_ssi_is_ac97(ssi_private)) {
|
||||
mutex_init(&ssi_private->ac97_reg_lock);
|
||||
ret = snd_soc_set_ac97_ops_of_reset(&fsl_ssi_ac97_ops, pdev);
|
||||
if (ret) {
|
||||
dev_err(&pdev->dev, "could not set AC'97 ops\n");
|
||||
goto error_ac97_ops;
|
||||
}
|
||||
}
|
||||
|
||||
ret = devm_snd_soc_register_component(&pdev->dev, &fsl_ssi_component,
|
||||
&ssi_private->cpu_dai_drv, 1);
|
||||
if (ret) {
|
||||
|
|
@ -1657,6 +1672,13 @@ static int fsl_ssi_probe(struct platform_device *pdev)
|
|||
fsl_ssi_debugfs_remove(&ssi_private->dbg_stats);
|
||||
|
||||
error_asoc_register:
|
||||
if (fsl_ssi_is_ac97(ssi_private))
|
||||
snd_soc_set_ac97_ops(NULL);
|
||||
|
||||
error_ac97_ops:
|
||||
if (fsl_ssi_is_ac97(ssi_private))
|
||||
mutex_destroy(&ssi_private->ac97_reg_lock);
|
||||
|
||||
if (ssi_private->soc->imx)
|
||||
fsl_ssi_imx_clean(pdev, ssi_private);
|
||||
|
||||
|
|
@ -1675,8 +1697,10 @@ static int fsl_ssi_remove(struct platform_device *pdev)
|
|||
if (ssi_private->soc->imx)
|
||||
fsl_ssi_imx_clean(pdev, ssi_private);
|
||||
|
||||
if (fsl_ssi_is_ac97(ssi_private))
|
||||
if (fsl_ssi_is_ac97(ssi_private)) {
|
||||
snd_soc_set_ac97_ops(NULL);
|
||||
mutex_destroy(&ssi_private->ac97_reg_lock);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -101,7 +101,7 @@ static const struct snd_soc_dapm_route kabylake_map[] = {
|
|||
{ "ssp0 Tx", NULL, "spk_out" },
|
||||
|
||||
{ "AIF Playback", NULL, "ssp1 Tx" },
|
||||
{ "ssp1 Tx", NULL, "hs_out" },
|
||||
{ "ssp1 Tx", NULL, "codec1_out" },
|
||||
|
||||
{ "hs_in", NULL, "ssp1 Rx" },
|
||||
{ "ssp1 Rx", NULL, "AIF Capture" },
|
||||
|
|
|
|||
|
|
@ -109,7 +109,7 @@ static const struct snd_soc_dapm_route kabylake_map[] = {
|
|||
{ "ssp0 Tx", NULL, "spk_out" },
|
||||
|
||||
{ "AIF Playback", NULL, "ssp1 Tx" },
|
||||
{ "ssp1 Tx", NULL, "hs_out" },
|
||||
{ "ssp1 Tx", NULL, "codec1_out" },
|
||||
|
||||
{ "hs_in", NULL, "ssp1 Rx" },
|
||||
{ "ssp1 Rx", NULL, "AIF Capture" },
|
||||
|
|
|
|||
|
|
@ -119,11 +119,16 @@ static bool skl_check_ep_match(struct device *dev, struct nhlt_endpoint *epnt,
|
|||
|
||||
if ((epnt->virtual_bus_id == instance_id) &&
|
||||
(epnt->linktype == link_type) &&
|
||||
(epnt->direction == dirn) &&
|
||||
(epnt->device_type == dev_type))
|
||||
return true;
|
||||
else
|
||||
return false;
|
||||
(epnt->direction == dirn)) {
|
||||
/* do not check dev_type for DMIC link type */
|
||||
if (epnt->linktype == NHLT_LINK_DMIC)
|
||||
return true;
|
||||
|
||||
if (epnt->device_type == dev_type)
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
struct nhlt_specific_cfg
|
||||
|
|
|
|||
|
|
@ -2908,7 +2908,7 @@ static int skl_tplg_control_load(struct snd_soc_component *cmpnt,
|
|||
break;
|
||||
|
||||
default:
|
||||
dev_warn(bus->dev, "Control load not supported %d:%d:%d\n",
|
||||
dev_dbg(bus->dev, "Control load not supported %d:%d:%d\n",
|
||||
hdr->ops.get, hdr->ops.put, hdr->ops.info);
|
||||
break;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -322,26 +322,30 @@ static int rk_spdif_probe(struct platform_device *pdev)
|
|||
spdif->mclk = devm_clk_get(&pdev->dev, "mclk");
|
||||
if (IS_ERR(spdif->mclk)) {
|
||||
dev_err(&pdev->dev, "Can't retrieve rk_spdif master clock\n");
|
||||
return PTR_ERR(spdif->mclk);
|
||||
ret = PTR_ERR(spdif->mclk);
|
||||
goto err_disable_hclk;
|
||||
}
|
||||
|
||||
ret = clk_prepare_enable(spdif->mclk);
|
||||
if (ret) {
|
||||
dev_err(spdif->dev, "clock enable failed %d\n", ret);
|
||||
return ret;
|
||||
goto err_disable_clocks;
|
||||
}
|
||||
|
||||
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||
regs = devm_ioremap_resource(&pdev->dev, res);
|
||||
if (IS_ERR(regs))
|
||||
return PTR_ERR(regs);
|
||||
if (IS_ERR(regs)) {
|
||||
ret = PTR_ERR(regs);
|
||||
goto err_disable_clocks;
|
||||
}
|
||||
|
||||
spdif->regmap = devm_regmap_init_mmio_clk(&pdev->dev, "hclk", regs,
|
||||
&rk_spdif_regmap_config);
|
||||
if (IS_ERR(spdif->regmap)) {
|
||||
dev_err(&pdev->dev,
|
||||
"Failed to initialise managed register map\n");
|
||||
return PTR_ERR(spdif->regmap);
|
||||
ret = PTR_ERR(spdif->regmap);
|
||||
goto err_disable_clocks;
|
||||
}
|
||||
|
||||
spdif->playback_dma_data.addr = res->start + SPDIF_SMPDR;
|
||||
|
|
@ -373,6 +377,10 @@ static int rk_spdif_probe(struct platform_device *pdev)
|
|||
|
||||
err_pm_runtime:
|
||||
pm_runtime_disable(&pdev->dev);
|
||||
err_disable_clocks:
|
||||
clk_disable_unprepare(spdif->mclk);
|
||||
err_disable_hclk:
|
||||
clk_disable_unprepare(spdif->hclk);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -222,7 +222,7 @@ int rsnd_adg_set_cmd_timsel_gen2(struct rsnd_mod *cmd_mod,
|
|||
NULL, &val, NULL);
|
||||
|
||||
val = val << shift;
|
||||
mask = 0xffff << shift;
|
||||
mask = 0x0f1f << shift;
|
||||
|
||||
rsnd_mod_bset(adg_mod, CMDOUT_TIMSEL, mask, val);
|
||||
|
||||
|
|
@ -250,7 +250,7 @@ int rsnd_adg_set_src_timesel_gen2(struct rsnd_mod *src_mod,
|
|||
|
||||
in = in << shift;
|
||||
out = out << shift;
|
||||
mask = 0xffff << shift;
|
||||
mask = 0x0f1f << shift;
|
||||
|
||||
switch (id / 2) {
|
||||
case 0:
|
||||
|
|
@ -380,7 +380,7 @@ int rsnd_adg_ssi_clk_try_start(struct rsnd_mod *ssi_mod, unsigned int rate)
|
|||
ckr = 0x80000000;
|
||||
}
|
||||
|
||||
rsnd_mod_bset(adg_mod, BRGCKR, 0x80FF0000, adg->ckr | ckr);
|
||||
rsnd_mod_bset(adg_mod, BRGCKR, 0x80770000, adg->ckr | ckr);
|
||||
rsnd_mod_write(adg_mod, BRRA, adg->rbga);
|
||||
rsnd_mod_write(adg_mod, BRRB, adg->rbgb);
|
||||
|
||||
|
|
|
|||
|
|
@ -1332,8 +1332,8 @@ static int rsnd_pcm_new(struct snd_soc_pcm_runtime *rtd)
|
|||
|
||||
return snd_pcm_lib_preallocate_pages_for_all(
|
||||
rtd->pcm,
|
||||
SNDRV_DMA_TYPE_CONTINUOUS,
|
||||
snd_dma_continuous_data(GFP_KERNEL),
|
||||
SNDRV_DMA_TYPE_DEV,
|
||||
rtd->card->snd_card->dev,
|
||||
PREALLOC_BUFFER, PREALLOC_BUFFER_MAX);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -26,10 +26,7 @@
|
|||
struct rsnd_dmaen {
|
||||
struct dma_chan *chan;
|
||||
dma_cookie_t cookie;
|
||||
dma_addr_t dma_buf;
|
||||
unsigned int dma_len;
|
||||
unsigned int dma_period;
|
||||
unsigned int dma_cnt;
|
||||
};
|
||||
|
||||
struct rsnd_dmapp {
|
||||
|
|
@ -71,38 +68,10 @@ static struct rsnd_mod mem = {
|
|||
/*
|
||||
* Audio DMAC
|
||||
*/
|
||||
#define rsnd_dmaen_sync(dmaen, io, i) __rsnd_dmaen_sync(dmaen, io, i, 1)
|
||||
#define rsnd_dmaen_unsync(dmaen, io, i) __rsnd_dmaen_sync(dmaen, io, i, 0)
|
||||
static void __rsnd_dmaen_sync(struct rsnd_dmaen *dmaen, struct rsnd_dai_stream *io,
|
||||
int i, int sync)
|
||||
{
|
||||
struct device *dev = dmaen->chan->device->dev;
|
||||
enum dma_data_direction dir;
|
||||
int is_play = rsnd_io_is_play(io);
|
||||
dma_addr_t buf;
|
||||
int len, max;
|
||||
size_t period;
|
||||
|
||||
len = dmaen->dma_len;
|
||||
period = dmaen->dma_period;
|
||||
max = len / period;
|
||||
i = i % max;
|
||||
buf = dmaen->dma_buf + (period * i);
|
||||
|
||||
dir = is_play ? DMA_TO_DEVICE : DMA_FROM_DEVICE;
|
||||
|
||||
if (sync)
|
||||
dma_sync_single_for_device(dev, buf, period, dir);
|
||||
else
|
||||
dma_sync_single_for_cpu(dev, buf, period, dir);
|
||||
}
|
||||
|
||||
static void __rsnd_dmaen_complete(struct rsnd_mod *mod,
|
||||
struct rsnd_dai_stream *io)
|
||||
{
|
||||
struct rsnd_priv *priv = rsnd_mod_to_priv(mod);
|
||||
struct rsnd_dma *dma = rsnd_mod_to_dma(mod);
|
||||
struct rsnd_dmaen *dmaen = rsnd_dma_to_dmaen(dma);
|
||||
bool elapsed = false;
|
||||
unsigned long flags;
|
||||
|
||||
|
|
@ -115,22 +84,9 @@ static void __rsnd_dmaen_complete(struct rsnd_mod *mod,
|
|||
*/
|
||||
spin_lock_irqsave(&priv->lock, flags);
|
||||
|
||||
if (rsnd_io_is_working(io)) {
|
||||
rsnd_dmaen_unsync(dmaen, io, dmaen->dma_cnt);
|
||||
|
||||
/*
|
||||
* Next period is already started.
|
||||
* Let's sync Next Next period
|
||||
* see
|
||||
* rsnd_dmaen_start()
|
||||
*/
|
||||
rsnd_dmaen_sync(dmaen, io, dmaen->dma_cnt + 2);
|
||||
|
||||
if (rsnd_io_is_working(io))
|
||||
elapsed = true;
|
||||
|
||||
dmaen->dma_cnt++;
|
||||
}
|
||||
|
||||
spin_unlock_irqrestore(&priv->lock, flags);
|
||||
|
||||
if (elapsed)
|
||||
|
|
@ -165,14 +121,8 @@ static int rsnd_dmaen_stop(struct rsnd_mod *mod,
|
|||
struct rsnd_dma *dma = rsnd_mod_to_dma(mod);
|
||||
struct rsnd_dmaen *dmaen = rsnd_dma_to_dmaen(dma);
|
||||
|
||||
if (dmaen->chan) {
|
||||
int is_play = rsnd_io_is_play(io);
|
||||
|
||||
if (dmaen->chan)
|
||||
dmaengine_terminate_all(dmaen->chan);
|
||||
dma_unmap_single(dmaen->chan->device->dev,
|
||||
dmaen->dma_buf, dmaen->dma_len,
|
||||
is_play ? DMA_TO_DEVICE : DMA_FROM_DEVICE);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -237,11 +187,7 @@ static int rsnd_dmaen_start(struct rsnd_mod *mod,
|
|||
struct device *dev = rsnd_priv_to_dev(priv);
|
||||
struct dma_async_tx_descriptor *desc;
|
||||
struct dma_slave_config cfg = {};
|
||||
dma_addr_t buf;
|
||||
size_t len;
|
||||
size_t period;
|
||||
int is_play = rsnd_io_is_play(io);
|
||||
int i;
|
||||
int ret;
|
||||
|
||||
cfg.direction = is_play ? DMA_MEM_TO_DEV : DMA_DEV_TO_MEM;
|
||||
|
|
@ -258,19 +204,10 @@ static int rsnd_dmaen_start(struct rsnd_mod *mod,
|
|||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
len = snd_pcm_lib_buffer_bytes(substream);
|
||||
period = snd_pcm_lib_period_bytes(substream);
|
||||
buf = dma_map_single(dmaen->chan->device->dev,
|
||||
substream->runtime->dma_area,
|
||||
len,
|
||||
is_play ? DMA_TO_DEVICE : DMA_FROM_DEVICE);
|
||||
if (dma_mapping_error(dmaen->chan->device->dev, buf)) {
|
||||
dev_err(dev, "dma map failed\n");
|
||||
return -EIO;
|
||||
}
|
||||
|
||||
desc = dmaengine_prep_dma_cyclic(dmaen->chan,
|
||||
buf, len, period,
|
||||
substream->runtime->dma_addr,
|
||||
snd_pcm_lib_buffer_bytes(substream),
|
||||
snd_pcm_lib_period_bytes(substream),
|
||||
is_play ? DMA_MEM_TO_DEV : DMA_DEV_TO_MEM,
|
||||
DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
|
||||
|
||||
|
|
@ -282,18 +219,7 @@ static int rsnd_dmaen_start(struct rsnd_mod *mod,
|
|||
desc->callback = rsnd_dmaen_complete;
|
||||
desc->callback_param = rsnd_mod_get(dma);
|
||||
|
||||
dmaen->dma_buf = buf;
|
||||
dmaen->dma_len = len;
|
||||
dmaen->dma_period = period;
|
||||
dmaen->dma_cnt = 0;
|
||||
|
||||
/*
|
||||
* synchronize this and next period
|
||||
* see
|
||||
* __rsnd_dmaen_complete()
|
||||
*/
|
||||
for (i = 0; i < 2; i++)
|
||||
rsnd_dmaen_sync(dmaen, io, i);
|
||||
dmaen->dma_len = snd_pcm_lib_buffer_bytes(substream);
|
||||
|
||||
dmaen->cookie = dmaengine_submit(desc);
|
||||
if (dmaen->cookie < 0) {
|
||||
|
|
|
|||
|
|
@ -446,25 +446,29 @@ static bool rsnd_ssi_pointer_update(struct rsnd_mod *mod,
|
|||
int byte)
|
||||
{
|
||||
struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod);
|
||||
bool ret = false;
|
||||
int byte_pos;
|
||||
|
||||
ssi->byte_pos += byte;
|
||||
byte_pos = ssi->byte_pos + byte;
|
||||
|
||||
if (ssi->byte_pos >= ssi->next_period_byte) {
|
||||
if (byte_pos >= ssi->next_period_byte) {
|
||||
struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io);
|
||||
|
||||
ssi->period_pos++;
|
||||
ssi->next_period_byte += ssi->byte_per_period;
|
||||
|
||||
if (ssi->period_pos >= runtime->periods) {
|
||||
ssi->byte_pos = 0;
|
||||
byte_pos = 0;
|
||||
ssi->period_pos = 0;
|
||||
ssi->next_period_byte = ssi->byte_per_period;
|
||||
}
|
||||
|
||||
return true;
|
||||
ret = true;
|
||||
}
|
||||
|
||||
return false;
|
||||
WRITE_ONCE(ssi->byte_pos, byte_pos);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -838,7 +842,7 @@ static int rsnd_ssi_pointer(struct rsnd_mod *mod,
|
|||
struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod);
|
||||
struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io);
|
||||
|
||||
*pointer = bytes_to_frames(runtime, ssi->byte_pos);
|
||||
*pointer = bytes_to_frames(runtime, READ_ONCE(ssi->byte_pos));
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -125,6 +125,7 @@ static int rsnd_ssiu_init_gen2(struct rsnd_mod *mod,
|
|||
{
|
||||
int hdmi = rsnd_ssi_hdmi_port(io);
|
||||
int ret;
|
||||
u32 mode = 0;
|
||||
|
||||
ret = rsnd_ssiu_init(mod, io, priv);
|
||||
if (ret < 0)
|
||||
|
|
@ -136,9 +137,11 @@ static int rsnd_ssiu_init_gen2(struct rsnd_mod *mod,
|
|||
* see
|
||||
* rsnd_ssi_config_init()
|
||||
*/
|
||||
rsnd_mod_write(mod, SSI_MODE, 0x1);
|
||||
mode = 0x1;
|
||||
}
|
||||
|
||||
rsnd_mod_write(mod, SSI_MODE, mode);
|
||||
|
||||
if (rsnd_ssi_use_busif(io)) {
|
||||
rsnd_mod_write(mod, SSI_BUSIF_ADINR,
|
||||
rsnd_get_adinr_bit(mod, io) |
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user