ZacharyZhang-NY/omarchy-pkgs
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
be91aebbf3043cf2221e28ab7977baffe7396f9a
omarchy-pkgs/pkgbuilds/linux-omarchy-eevdf/0513-asoc-fixes-1.patch
T

872 lines
34 KiB
Diff
Raw Blame History

diff --git a/include/dt-bindings/sound/qcom,q6dsp-lpass-ports.h b/include/dt-bindings/sound/qcom,q6dsp-lpass-ports.h
--- a/include/dt-bindings/sound/qcom,q6dsp-lpass-ports.h
+++ b/include/dt-bindings/sound/qcom,q6dsp-lpass-ports.h
@@ -237,34 +237,34 @@
/* Clock ID for RX CORE MCLK2 2X MCLK */
#define LPASS_CLK_ID_RX_CORE_MCLK2_2X_MCLK 70
-#define LAPSS_CLK_ID_QAIF_IF0_IBIT 71
-#define LAPSS_CLK_ID_QAIF_IF0_EBIT 72
-#define LAPSS_CLK_ID_QAIF_IF1_IBIT 73
-#define LAPSS_CLK_ID_QAIF_IF1_EBIT 74
-#define LAPSS_CLK_ID_QAIF_IF2_IBIT 75
-#define LAPSS_CLK_ID_QAIF_IF2_EBIT 76
-#define LAPSS_CLK_ID_QAIF_IF3_IBIT 77
-#define LAPSS_CLK_ID_QAIF_IF3_EBIT 78
-#define LAPSS_CLK_ID_QAIF_IF4_IBIT 79
-#define LAPSS_CLK_ID_QAIF_IF4_EBIT 80
-#define LAPSS_CLK_ID_QAIF_IF5_IBIT 81
-#define LAPSS_CLK_ID_QAIF_IF5_EBIT 82
-#define LAPSS_CLK_ID_QAIF_IF6_IBIT 83
-#define LAPSS_CLK_ID_QAIF_IF6_EBIT 84
-#define LAPSS_CLK_ID_QAIF_IF7_IBIT 85
-#define LAPSS_CLK_ID_QAIF_IF7_EBIT 86
-#define LAPSS_CLK_ID_QAIF_IF8_IBIT 87
-#define LAPSS_CLK_ID_QAIF_IF8_EBIT 88
-#define LAPSS_CLK_ID_QAIF_IF9_IBIT 89
-#define LAPSS_CLK_ID_QAIF_IF9_EBIT 90
-#define LAPSS_CLK_ID_QAIF_IF10_IBIT 91
-#define LAPSS_CLK_ID_QAIF_IF10_EBIT 92
-#define LAPSS_CLK_ID_QAIF_IF11_IBIT 93
-#define LAPSS_CLK_ID_QAIF_IF11_EBIT 94
-#define LAPSS_CLK_ID_QAIF_IF12_IBIT 95
-#define LAPSS_CLK_ID_QAIF_IF12_EBIT 96
-#define LAPSS_CLK_ID_VA_QAIF_IF0_IBIT 97
-#define LAPSS_CLK_ID_VA_QAIF_IF0_EBIT 98
+#define LPASS_CLK_ID_QAIF_IF0_IBIT 71
+#define LPASS_CLK_ID_QAIF_IF0_EBIT 72
+#define LPASS_CLK_ID_QAIF_IF1_IBIT 73
+#define LPASS_CLK_ID_QAIF_IF1_EBIT 74
+#define LPASS_CLK_ID_QAIF_IF2_IBIT 75
+#define LPASS_CLK_ID_QAIF_IF2_EBIT 76
+#define LPASS_CLK_ID_QAIF_IF3_IBIT 77
+#define LPASS_CLK_ID_QAIF_IF3_EBIT 78
+#define LPASS_CLK_ID_QAIF_IF4_IBIT 79
+#define LPASS_CLK_ID_QAIF_IF4_EBIT 80
+#define LPASS_CLK_ID_QAIF_IF5_IBIT 81
+#define LPASS_CLK_ID_QAIF_IF5_EBIT 82
+#define LPASS_CLK_ID_QAIF_IF6_IBIT 83
+#define LPASS_CLK_ID_QAIF_IF6_EBIT 84
+#define LPASS_CLK_ID_QAIF_IF7_IBIT 85
+#define LPASS_CLK_ID_QAIF_IF7_EBIT 86
+#define LPASS_CLK_ID_QAIF_IF8_IBIT 87
+#define LPASS_CLK_ID_QAIF_IF8_EBIT 88
+#define LPASS_CLK_ID_QAIF_IF9_IBIT 89
+#define LPASS_CLK_ID_QAIF_IF9_EBIT 90
+#define LPASS_CLK_ID_QAIF_IF10_IBIT 91
+#define LPASS_CLK_ID_QAIF_IF10_EBIT 92
+#define LPASS_CLK_ID_QAIF_IF11_IBIT 93
+#define LPASS_CLK_ID_QAIF_IF11_EBIT 94
+#define LPASS_CLK_ID_QAIF_IF12_IBIT 95
+#define LPASS_CLK_ID_QAIF_IF12_EBIT 96
+#define LPASS_CLK_ID_VA_QAIF_IF0_IBIT 97
+#define LPASS_CLK_ID_VA_QAIF_IF0_EBIT 98
#define LPASS_HW_AVTIMER_VOTE 101
#define LPASS_HW_MACRO_VOTE 102
diff --git a/sound/soc/amd/acp-config.c b/sound/soc/amd/acp-config.c
--- a/sound/soc/amd/acp-config.c
+++ b/sound/soc/amd/acp-config.c
@@ -70,6 +70,13 @@ static const struct dmi_system_id acp70_acpi_flag_override_table[] = {
DMI_MATCH(DMI_BOARD_NAME, "8EA1"),
},
},
+ {
+ /* HP OmniBook X Flip 16-cc0xxx */
+ .matches = {
+ DMI_MATCH(DMI_BOARD_VENDOR, "HP"),
+ DMI_MATCH(DMI_BOARD_NAME, "8EA2"),
+ },
+ },
{}
};
@@ -209,6 +216,20 @@ static const struct config_entry config_table[] = {
{}
},
},
+ {
+ .flags = FLAG_AMD_LEGACY,
+ .device = ACP_PCI_DEV_ID,
+ .dmi_table = (const struct dmi_system_id []) {
+ {
+ .matches = {
+ DMI_EXACT_MATCH(DMI_BOARD_VENDOR, "HUAWEI"),
+ DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "HVY-WXX9"),
+ DMI_EXACT_MATCH(DMI_PRODUCT_VERSION, "M1060"),
+ },
+ },
+ {}
+ },
+ },
};
static int snd_amd_acp_acpi_find_config(struct pci_dev *pci)
diff --git a/sound/soc/amd/acp/acp3x-es83xx/acp3x-es83xx.c b/sound/soc/amd/acp/acp3x-es83xx/acp3x-es83xx.c
--- a/sound/soc/amd/acp/acp3x-es83xx/acp3x-es83xx.c
+++ b/sound/soc/amd/acp/acp3x-es83xx/acp3x-es83xx.c
@@ -382,6 +382,14 @@ static const struct dmi_system_id acp3x_es83xx_dmi_table[] = {
},
.driver_data = (void *)(ES83XX_ENABLE_DMIC),
},
+ {
+ .matches = {
+ DMI_EXACT_MATCH(DMI_BOARD_VENDOR, "HUAWEI"),
+ DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "HVY-WXX9"),
+ DMI_EXACT_MATCH(DMI_PRODUCT_VERSION, "M1060"),
+ },
+ .driver_data = (void *)(ES83XX_ENABLE_DMIC),
+ },
{}
};
diff --git a/sound/soc/amd/yc/acp6x-mach.c b/sound/soc/amd/yc/acp6x-mach.c
--- a/sound/soc/amd/yc/acp6x-mach.c
+++ b/sound/soc/amd/yc/acp6x-mach.c
@@ -570,6 +570,13 @@ static const struct dmi_system_id yc_acp_quirk_table[] = {
DMI_MATCH(DMI_PRODUCT_NAME, "Alienware m17 R5 AMD"),
}
},
+ {
+ .driver_data = &acp6x_card,
+ .matches = {
+ DMI_MATCH(DMI_BOARD_VENDOR, "Alienware"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "Alienware m18 R1 AMD"),
+ }
+ },
{
.driver_data = &acp6x_card,
.matches = {
diff --git a/sound/soc/codecs/max98926.c b/sound/soc/codecs/max98926.c
--- a/sound/soc/codecs/max98926.c
+++ b/sound/soc/codecs/max98926.c
@@ -360,7 +360,7 @@ static int max98926_dai_set_fmt(struct snd_soc_dai *codec_dai,
regmap_write(max98926->regmap,
MAX98926_FORMAT, MAX98926_DAI_DLY_MASK);
regmap_update_bits(max98926->regmap, MAX98926_FORMAT,
- MAX98926_DAI_BCI_MASK, invert);
+ MAX98926_DAI_BCI_MASK | MAX98926_DAI_WCI_MASK, invert);
return 0;
}
diff --git a/sound/soc/codecs/rt712-sdca.c b/sound/soc/codecs/rt712-sdca.c
--- a/sound/soc/codecs/rt712-sdca.c
+++ b/sound/soc/codecs/rt712-sdca.c
@@ -1779,6 +1779,7 @@ static void rt712_sdca_vb_io_init(struct rt712_sdca_priv *rt712)
dev_dbg(dev, "%s jack/mic/amp func_status=0x%x, 0x%x, 0x%x\n",
__func__, jack_func_status, mic_func_status, amp_func_status);
+ rt712_sdca_index_write(rt712, RT712_VENDOR_REG, RT712_JD_CTL3, 0x7778);
/* DMIC */
if ((mic_func_status & FUNCTION_NEEDS_INITIALIZATION) || (!rt712->first_hw_init)) {
rt712_sdca_index_write(rt712, RT712_VENDOR_HDA_CTL, RT712_DMIC2_FU_IT_FLOAT_CTL, 0x1526);
diff --git a/sound/soc/codecs/rt712-sdca.h b/sound/soc/codecs/rt712-sdca.h
--- a/sound/soc/codecs/rt712-sdca.h
+++ b/sound/soc/codecs/rt712-sdca.h
@@ -74,6 +74,7 @@ struct rt712_dmic_kctrl_priv {
#define RT712_JD_PRODUCT_NUM 0x00
#define RT712_ANALOG_BIAS_CTL3 0x04
#define RT712_JD_CTL1 0x09
+#define RT712_JD_CTL3 0x0b
#define RT712_IO_CTL 0x0c
#define RT712_LDO2_3_CTL1 0x0e
#define RT712_PARA_VERB_CTL 0x1a
diff --git a/sound/soc/codecs/rt766-sdca-sdw.c b/sound/soc/codecs/rt766-sdca-sdw.c
--- a/sound/soc/codecs/rt766-sdca-sdw.c
+++ b/sound/soc/codecs/rt766-sdca-sdw.c
@@ -233,6 +233,8 @@ static void rt766_sdca_sdw_remove(struct sdw_slave *slave)
static const struct sdw_device_id rt766_sdca_id[] = {
SDW_SLAVE_ENTRY_EXT(0x025d, 0x766, 0x3, 0x1, 0),
SDW_SLAVE_ENTRY_EXT(0x025d, 0x767, 0x3, 0x1, 0),
+ SDW_SLAVE_ENTRY_EXT(0x025d, 0x766, 0x4, 0x1, 0),
+ SDW_SLAVE_ENTRY_EXT(0x025d, 0x767, 0x4, 0x1, 0),
{},
};
MODULE_DEVICE_TABLE(sdw, rt766_sdca_id);
diff --git a/sound/soc/codecs/tac5xx2-sdw.c b/sound/soc/codecs/tac5xx2-sdw.c
--- a/sound/soc/codecs/tac5xx2-sdw.c
+++ b/sound/soc/codecs/tac5xx2-sdw.c
@@ -55,6 +55,12 @@
#define TAC_XU_BYPASS_REG(func, xu) \
SDW_SDCA_CTL(TAC_FUNCTION_ID_##func, TAC_SDCA_ENT_##xu, \
TAC_SDCA_CTL_XU_BYPASS, 0)
+#define TAC_VOLUME_REG(func, fu, ch) \
+ SDW_SDCA_CTL(TAC_FUNCTION_ID_##func, TAC_SDCA_ENT_##fu, \
+ TAC_SDCA_CHANNEL_VOLUME, TAC_CHANNEL_##ch)
+#define TAC_GAIN_REG(func, fu, ch) \
+ SDW_SDCA_CTL(TAC_FUNCTION_ID_##func, TAC_SDCA_ENT_##fu, \
+ TAC_SDCA_CHANNEL_GAIN, TAC_CHANNEL_##ch)
/* mute registers */
#define FU21_L_MUTE_REG TAC_MUTE_REG(SA, FU21, LEFT)
@@ -123,9 +129,9 @@ static const DECLARE_TLV_DB_SCALE(tac5xx2_dvc_tlv, -7200, 50, 0);
#define TAC_DOUBLE_Q78_TLV(name, func_id, ent_id) \
SDCA_DOUBLE_Q78_TLV(name, \
SDW_SDCA_CTL(TAC_FUNCTION_ID_##func_id, TAC_SDCA_ENT_##ent_id, \
- TAC_SDCA_CHANNEL_GAIN, TAC_CHANNEL_LEFT), \
+ TAC_SDCA_CHANNEL_VOLUME, TAC_CHANNEL_LEFT), \
SDW_SDCA_CTL(TAC_FUNCTION_ID_##func_id, TAC_SDCA_ENT_##ent_id, \
- TAC_SDCA_CHANNEL_GAIN, TAC_CHANNEL_RIGHT), \
+ TAC_SDCA_CHANNEL_VOLUME, TAC_CHANNEL_RIGHT), \
TAC_DVC_MIN, TAC_DVC_MAX, TAC_DVC_STEP, tac5xx2_dvc_tlv)
struct tac5xx2_prv {
@@ -381,37 +387,53 @@ static const struct reg_default tac_reg_default[] = {
{TAC_REG_SDW(0, 1, 0x71), 0x5},
{TAC_REG_SDW(0, 1, 0x72), 0x6},
{TAC_REG_SDW(0, 1, 0x73), 0x7},
+ /* SA */
+ {TAC_MUTE_REG(SA, FU21, LEFT), 0x1},
+ {TAC_MUTE_REG(SA, FU21, RIGHT), 0x1},
+ {TAC_VOLUME_REG(SA, FU21, LEFT), 0x9c00},
+ {TAC_VOLUME_REG(SA, FU21, RIGHT), 0x9c00},
+ {TAC_MUTE_REG(SA, FU23, LEFT), 0x1},
+ {TAC_MUTE_REG(SA, FU23, RIGHT), 0x1},
+ {TAC_GAIN_REG(SA, FU23, LEFT), 0x0},
+ {TAC_GAIN_REG(SA, FU23, RIGHT), 0x0},
+ /* SM */
+ {TAC_USAGE_REG(SM, IT11), 0x0},
+ {TAC_USAGE_REG(SM, OT113), 0x0},
+ {TAC_MUTE_REG(SM, FU113, LEFT), 0x1},
+ {TAC_MUTE_REG(SM, FU113, RIGHT), 0x1},
+ {TAC_GAIN_REG(SM, FU113, LEFT), 0x0},
+ {TAC_GAIN_REG(SM, FU113, RIGHT), 0x0},
+ {TAC_MUTE_REG(SM, FU11, LEFT), 0x1},
+ {TAC_MUTE_REG(SM, FU11, RIGHT), 0x1},
+ {TAC_GAIN_REG(SM, FU11, LEFT), 0x0},
+ {TAC_GAIN_REG(SM, FU11, RIGHT), 0x0},
+ {TAC_XU_BYPASS_REG(SM, XU12), 0x1},
+ {SDW_SDCA_CTL(TAC_FUNCTION_ID_SM, TAC_SDCA_ENT_CS113,
+ TAC_SDCA_CTL_CS_SAMP_RATE_IDX, 0), 0x0},
+ /* UAJ */
+ {TAC_USAGE_REG(UAJ, IT33), 0x0},
+ {TAC_USAGE_REG(UAJ, IT41), 0x0},
+ {TAC_USAGE_REG(UAJ, OT36), 0x0},
+ {TAC_USAGE_REG(UAJ, OT45), 0x0},
+ {TAC_MUTE_REG(UAJ, FU41, LEFT), 0x1},
+ {TAC_MUTE_REG(UAJ, FU41, RIGHT), 0x1},
+ {TAC_VOLUME_REG(UAJ, FU41, LEFT), 0x0},
+ {TAC_VOLUME_REG(UAJ, FU41, RIGHT), 0x0},
+ {TAC_MUTE_REG(UAJ, FU36, RIGHT), 0x1},
+ {SDW_SDCA_CTL(TAC_FUNCTION_ID_UAJ, TAC_SDCA_ENT_FU36,
+ TAC_SDCA_CHANNEL_VOLUME, TAC_JACK_MONO_CS), 0x0},
+ {TAC_XU_BYPASS_REG(UAJ, XU42), 0x0},
+ {SDW_SDCA_CTL(TAC_FUNCTION_ID_UAJ, TAC_SDCA_ENT_CS36,
+ TAC_SDCA_CTL_CS_SAMP_RATE_IDX, 0), 0x0},
+ {SDW_SDCA_CTL(TAC_FUNCTION_ID_UAJ, TAC_SDCA_ENT_CS41,
+ TAC_SDCA_CTL_CS_SAMP_RATE_IDX, 0), 0x0},
};
static const struct reg_sequence tac_spk_seq[] = {
REG_SEQ0(SDW_SDCA_CTL(TAC_FUNCTION_ID_SA, TAC_SDCA_ENT_FU21,
- TAC_SDCA_CHANNEL_GAIN, TAC_CHANNEL_LEFT), 0),
+ TAC_SDCA_CHANNEL_VOLUME, TAC_CHANNEL_LEFT), 0),
REG_SEQ0(SDW_SDCA_CTL(TAC_FUNCTION_ID_SA, TAC_SDCA_ENT_FU21,
- TAC_SDCA_CHANNEL_GAIN, TAC_CHANNEL_RIGHT), 0),
- REG_SEQ0(SDW_SDCA_CTL(TAC_FUNCTION_ID_SA, TAC_SDCA_ENT_FU23,
- TAC_SDCA_CHANNEL_GAIN, TAC_CHANNEL_LEFT), 0),
- REG_SEQ0(SDW_SDCA_CTL(TAC_FUNCTION_ID_SA, TAC_SDCA_ENT_FU23,
- TAC_SDCA_CHANNEL_GAIN, TAC_CHANNEL_RIGHT), 0),
-};
-
-static const struct reg_sequence tac_sm_seq[] = {
- REG_SEQ0(SDW_SDCA_CTL(TAC_FUNCTION_ID_SM, TAC_SDCA_ENT_FU113,
- TAC_SDCA_CHANNEL_GAIN, TAC_CHANNEL_LEFT), 0),
- REG_SEQ0(SDW_SDCA_CTL(TAC_FUNCTION_ID_SM, TAC_SDCA_ENT_FU113,
- TAC_SDCA_CHANNEL_GAIN, TAC_CHANNEL_RIGHT), 0),
- REG_SEQ0(SDW_SDCA_CTL(TAC_FUNCTION_ID_SM, TAC_SDCA_ENT_FU11,
- TAC_SDCA_CHANNEL_GAIN, TAC_CHANNEL_LEFT), 0),
- REG_SEQ0(SDW_SDCA_CTL(TAC_FUNCTION_ID_SM, TAC_SDCA_ENT_FU11,
- TAC_SDCA_CHANNEL_GAIN, TAC_CHANNEL_RIGHT), 0),
-};
-
-static const struct reg_sequence tac_uaj_seq[] = {
- REG_SEQ0(SDW_SDCA_CTL(TAC_FUNCTION_ID_UAJ, TAC_SDCA_ENT_FU41,
- TAC_SDCA_CHANNEL_GAIN, TAC_CHANNEL_LEFT), 0),
- REG_SEQ0(SDW_SDCA_CTL(TAC_FUNCTION_ID_UAJ, TAC_SDCA_ENT_FU41,
- TAC_SDCA_CHANNEL_GAIN, TAC_CHANNEL_RIGHT), 0),
- REG_SEQ0(SDW_SDCA_CTL(TAC_FUNCTION_ID_UAJ, TAC_SDCA_ENT_FU36,
- TAC_SDCA_CHANNEL_GAIN, TAC_JACK_MONO_CS), 0),
+ TAC_SDCA_CHANNEL_VOLUME, TAC_CHANNEL_RIGHT), 0),
};
static bool tac_volatile_reg(struct device *dev, unsigned int reg)
@@ -468,25 +490,25 @@ static int tac_sdca_mbq_size(struct device *dev, unsigned int reg)
case SDW_SDCA_CTL(TAC_FUNCTION_ID_SA, TAC_SDCA_ENT_FU21,
TAC_SDCA_CHANNEL_VOLUME, TAC_CHANNEL_RIGHT):
case SDW_SDCA_CTL(TAC_FUNCTION_ID_SA, TAC_SDCA_ENT_FU23,
- TAC_SDCA_CHANNEL_GAIN, TAC_CHANNEL_LEFT):
+ TAC_SDCA_CHANNEL_VOLUME, TAC_CHANNEL_LEFT):
case SDW_SDCA_CTL(TAC_FUNCTION_ID_SA, TAC_SDCA_ENT_FU23,
- TAC_SDCA_CHANNEL_GAIN, TAC_CHANNEL_RIGHT):
+ TAC_SDCA_CHANNEL_VOLUME, TAC_CHANNEL_RIGHT):
case SDW_SDCA_CTL(TAC_FUNCTION_ID_SA, TAC_SDCA_ENT_FU23,
- TAC_SDCA_MASTER_GAIN, 0):
+ TAC_SDCA_CHANNEL_GAIN, 0):
case SDW_SDCA_CTL(TAC_FUNCTION_ID_SM, TAC_SDCA_ENT_FU113,
- TAC_SDCA_CHANNEL_GAIN, TAC_CHANNEL_LEFT):
+ TAC_SDCA_CHANNEL_VOLUME, TAC_CHANNEL_LEFT):
case SDW_SDCA_CTL(TAC_FUNCTION_ID_SM, TAC_SDCA_ENT_FU113,
- TAC_SDCA_CHANNEL_GAIN, TAC_CHANNEL_RIGHT):
+ TAC_SDCA_CHANNEL_VOLUME, TAC_CHANNEL_RIGHT):
case SDW_SDCA_CTL(TAC_FUNCTION_ID_SM, TAC_SDCA_ENT_FU11,
- TAC_SDCA_CHANNEL_GAIN, TAC_CHANNEL_LEFT):
+ TAC_SDCA_CHANNEL_VOLUME, TAC_CHANNEL_LEFT):
case SDW_SDCA_CTL(TAC_FUNCTION_ID_SM, TAC_SDCA_ENT_FU11,
- TAC_SDCA_CHANNEL_GAIN, TAC_CHANNEL_RIGHT):
+ TAC_SDCA_CHANNEL_VOLUME, TAC_CHANNEL_RIGHT):
case SDW_SDCA_CTL(TAC_FUNCTION_ID_UAJ, TAC_SDCA_ENT_FU41,
- TAC_SDCA_CHANNEL_GAIN, TAC_CHANNEL_LEFT):
+ TAC_SDCA_CHANNEL_VOLUME, TAC_CHANNEL_LEFT):
case SDW_SDCA_CTL(TAC_FUNCTION_ID_UAJ, TAC_SDCA_ENT_FU41,
- TAC_SDCA_CHANNEL_GAIN, TAC_CHANNEL_RIGHT):
+ TAC_SDCA_CHANNEL_VOLUME, TAC_CHANNEL_RIGHT):
case SDW_SDCA_CTL(TAC_FUNCTION_ID_UAJ, TAC_SDCA_ENT_FU36,
- TAC_SDCA_CHANNEL_GAIN, TAC_JACK_MONO_CS):
+ TAC_SDCA_CHANNEL_VOLUME, TAC_JACK_MONO_CS):
return 2;
default:
@@ -531,7 +553,7 @@ static const struct snd_kcontrol_new tac_uaj_controls[] = {
TAC_DOUBLE_Q78_TLV("UAJ Playback Volume", UAJ, FU41),
SDCA_SINGLE_Q78_TLV("UAJ Capture Volume",
SDW_SDCA_CTL(TAC_FUNCTION_ID_UAJ, TAC_SDCA_ENT_FU36,
- TAC_SDCA_CHANNEL_GAIN, TAC_JACK_MONO_CS),
+ TAC_SDCA_CHANNEL_VOLUME, TAC_JACK_MONO_CS),
TAC_DVC_MIN, TAC_DVC_MAX, TAC_DVC_STEP, tac5xx2_dvc_tlv),
};
@@ -1761,16 +1783,6 @@ static int tac_io_init(struct device *dev, struct sdw_slave *slave, bool first)
goto io_init_err;
}
dev_dbg(dev, "smartmic init done\n");
-
- if (first) {
- ret = regmap_multi_reg_write(tac_dev->regmap, tac_sm_seq,
- ARRAY_SIZE(tac_sm_seq));
- if (ret) {
- dev_err(tac_dev->dev,
- "init writes failed, err=%d", ret);
- goto io_init_err;
- }
- }
}
if (tac_dev->uaj_func_data) {
@@ -1783,14 +1795,6 @@ static int tac_io_init(struct device *dev, struct sdw_slave *slave, bool first)
dev_dbg(dev, "uaj init done\n");
if (first) {
- ret = regmap_multi_reg_write(tac_dev->regmap, tac_uaj_seq,
- ARRAY_SIZE(tac_uaj_seq));
- if (ret) {
- dev_err(tac_dev->dev,
- "init writes failed, err=%d", ret);
- goto io_init_err;
- }
-
if (tac_dev->hs_jack) {
ret = tac5xx2_jack_init(tac_dev);
if (ret) {
diff --git a/sound/soc/codecs/tac5xx2.h b/sound/soc/codecs/tac5xx2.h
--- a/sound/soc/codecs/tac5xx2.h
+++ b/sound/soc/codecs/tac5xx2.h
@@ -174,14 +174,13 @@
#define TAC_SDCA_ENT_SAPU29 0x35
/* Control selector definitions */
-#define TAC_SDCA_MASTER_GAIN 0x0B
#define TAC_SDCA_MASTER_MUTE 0x01
#define TAC_SDCA_CHANNEL_MUTE 0x01
-#define TAC_SDCA_CHANNEL_GAIN 0x02
+#define TAC_SDCA_CHANNEL_VOLUME 0x02
#define TAC_SDCA_POSTURENUMBER 0x10
#define TAC_SDCA_REQUESTED_PS 0x01
#define TAC_SDCA_ACTUAL_PS 0x10
-#define TAC_SDCA_CHANNEL_VOLUME 0x02
+#define TAC_SDCA_CHANNEL_GAIN 0x0B
/* 2. smart mic function */
#define TAC_FUNCTION_ID_SM 0x2
diff --git a/sound/soc/codecs/tas2783-sdw.c b/sound/soc/codecs/tas2783-sdw.c
--- a/sound/soc/codecs/tas2783-sdw.c
+++ b/sound/soc/codecs/tas2783-sdw.c
@@ -1310,6 +1310,7 @@ static int tas_port_prep(struct sdw_slave *slave, struct sdw_prepare_ch *prep_ch
enum sdw_port_prep_ops pre_ops)
{
struct device *dev = &slave->dev;
+ struct tas2783_prv *tas_dev = dev_get_drvdata(dev);
struct sdw_dpn_prop *dpn_prop;
u32 addr;
int ret;
@@ -1321,6 +1322,25 @@ static int tas_port_prep(struct sdw_slave *slave, struct sdw_prepare_ch *prep_ch
addr = SDW_DPN_PREPARECTRL(prep_ch->num);
switch (pre_ops) {
case SDW_OPS_PORT_PRE_PREP:
+ /*
+ * The Function has to be powered before the port can complete
+ * channel preparation. hw_params() does that when a stream is
+ * set up, but a stream that is only re-prepared - as it is
+ * after the peripheral lost power in S0i3 - does not go
+ * through hw_params() again, and the peripheral is back at its
+ * PS3 reset default. Power it up here, where it is needed.
+ */
+ scoped_guard(mutex, &tas_dev->pde_lock)
+ ret = regmap_write(tas_dev->regmap,
+ SDW_SDCA_CTL(1, TAS2783_SDCA_ENT_PDE23,
+ TAS2783_SDCA_CTL_REQ_POW_STATE, 0),
+ TAS2783_SDCA_POW_STATE_ON);
+ if (ret) {
+ dev_err(dev, "power up failed for port %d, err=%d\n",
+ prep_ch->num, ret);
+ return ret;
+ }
+
ret = sdw_write_no_pm(slave, addr, prep_ch->ch_mask);
if (ret)
dev_err(dev, "prep failed for port %d, err=%d\n",
diff --git a/sound/soc/loongson/loongson_card.c b/sound/soc/loongson/loongson_card.c
--- a/sound/soc/loongson/loongson_card.c
+++ b/sound/soc/loongson/loongson_card.c
@@ -55,8 +55,8 @@ static const struct loongson_card_config ls2k0300_dl2k0300b_card_config = {
.add_dapm_routes = true,
};
-static int tegra_machine_event(struct snd_soc_dapm_widget *w,
- struct snd_kcontrol *k, int event)
+static int loongson_asoc_machine_event(struct snd_soc_dapm_widget *w,
+ struct snd_kcontrol *k, int event)
{
struct snd_soc_card *card = snd_soc_dapm_to_card(w->dapm);
struct loongson_card_data *priv = snd_soc_card_get_drvdata(card);
@@ -72,9 +72,9 @@ static int tegra_machine_event(struct snd_soc_dapm_widget *w,
return 0;
}
-static const struct snd_soc_dapm_widget loongson_aosc_dapm_widgets[] = {
- SND_SOC_DAPM_HP("Headphone", tegra_machine_event),
- SND_SOC_DAPM_SPK("Speaker", tegra_machine_event),
+static const struct snd_soc_dapm_widget loongson_asoc_dapm_widgets[] = {
+ SND_SOC_DAPM_HP("Headphone", loongson_asoc_machine_event),
+ SND_SOC_DAPM_SPK("Speaker", loongson_asoc_machine_event),
};
/* Headphones Jack */
@@ -314,8 +314,8 @@ static int loongson_asoc_card_probe(struct platform_device *pdev)
card->num_links = ARRAY_SIZE(loongson_dai_links);
if (ls_priv->cfg->add_dapm_widgets) {
- card->dapm_widgets = loongson_aosc_dapm_widgets;
- card->num_dapm_widgets = ARRAY_SIZE(loongson_aosc_dapm_widgets);
+ card->dapm_widgets = loongson_asoc_dapm_widgets;
+ card->num_dapm_widgets = ARRAY_SIZE(loongson_asoc_dapm_widgets);
}
snd_soc_card_set_drvdata(card, ls_priv);
diff --git a/sound/soc/qcom/common.c b/sound/soc/qcom/common.c
--- a/sound/soc/qcom/common.c
+++ b/sound/soc/qcom/common.c
@@ -103,14 +103,14 @@ static int qcom_snd_parse_dai_tdm_slots(struct snd_soc_pcm_runtime *rtd,
int ret;
if (!link_np)
- return -EINVAL;
+ return -ENOENT;
struct device_node *cpu_np __free(device_node) =
of_get_child_by_name(link_np, "cpu");
struct device_node *codec_np __free(device_node) =
of_get_child_by_name(link_np, "codec");
if (!cpu_np || !codec_np)
- return -EINVAL;
+ return -ENOENT;
ret = qcom_snd_parse_tdm_slot(cpu_np, cpu_cfg);
if (ret)
@@ -172,7 +172,7 @@ int qcom_snd_apply_dai_tdm_slots(struct snd_soc_pcm_runtime *rtd)
ret = qcom_snd_get_dai_tdm_slots(rtd, &cpu_cfg, &codec_cfg);
if (ret)
- return ret == -EINVAL ? 0 : ret;
+ return ret == -ENOENT ? 0 : ret;
return qcom_snd_apply_dai_tdm_slots_cfg(rtd, &cpu_cfg, &codec_cfg);
}
diff --git a/sound/soc/qcom/qdsp6/q6apm-dai.c b/sound/soc/qcom/qdsp6/q6apm-dai.c
--- a/sound/soc/qcom/qdsp6/q6apm-dai.c
+++ b/sound/soc/qcom/qdsp6/q6apm-dai.c
@@ -216,7 +216,7 @@ static int q6apm_dai_prepare(struct snd_soc_component *component,
{
struct snd_pcm_runtime *runtime = substream->runtime;
struct q6apm_dai_rtd *prtd = runtime->private_data;
- struct audioreach_module_config cfg;
+ struct audioreach_module_config cfg = {};
struct device *dev = component->dev;
struct q6apm_dai_data *pdata;
int ret;
@@ -814,7 +814,7 @@ static int q6apm_dai_compr_set_params(struct snd_soc_component *component,
struct snd_compr_runtime *runtime = stream->runtime;
struct q6apm_dai_rtd *prtd = runtime->private_data;
struct q6apm_dai_data *pdata;
- struct audioreach_module_config cfg;
+ struct audioreach_module_config cfg = {};
struct snd_codec *codec = &params->codec;
int dir = stream->direction;
int ret;
diff --git a/sound/soc/qcom/qdsp6/q6prm-clocks.c b/sound/soc/qcom/qdsp6/q6prm-clocks.c
--- a/sound/soc/qcom/qdsp6/q6prm-clocks.c
+++ b/sound/soc/qcom/qdsp6/q6prm-clocks.c
@@ -64,34 +64,34 @@ static const struct q6dsp_clk_init q6prm_clks[] = {
Q6PRM_CLK(LPASS_CLK_ID_WSA2_CORE_TX_MCLK),
Q6PRM_CLK(LPASS_CLK_ID_WSA2_CORE_TX_2X_MCLK),
Q6PRM_CLK(LPASS_CLK_ID_RX_CORE_MCLK2_2X_MCLK),
- Q6PRM_CLK(LAPSS_CLK_ID_QAIF_IF0_IBIT),
- Q6PRM_CLK(LAPSS_CLK_ID_QAIF_IF0_EBIT),
- Q6PRM_CLK(LAPSS_CLK_ID_QAIF_IF1_IBIT),
- Q6PRM_CLK(LAPSS_CLK_ID_QAIF_IF1_EBIT),
- Q6PRM_CLK(LAPSS_CLK_ID_QAIF_IF2_IBIT),
- Q6PRM_CLK(LAPSS_CLK_ID_QAIF_IF2_EBIT),
- Q6PRM_CLK(LAPSS_CLK_ID_QAIF_IF3_IBIT),
- Q6PRM_CLK(LAPSS_CLK_ID_QAIF_IF3_EBIT),
- Q6PRM_CLK(LAPSS_CLK_ID_QAIF_IF4_IBIT),
- Q6PRM_CLK(LAPSS_CLK_ID_QAIF_IF4_EBIT),
- Q6PRM_CLK(LAPSS_CLK_ID_QAIF_IF5_IBIT),
- Q6PRM_CLK(LAPSS_CLK_ID_QAIF_IF5_EBIT),
- Q6PRM_CLK(LAPSS_CLK_ID_QAIF_IF6_IBIT),
- Q6PRM_CLK(LAPSS_CLK_ID_QAIF_IF6_EBIT),
- Q6PRM_CLK(LAPSS_CLK_ID_QAIF_IF7_IBIT),
- Q6PRM_CLK(LAPSS_CLK_ID_QAIF_IF7_EBIT),
- Q6PRM_CLK(LAPSS_CLK_ID_QAIF_IF8_IBIT),
- Q6PRM_CLK(LAPSS_CLK_ID_QAIF_IF8_EBIT),
- Q6PRM_CLK(LAPSS_CLK_ID_QAIF_IF9_IBIT),
- Q6PRM_CLK(LAPSS_CLK_ID_QAIF_IF9_EBIT),
- Q6PRM_CLK(LAPSS_CLK_ID_QAIF_IF10_IBIT),
- Q6PRM_CLK(LAPSS_CLK_ID_QAIF_IF10_EBIT),
- Q6PRM_CLK(LAPSS_CLK_ID_QAIF_IF11_IBIT),
- Q6PRM_CLK(LAPSS_CLK_ID_QAIF_IF11_EBIT),
- Q6PRM_CLK(LAPSS_CLK_ID_QAIF_IF12_IBIT),
- Q6PRM_CLK(LAPSS_CLK_ID_QAIF_IF12_EBIT),
- Q6PRM_CLK(LAPSS_CLK_ID_VA_QAIF_IF0_IBIT),
- Q6PRM_CLK(LAPSS_CLK_ID_VA_QAIF_IF0_EBIT),
+ Q6PRM_CLK(LPASS_CLK_ID_QAIF_IF0_IBIT),
+ Q6PRM_CLK(LPASS_CLK_ID_QAIF_IF0_EBIT),
+ Q6PRM_CLK(LPASS_CLK_ID_QAIF_IF1_IBIT),
+ Q6PRM_CLK(LPASS_CLK_ID_QAIF_IF1_EBIT),
+ Q6PRM_CLK(LPASS_CLK_ID_QAIF_IF2_IBIT),
+ Q6PRM_CLK(LPASS_CLK_ID_QAIF_IF2_EBIT),
+ Q6PRM_CLK(LPASS_CLK_ID_QAIF_IF3_IBIT),
+ Q6PRM_CLK(LPASS_CLK_ID_QAIF_IF3_EBIT),
+ Q6PRM_CLK(LPASS_CLK_ID_QAIF_IF4_IBIT),
+ Q6PRM_CLK(LPASS_CLK_ID_QAIF_IF4_EBIT),
+ Q6PRM_CLK(LPASS_CLK_ID_QAIF_IF5_IBIT),
+ Q6PRM_CLK(LPASS_CLK_ID_QAIF_IF5_EBIT),
+ Q6PRM_CLK(LPASS_CLK_ID_QAIF_IF6_IBIT),
+ Q6PRM_CLK(LPASS_CLK_ID_QAIF_IF6_EBIT),
+ Q6PRM_CLK(LPASS_CLK_ID_QAIF_IF7_IBIT),
+ Q6PRM_CLK(LPASS_CLK_ID_QAIF_IF7_EBIT),
+ Q6PRM_CLK(LPASS_CLK_ID_QAIF_IF8_IBIT),
+ Q6PRM_CLK(LPASS_CLK_ID_QAIF_IF8_EBIT),
+ Q6PRM_CLK(LPASS_CLK_ID_QAIF_IF9_IBIT),
+ Q6PRM_CLK(LPASS_CLK_ID_QAIF_IF9_EBIT),
+ Q6PRM_CLK(LPASS_CLK_ID_QAIF_IF10_IBIT),
+ Q6PRM_CLK(LPASS_CLK_ID_QAIF_IF10_EBIT),
+ Q6PRM_CLK(LPASS_CLK_ID_QAIF_IF11_IBIT),
+ Q6PRM_CLK(LPASS_CLK_ID_QAIF_IF11_EBIT),
+ Q6PRM_CLK(LPASS_CLK_ID_QAIF_IF12_IBIT),
+ Q6PRM_CLK(LPASS_CLK_ID_QAIF_IF12_EBIT),
+ Q6PRM_CLK(LPASS_CLK_ID_VA_QAIF_IF0_IBIT),
+ Q6PRM_CLK(LPASS_CLK_ID_VA_QAIF_IF0_EBIT),
Q6DSP_VOTE_CLK(LPASS_HW_MACRO_VOTE, Q6PRM_HW_CORE_ID_LPASS,
"LPASS_HW_MACRO"),
Q6DSP_VOTE_CLK(LPASS_HW_DCODEC_VOTE, Q6PRM_HW_CORE_ID_DCODEC,
diff --git a/sound/soc/qcom/qdsp6/q6prm.h b/sound/soc/qcom/qdsp6/q6prm.h
--- a/sound/soc/qcom/qdsp6/q6prm.h
+++ b/sound/soc/qcom/qdsp6/q6prm.h
@@ -97,34 +97,34 @@
/* Clock ID for RX CORE MCLK2 2X MCLK */
#define Q6PRM_LPASS_CLK_ID_RX_CORE_MCLK2_2X_MCLK 0x318
-#define Q6PRM_LAPSS_CLK_ID_QAIF_IF0_IBIT 0x500
-#define Q6PRM_LAPSS_CLK_ID_QAIF_IF0_EBIT 0x501
-#define Q6PRM_LAPSS_CLK_ID_QAIF_IF1_IBIT 0x502
-#define Q6PRM_LAPSS_CLK_ID_QAIF_IF1_EBIT 0x503
-#define Q6PRM_LAPSS_CLK_ID_QAIF_IF2_IBIT 0x504
-#define Q6PRM_LAPSS_CLK_ID_QAIF_IF2_EBIT 0x505
-#define Q6PRM_LAPSS_CLK_ID_QAIF_IF3_IBIT 0x506
-#define Q6PRM_LAPSS_CLK_ID_QAIF_IF3_EBIT 0x507
-#define Q6PRM_LAPSS_CLK_ID_QAIF_IF4_IBIT 0x508
-#define Q6PRM_LAPSS_CLK_ID_QAIF_IF4_EBIT 0x509
-#define Q6PRM_LAPSS_CLK_ID_QAIF_IF5_IBIT 0x50A
-#define Q6PRM_LAPSS_CLK_ID_QAIF_IF5_EBIT 0x50B
-#define Q6PRM_LAPSS_CLK_ID_QAIF_IF6_IBIT 0x50C
-#define Q6PRM_LAPSS_CLK_ID_QAIF_IF6_EBIT 0x50D
-#define Q6PRM_LAPSS_CLK_ID_QAIF_IF7_IBIT 0x50E
-#define Q6PRM_LAPSS_CLK_ID_QAIF_IF7_EBIT 0x50F
-#define Q6PRM_LAPSS_CLK_ID_QAIF_IF8_IBIT 0x510
-#define Q6PRM_LAPSS_CLK_ID_QAIF_IF8_EBIT 0x511
-#define Q6PRM_LAPSS_CLK_ID_QAIF_IF9_IBIT 0x512
-#define Q6PRM_LAPSS_CLK_ID_QAIF_IF9_EBIT 0x513
-#define Q6PRM_LAPSS_CLK_ID_QAIF_IF10_IBIT 0x514
-#define Q6PRM_LAPSS_CLK_ID_QAIF_IF10_EBIT 0x515
-#define Q6PRM_LAPSS_CLK_ID_QAIF_IF11_IBIT 0x516
-#define Q6PRM_LAPSS_CLK_ID_QAIF_IF11_EBIT 0x517
-#define Q6PRM_LAPSS_CLK_ID_QAIF_IF12_IBIT 0x518
-#define Q6PRM_LAPSS_CLK_ID_QAIF_IF12_EBIT 0x519
-#define Q6PRM_LAPSS_CLK_ID_VA_QAIF_IF0_IBIT 0x550
-#define Q6PRM_LAPSS_CLK_ID_VA_QAIF_IF0_EBIT 0x551
+#define Q6PRM_LPASS_CLK_ID_QAIF_IF0_IBIT 0x500
+#define Q6PRM_LPASS_CLK_ID_QAIF_IF0_EBIT 0x501
+#define Q6PRM_LPASS_CLK_ID_QAIF_IF1_IBIT 0x502
+#define Q6PRM_LPASS_CLK_ID_QAIF_IF1_EBIT 0x503
+#define Q6PRM_LPASS_CLK_ID_QAIF_IF2_IBIT 0x504
+#define Q6PRM_LPASS_CLK_ID_QAIF_IF2_EBIT 0x505
+#define Q6PRM_LPASS_CLK_ID_QAIF_IF3_IBIT 0x506
+#define Q6PRM_LPASS_CLK_ID_QAIF_IF3_EBIT 0x507
+#define Q6PRM_LPASS_CLK_ID_QAIF_IF4_IBIT 0x508
+#define Q6PRM_LPASS_CLK_ID_QAIF_IF4_EBIT 0x509
+#define Q6PRM_LPASS_CLK_ID_QAIF_IF5_IBIT 0x50A
+#define Q6PRM_LPASS_CLK_ID_QAIF_IF5_EBIT 0x50B
+#define Q6PRM_LPASS_CLK_ID_QAIF_IF6_IBIT 0x50C
+#define Q6PRM_LPASS_CLK_ID_QAIF_IF6_EBIT 0x50D
+#define Q6PRM_LPASS_CLK_ID_QAIF_IF7_IBIT 0x50E
+#define Q6PRM_LPASS_CLK_ID_QAIF_IF7_EBIT 0x50F
+#define Q6PRM_LPASS_CLK_ID_QAIF_IF8_IBIT 0x510
+#define Q6PRM_LPASS_CLK_ID_QAIF_IF8_EBIT 0x511
+#define Q6PRM_LPASS_CLK_ID_QAIF_IF9_IBIT 0x512
+#define Q6PRM_LPASS_CLK_ID_QAIF_IF9_EBIT 0x513
+#define Q6PRM_LPASS_CLK_ID_QAIF_IF10_IBIT 0x514
+#define Q6PRM_LPASS_CLK_ID_QAIF_IF10_EBIT 0x515
+#define Q6PRM_LPASS_CLK_ID_QAIF_IF11_IBIT 0x516
+#define Q6PRM_LPASS_CLK_ID_QAIF_IF11_EBIT 0x517
+#define Q6PRM_LPASS_CLK_ID_QAIF_IF12_IBIT 0x518
+#define Q6PRM_LPASS_CLK_ID_QAIF_IF12_EBIT 0x519
+#define Q6PRM_LPASS_CLK_ID_VA_QAIF_IF0_IBIT 0x550
+#define Q6PRM_LPASS_CLK_ID_VA_QAIF_IF0_EBIT 0x551
#define Q6PRM_LPASS_CLK_SRC_INTERNAL 1
#define Q6PRM_LPASS_CLK_ROOT_DEFAULT 0
diff --git a/sound/soc/qcom/sc8280xp.c b/sound/soc/qcom/sc8280xp.c
--- a/sound/soc/qcom/sc8280xp.c
+++ b/sound/soc/qcom/sc8280xp.c
@@ -115,33 +115,42 @@ static int sc8280xp_tdm_hw_params(struct snd_pcm_substream *substream,
struct snd_soc_dai *codec_dai;
struct qcom_snd_tdm_slot_cfg cpu_cfg;
struct qcom_snd_tdm_slot_cfg codec_cfg;
- unsigned int bclk_freq;
+ int bclk_freq;
int ret;
int i;
ret = qcom_snd_get_dai_tdm_slots(rtd, &cpu_cfg, &codec_cfg);
if (ret)
- return ret == -EINVAL ? 0 : ret;
+ return ret == -ENOENT ? 0 : ret;
if (!cpu_cfg.slots)
return 0;
ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_BP_FP);
- if (ret)
+ if (ret && ret != -ENOTSUPP)
return ret;
+ if (data->priv->codec_dai_fmt) {
+ for_each_rtd_codec_dais(rtd, i, codec_dai) {
+ ret = snd_soc_dai_set_fmt(codec_dai,
+ data->priv->codec_dai_fmt);
+ if (ret && ret != -ENOTSUPP)
+ return ret;
+ }
+ }
+
ret = qcom_snd_apply_dai_tdm_slots_cfg(rtd, &cpu_cfg, &codec_cfg);
if (ret)
return ret;
bclk_freq = snd_soc_tdm_params_to_bclk(params, cpu_cfg.slot_width, cpu_cfg.slots, 1);
- if (!bclk_freq)
+ if (bclk_freq <= 0)
return -EINVAL;
if (data->priv->mi2s_bclk_enable) {
ret = snd_soc_dai_set_sysclk(cpu_dai, LPAIF_MI2S_BCLK, bclk_freq,
SND_SOC_CLOCK_IN);
- if (ret) {
+ if (ret && ret != -ENOTSUPP) {
dev_err(rtd->dev, "%s: failed to set cpu sysclk: %d\n",
__func__, ret);
return ret;
@@ -152,7 +161,7 @@ static int sc8280xp_tdm_hw_params(struct snd_pcm_substream *substream,
for_each_rtd_codec_dais(rtd, i, codec_dai) {
ret = snd_soc_dai_set_sysclk(codec_dai, 0, bclk_freq,
SND_SOC_CLOCK_IN);
- if (ret) {
+ if (ret && ret != -ENOTSUPP) {
dev_err(rtd->dev, "%s: failed to set codec sysclk on %s: %d\n",
__func__, codec_dai->name, ret);
return ret;
diff --git a/sound/soc/sdw_utils/soc_sdw_rt_amp.c b/sound/soc/sdw_utils/soc_sdw_rt_amp.c
--- a/sound/soc/sdw_utils/soc_sdw_rt_amp.c
+++ b/sound/soc/sdw_utils/soc_sdw_rt_amp.c
@@ -252,11 +252,13 @@ int asoc_sdw_rt_amp_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai
if (ctx->amp_dev1) {
device_remove_software_node(ctx->amp_dev1);
put_device(ctx->amp_dev1);
+ ctx->amp_dev1 = NULL;
}
if (ctx->amp_dev2) {
device_remove_software_node(ctx->amp_dev2);
put_device(ctx->amp_dev2);
+ ctx->amp_dev2 = NULL;
}
return 0;
diff --git a/sound/soc/sdw_utils/soc_sdw_utils.c b/sound/soc/sdw_utils/soc_sdw_utils.c
--- a/sound/soc/sdw_utils/soc_sdw_utils.c
+++ b/sound/soc/sdw_utils/soc_sdw_utils.c
@@ -81,6 +81,7 @@ struct asoc_sdw_codec_info codec_info_list[] = {
/* speaker */
.direction = {true, false},
.dai_name = "tac5xx2-aif1",
+ .component_name = "tac5572",
.dai_type = SOC_SDW_DAI_TYPE_AMP,
.dailink = {SOC_SDW_AMP_OUT_DAI_ID, SOC_SDW_UNUSED_DAI_ID},
.init = asoc_sdw_ti_amp_init,
@@ -94,6 +95,7 @@ struct asoc_sdw_codec_info codec_info_list[] = {
/* mic */
.direction = {false, true},
.dai_name = "tac5xx2-aif2",
+ .component_name = "tac5572",
.dai_type = SOC_SDW_DAI_TYPE_MIC,
.dailink = {SOC_SDW_UNUSED_DAI_ID, SOC_SDW_DMIC_DAI_ID},
.rtd_init = asoc_sdw_ti_dmic_rtd_init,
@@ -102,6 +104,7 @@ struct asoc_sdw_codec_info codec_info_list[] = {
/* UAJ */
.direction = {true, true},
.dai_name = "tac5xx2-aif3",
+ .component_name = "tac5572",
.dai_type = SOC_SDW_DAI_TYPE_JACK,
.dailink = {SOC_SDW_JACK_OUT_DAI_ID, SOC_SDW_JACK_IN_DAI_ID},
.controls = generic_jack_controls,
@@ -122,6 +125,7 @@ struct asoc_sdw_codec_info codec_info_list[] = {
/* speaker with IV sense feedback */
.direction = {true, true},
.dai_name = "tac5xx2-aif1",
+ .component_name = "tac5672",
.dai_type = SOC_SDW_DAI_TYPE_AMP,
.dailink = {SOC_SDW_AMP_OUT_DAI_ID, SOC_SDW_AMP_IN_DAI_ID},
.init = asoc_sdw_ti_amp_init,
@@ -135,6 +139,7 @@ struct asoc_sdw_codec_info codec_info_list[] = {
/* mic */
.direction = {false, true},
.dai_name = "tac5xx2-aif2",
+ .component_name = "tac5672",
.dai_type = SOC_SDW_DAI_TYPE_MIC,
.dailink = {SOC_SDW_UNUSED_DAI_ID, SOC_SDW_DMIC_DAI_ID},
.rtd_init = asoc_sdw_ti_dmic_rtd_init,
@@ -143,6 +148,7 @@ struct asoc_sdw_codec_info codec_info_list[] = {
/* UAJ */
.direction = {true, true},
.dai_name = "tac5xx2-aif3",
+ .component_name = "tac5672",
.dai_type = SOC_SDW_DAI_TYPE_JACK,
.dailink = {SOC_SDW_JACK_OUT_DAI_ID, SOC_SDW_JACK_IN_DAI_ID},
.controls = generic_jack_controls,
@@ -163,6 +169,7 @@ struct asoc_sdw_codec_info codec_info_list[] = {
/* speaker with echo reference feedback */
.direction = {true, true},
.dai_name = "tac5xx2-aif1",
+ .component_name = "tac5682",
.dai_type = SOC_SDW_DAI_TYPE_AMP,
.dailink = {SOC_SDW_AMP_OUT_DAI_ID, SOC_SDW_AMP_IN_DAI_ID},
.init = asoc_sdw_ti_amp_init,
@@ -176,6 +183,7 @@ struct asoc_sdw_codec_info codec_info_list[] = {
/* mic */
.direction = {false, true},
.dai_name = "tac5xx2-aif2",
+ .component_name = "tac5682",
.dai_type = SOC_SDW_DAI_TYPE_MIC,
.dailink = {SOC_SDW_UNUSED_DAI_ID, SOC_SDW_DMIC_DAI_ID},
.rtd_init = asoc_sdw_ti_dmic_rtd_init,
@@ -184,6 +192,7 @@ struct asoc_sdw_codec_info codec_info_list[] = {
/* UAJ */
.direction = {true, true},
.dai_name = "tac5xx2-aif3",
+ .component_name = "tac5682",
.dai_type = SOC_SDW_DAI_TYPE_JACK,
.dailink = {SOC_SDW_JACK_OUT_DAI_ID, SOC_SDW_JACK_IN_DAI_ID},
.controls = generic_jack_controls,
@@ -203,6 +212,7 @@ struct asoc_sdw_codec_info codec_info_list[] = {
{
.direction = {true, false},
.dai_name = "tac5xx2-aif1",
+ .component_name = "tas2883",
.dai_type = SOC_SDW_DAI_TYPE_AMP,
.dailink = {SOC_SDW_AMP_OUT_DAI_ID, SOC_SDW_UNUSED_DAI_ID},
.init = asoc_sdw_ti_amp_init,
@@ -216,6 +226,7 @@ struct asoc_sdw_codec_info codec_info_list[] = {
/* mic */
.direction = {false, true},
.dai_name = "tac5xx2-aif2",
+ .component_name = "tas2883",
.dai_type = SOC_SDW_DAI_TYPE_MIC,
.dailink = {SOC_SDW_UNUSED_DAI_ID, SOC_SDW_DMIC_DAI_ID},
.rtd_init = asoc_sdw_ti_dmic_rtd_init,
@@ -1510,9 +1521,24 @@ int asoc_sdw_trigger(struct snd_pcm_substream *substream, int cmd)
}
switch (cmd) {
+ case SNDRV_PCM_TRIGGER_RESUME:
+ /*
+ * The peripherals lose their port configuration when the
+ * controller is power-gated during system suspend, and an
+ * application that restarts the stream with
+ * SNDRV_PCM_IOCTL_RESUME - which platforms advertising
+ * SNDRV_PCM_INFO_RESUME allow - never goes through
+ * .prepare() again. Prepare the stream here so that the
+ * ports are reprogrammed before they are enabled;
+ * sdw_prepare_stream() reapplies the parameters without
+ * recomputing them when the stream is disabled.
+ */
+ ret = sdw_prepare_stream(sdw_stream);
+ if (ret)
+ break;
+ fallthrough;
case SNDRV_PCM_TRIGGER_START:
case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
- case SNDRV_PCM_TRIGGER_RESUME:
ret = sdw_enable_stream(sdw_stream);
break;
diff --git a/sound/soc/soc-generic-dmaengine-pcm.c b/sound/soc/soc-generic-dmaengine-pcm.c
--- a/sound/soc/soc-generic-dmaengine-pcm.c
+++ b/sound/soc/soc-generic-dmaengine-pcm.c
@@ -397,24 +397,8 @@ static int dmaengine_pcm_request_chan_of(struct dmaengine_pcm *pcm,
if (PTR_ERR(chan) == -EPROBE_DEFER)
return -EPROBE_DEFER;
- bool has_fw_node = dev->of_node || is_acpi_device_node(dev->fwnode);
- bool name_exists_in_fw = false;
-
- if (has_fw_node)
- name_exists_in_fw = device_property_match_string(dev,
- "dma-names",
- name) >= 0;
-
- if (has_fw_node && name_exists_in_fw)
- dev_warn(dev, "DTS/ACPI DMA channel '%s' request failed (%ld)\n",
- name, PTR_ERR(chan));
-
- if (has_fw_node && !name_exists_in_fw)
- dev_warn(dev, "DTS/ACPI name '%s' not found, legacy failed (%ld)\n",
- name, PTR_ERR(chan));
-
- if (!has_fw_node)
- dev_warn(dev, "Legacy DMA channel '%s' request failed (%ld)\n",
+ if (device_property_match_string(dev, "dma-names", name) >= 0)
+ dev_warn(dev, "dma-names has '%s' but request failed (%ld)\n",
name, PTR_ERR(chan));
pcm->chan[i] = NULL;
Reference in new issue View Git Blame Copy Permalink