Skip to contentSkip to conversation

ASoC: rt5659: Remove the routing path of the power widget "LDO2"

PATCH In review Oder Chiou 2 participants 4 messages Feb 5, 2018 – Feb 12, 2018

Subsystems (3)
lore
Share & tools
lore

Oder Chiou

author maintainer
#0 lore raw

PATCH 1/2 ASoC: rt5659: Remove the routing path of the power widget "LDO2"

This patch removes the routing path of the power widget "LDO2", and it should be depended on the hardware design. The power widget "LDO2" should add the routing path with the MICBIAS in the machine driver that is reasonable.

---
 sound/soc/codecs/rt5659.c | 5 -----
 1 file changed, 5 deletions(-)
sound/soc/codecs/rt5659.c +0 -5
index 07e7757..4ec1917 100644
@@ -2818,11 +2818,6 @@ static const struct snd_soc_dapm_route rt5659_dapm_routes[] = {
 	{ "I2S2", NULL, "I2S2 ASRC" },
 	{ "I2S3", NULL, "I2S3 ASRC" },
 
-	{ "IN1P", NULL, "LDO2" },
-	{ "IN2P", NULL, "LDO2" },
-	{ "IN3P", NULL, "LDO2" },
-	{ "IN4P", NULL, "LDO2" },
-
 	{ "DMIC1", NULL, "DMIC L1" },
 	{ "DMIC1", NULL, "DMIC R1" },
 	{ "DMIC2", NULL, "DMIC L2" },
Signature · 1 line
2.7.4
author maintainer
#1 lore raw

PATCH 2/2 ASoC: rt5659: Add the support of Intel HDA Header

The patch adds the support of Intel HDA Header.

---
 include/sound/rt5659.h    |   1 +
 sound/soc/codecs/rt5659.c | 118 ++++++++++++++++++++++++++++++++++++++++++++--
 sound/soc/codecs/rt5659.h |   3 +-
 3 files changed, 117 insertions(+), 5 deletions(-)
include/sound/rt5659.h +1 -0
index 656c4d5..9012e2b 100644
@@ -30,6 +30,7 @@ enum rt5659_dmic2_data_pin {
 enum rt5659_jd_src {
 	RT5659_JD_NULL,
 	RT5659_JD3,
+	RT5659_JD_HDA_HEADER,
 };
 
 struct rt5659_platform_data {
sound/soc/codecs/rt5659.c +114 -4

142 lines not on this page · raw message

sound/soc/codecs/rt5659.h +2 -1
index 8f1aeef..bea0433 100644
@@ -1810,7 +1810,8 @@ struct rt5659_priv {
 	int pll_out;
 
 	int jack_type;
-
+	bool hda_hp_plugged;
+	bool hda_mic_plugged;
 };
 
 int rt5659_set_jack_detect(struct snd_soc_codec *codec,
Signature · 1 line
2.7.4
maintainer
#3 lore raw

Applied "ASoC: rt5659: Remove the routing path of the power widget "LDO2"" to the asoc tree

In reply to Oder Chiou

The patch

ASoC: rt5659: Remove the routing path of the power widget "LDO2"

has been applied to the asoc tree at

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks,
Mark

Quoted 1 line

From b44483eff7fb3b8c96ee763fe4e84c7933882709 Mon Sep 17 00:00:00 2001

From: "[email protected]" <[email protected]>
Date: Mon, 5 Feb 2018 18:29:55 +0800
Subject: [PATCH] ASoC: rt5659: Remove the routing path of the power widget
"LDO2"

This patch removes the routing path of the power widget "LDO2", and it should be depended on the hardware design. The power widget "LDO2" should add the routing path with the MICBIAS in the machine driver that is reasonable.

---
 sound/soc/codecs/rt5659.c | 5 -----
 1 file changed, 5 deletions(-)
sound/soc/codecs/rt5659.c +0 -5
index dbc7dbfe8c6f..c4a704e9a4db 100644
@@ -2873,11 +2873,6 @@ static const struct snd_soc_dapm_route rt5659_dapm_routes[] = {
 	{ "I2S2", NULL, "I2S2 ASRC" },
 	{ "I2S3", NULL, "I2S3 ASRC" },
 
-	{ "IN1P", NULL, "LDO2" },
-	{ "IN2P", NULL, "LDO2" },
-	{ "IN3P", NULL, "LDO2" },
-	{ "IN4P", NULL, "LDO2" },
-
 	{ "DMIC1", NULL, "DMIC L1" },
 	{ "DMIC1", NULL, "DMIC R1" },
 	{ "DMIC2", NULL, "DMIC L2" },
Signature · 1 line
2.16.1
maintainer
#2 lore raw

Applied "ASoC: rt5659: Add the support of Intel HDA Header" to the asoc tree

In reply to Oder Chiou

The patch

ASoC: rt5659: Add the support of Intel HDA Header

has been applied to the asoc tree at

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks,
Mark

Quoted 1 line

From 041e74b71491acadad74b275e8b05add165d92b4 Mon Sep 17 00:00:00 2001

From: "[email protected]" <[email protected]>
Date: Mon, 5 Feb 2018 18:29:56 +0800
Subject: [PATCH] ASoC: rt5659: Add the support of Intel HDA Header

The patch adds the support of Intel HDA Header.

---
 include/sound/rt5659.h    |   1 +
 sound/soc/codecs/rt5659.c | 118 ++++++++++++++++++++++++++++++++++++++++++++--
 sound/soc/codecs/rt5659.h |   3 +-
 3 files changed, 117 insertions(+), 5 deletions(-)
include/sound/rt5659.h +1 -0
index 656c4d58948d..9012e2b25360 100644
@@ -30,6 +30,7 @@ enum rt5659_dmic2_data_pin {
 enum rt5659_jd_src {
 	RT5659_JD_NULL,
 	RT5659_JD3,
+	RT5659_JD_HDA_HEADER,
 };
 
 struct rt5659_platform_data {
sound/soc/codecs/rt5659.c +114 -4

142 lines not on this page · raw message

sound/soc/codecs/rt5659.h +2 -1
index 8f1aeef08489..bea0433c164c 100644
@@ -1810,7 +1810,8 @@ struct rt5659_priv {
 	int pll_out;
 
 	int jack_type;
-
+	bool hda_hp_plugged;
+	bool hda_mic_plugged;
 };
 
 int rt5659_set_jack_detect(struct snd_soc_codec *codec,
Signature · 1 line
2.16.1