* [PATCH 0/2] ASoC: wcd934x: minor fixes
@ 2020-03-06 13:28 Srinivas Kandagatla
2020-03-06 13:28 ` [PATCH 1/2] ASoC: wcd934x: fix High Accuracy Buck enable Srinivas Kandagatla
2020-03-06 13:28 ` [PATCH 2/2] ASoC: wcd934x: remove unused headers Srinivas Kandagatla
0 siblings, 2 replies; 5+ messages in thread
From: Srinivas Kandagatla @ 2020-03-06 13:28 UTC (permalink / raw)
To: broonie; +Cc: alsa-devel, lgirdwood, perex, linux-kernel, Srinivas Kandagatla
This patchset has 1 fix and a header cleanup found during
recent testing.
Srinivas Kandagatla (2):
ASoC: wcd934x: fix High Accuracy Buck enable
ASoC: wcd934x: remove unused headers
sound/soc/codecs/wcd934x.c | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
--
2.21.0
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/2] ASoC: wcd934x: fix High Accuracy Buck enable
2020-03-06 13:28 [PATCH 0/2] ASoC: wcd934x: minor fixes Srinivas Kandagatla
@ 2020-03-06 13:28 ` Srinivas Kandagatla
2020-03-06 15:03 ` Applied "ASoC: wcd934x: fix High Accuracy Buck enable" to the asoc tree Mark Brown
2020-03-06 13:28 ` [PATCH 2/2] ASoC: wcd934x: remove unused headers Srinivas Kandagatla
1 sibling, 1 reply; 5+ messages in thread
From: Srinivas Kandagatla @ 2020-03-06 13:28 UTC (permalink / raw)
To: broonie; +Cc: alsa-devel, lgirdwood, perex, linux-kernel, Srinivas Kandagatla
High Accuracy buck is not applicable when we use RCO Band Gap source,
so move it back to correct place.
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
---
sound/soc/codecs/wcd934x.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/sound/soc/codecs/wcd934x.c b/sound/soc/codecs/wcd934x.c
index aefaadfba8a1..83d643a07775 100644
--- a/sound/soc/codecs/wcd934x.c
+++ b/sound/soc/codecs/wcd934x.c
@@ -1202,11 +1202,6 @@ static int wcd934x_set_sido_input_src(struct wcd934x_codec *wcd, int sido_src)
regmap_update_bits(wcd->regmap, WCD934X_ANA_RCO,
WCD934X_ANA_RCO_BG_EN_MASK, 0);
usleep_range(100, 110);
- } else if (sido_src == SIDO_SOURCE_RCO_BG) {
- regmap_update_bits(wcd->regmap, WCD934X_ANA_RCO,
- WCD934X_ANA_RCO_BG_EN_MASK,
- WCD934X_ANA_RCO_BG_ENABLE);
- usleep_range(100, 110);
regmap_update_bits(wcd->regmap, WCD934X_ANA_BUCK_CTL,
WCD934X_ANA_BUCK_PRE_EN1_MASK,
WCD934X_ANA_BUCK_PRE_EN1_ENABLE);
@@ -1219,6 +1214,11 @@ static int wcd934x_set_sido_input_src(struct wcd934x_codec *wcd, int sido_src)
WCD934X_ANA_BUCK_HI_ACCU_EN_MASK,
WCD934X_ANA_BUCK_HI_ACCU_ENABLE);
usleep_range(100, 110);
+ } else if (sido_src == SIDO_SOURCE_RCO_BG) {
+ regmap_update_bits(wcd->regmap, WCD934X_ANA_RCO,
+ WCD934X_ANA_RCO_BG_EN_MASK,
+ WCD934X_ANA_RCO_BG_ENABLE);
+ usleep_range(100, 110);
}
wcd->sido_input_src = sido_src;
--
2.21.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] ASoC: wcd934x: remove unused headers
2020-03-06 13:28 [PATCH 0/2] ASoC: wcd934x: minor fixes Srinivas Kandagatla
2020-03-06 13:28 ` [PATCH 1/2] ASoC: wcd934x: fix High Accuracy Buck enable Srinivas Kandagatla
@ 2020-03-06 13:28 ` Srinivas Kandagatla
2020-03-06 15:03 ` Applied "ASoC: wcd934x: remove unused headers" to the asoc tree Mark Brown
1 sibling, 1 reply; 5+ messages in thread
From: Srinivas Kandagatla @ 2020-03-06 13:28 UTC (permalink / raw)
To: broonie
Cc: alsa-devel, lgirdwood, perex, linux-kernel, Srinivas Kandagatla,
Stephen Boyd
Looks like there are some unused headers, remove them.
Seems to be missed while moving to mfd.
Reported-by: Stephen Boyd <swboyd@chromium.org>
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
---
sound/soc/codecs/wcd934x.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/sound/soc/codecs/wcd934x.c b/sound/soc/codecs/wcd934x.c
index 83d643a07775..5269857e2746 100644
--- a/sound/soc/codecs/wcd934x.c
+++ b/sound/soc/codecs/wcd934x.c
@@ -3,7 +3,6 @@
#include <linux/clk.h>
#include <linux/clk-provider.h>
-#include <linux/gpio.h>
#include <linux/interrupt.h>
#include <linux/kernel.h>
#include <linux/mfd/wcd934x/registers.h>
@@ -11,10 +10,7 @@
#include <linux/module.h>
#include <linux/mutex.h>
#include <linux/of_clk.h>
-#include <linux/of_device.h>
-#include <linux/of_gpio.h>
#include <linux/of.h>
-#include <linux/of_irq.h>
#include <linux/platform_device.h>
#include <linux/regmap.h>
#include <linux/regulator/consumer.h>
--
2.21.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Applied "ASoC: wcd934x: remove unused headers" to the asoc tree
2020-03-06 13:28 ` [PATCH 2/2] ASoC: wcd934x: remove unused headers Srinivas Kandagatla
@ 2020-03-06 15:03 ` Mark Brown
0 siblings, 0 replies; 5+ messages in thread
From: Mark Brown @ 2020-03-06 15:03 UTC (permalink / raw)
To: Srinivas Kandagatla
Cc: alsa-devel, broonie, lgirdwood, linux-kernel, Mark Brown, Stephen Boyd
The patch
ASoC: wcd934x: remove unused headers
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
From e0e247d593f78f4ac5647a9ef2c6db8f918ecbdc Mon Sep 17 00:00:00 2001
From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Date: Fri, 6 Mar 2020 13:28:06 +0000
Subject: [PATCH] ASoC: wcd934x: remove unused headers
Looks like there are some unused headers, remove them.
Seems to be missed while moving to mfd.
Reported-by: Stephen Boyd <swboyd@chromium.org>
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20200306132806.19684-3-srinivas.kandagatla@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/codecs/wcd934x.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/sound/soc/codecs/wcd934x.c b/sound/soc/codecs/wcd934x.c
index 83d643a07775..5269857e2746 100644
--- a/sound/soc/codecs/wcd934x.c
+++ b/sound/soc/codecs/wcd934x.c
@@ -3,7 +3,6 @@
#include <linux/clk.h>
#include <linux/clk-provider.h>
-#include <linux/gpio.h>
#include <linux/interrupt.h>
#include <linux/kernel.h>
#include <linux/mfd/wcd934x/registers.h>
@@ -11,10 +10,7 @@
#include <linux/module.h>
#include <linux/mutex.h>
#include <linux/of_clk.h>
-#include <linux/of_device.h>
-#include <linux/of_gpio.h>
#include <linux/of.h>
-#include <linux/of_irq.h>
#include <linux/platform_device.h>
#include <linux/regmap.h>
#include <linux/regulator/consumer.h>
--
2.20.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Applied "ASoC: wcd934x: fix High Accuracy Buck enable" to the asoc tree
2020-03-06 13:28 ` [PATCH 1/2] ASoC: wcd934x: fix High Accuracy Buck enable Srinivas Kandagatla
@ 2020-03-06 15:03 ` Mark Brown
0 siblings, 0 replies; 5+ messages in thread
From: Mark Brown @ 2020-03-06 15:03 UTC (permalink / raw)
To: Srinivas Kandagatla
Cc: alsa-devel, broonie, lgirdwood, linux-kernel, Mark Brown
The patch
ASoC: wcd934x: fix High Accuracy Buck enable
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
From 820766c1e16651b46bfb771afae8d789da1986cf Mon Sep 17 00:00:00 2001
From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Date: Fri, 6 Mar 2020 13:28:05 +0000
Subject: [PATCH] ASoC: wcd934x: fix High Accuracy Buck enable
High Accuracy buck is not applicable when we use RCO Band Gap source,
so move it back to correct place.
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20200306132806.19684-2-srinivas.kandagatla@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/codecs/wcd934x.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/sound/soc/codecs/wcd934x.c b/sound/soc/codecs/wcd934x.c
index aefaadfba8a1..83d643a07775 100644
--- a/sound/soc/codecs/wcd934x.c
+++ b/sound/soc/codecs/wcd934x.c
@@ -1202,11 +1202,6 @@ static int wcd934x_set_sido_input_src(struct wcd934x_codec *wcd, int sido_src)
regmap_update_bits(wcd->regmap, WCD934X_ANA_RCO,
WCD934X_ANA_RCO_BG_EN_MASK, 0);
usleep_range(100, 110);
- } else if (sido_src == SIDO_SOURCE_RCO_BG) {
- regmap_update_bits(wcd->regmap, WCD934X_ANA_RCO,
- WCD934X_ANA_RCO_BG_EN_MASK,
- WCD934X_ANA_RCO_BG_ENABLE);
- usleep_range(100, 110);
regmap_update_bits(wcd->regmap, WCD934X_ANA_BUCK_CTL,
WCD934X_ANA_BUCK_PRE_EN1_MASK,
WCD934X_ANA_BUCK_PRE_EN1_ENABLE);
@@ -1219,6 +1214,11 @@ static int wcd934x_set_sido_input_src(struct wcd934x_codec *wcd, int sido_src)
WCD934X_ANA_BUCK_HI_ACCU_EN_MASK,
WCD934X_ANA_BUCK_HI_ACCU_ENABLE);
usleep_range(100, 110);
+ } else if (sido_src == SIDO_SOURCE_RCO_BG) {
+ regmap_update_bits(wcd->regmap, WCD934X_ANA_RCO,
+ WCD934X_ANA_RCO_BG_EN_MASK,
+ WCD934X_ANA_RCO_BG_ENABLE);
+ usleep_range(100, 110);
}
wcd->sido_input_src = sido_src;
--
2.20.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-03-06 15:03 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-03-06 13:28 [PATCH 0/2] ASoC: wcd934x: minor fixes Srinivas Kandagatla
2020-03-06 13:28 ` [PATCH 1/2] ASoC: wcd934x: fix High Accuracy Buck enable Srinivas Kandagatla
2020-03-06 15:03 ` Applied "ASoC: wcd934x: fix High Accuracy Buck enable" to the asoc tree Mark Brown
2020-03-06 13:28 ` [PATCH 2/2] ASoC: wcd934x: remove unused headers Srinivas Kandagatla
2020-03-06 15:03 ` Applied "ASoC: wcd934x: remove unused headers" to the asoc tree Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).