Skip to contentSkip to conversation

ASoC: Correct typo in SOC_VALUE_ENUM_SINGLE macro

PATCH Applied Charles Keepax 3 participants 12 messages May 1, 2015 – May 6, 2015

Subsystems (3)
Sound ASoC Wolfson microelectronics drivers
lore
Share & tools
lore

Charles Keepax

author
#0 lore raw

PATCH v3 1/5 ASoC: Correct typo in SOC_VALUE_ENUM_SINGLE macro

xnitmes is clearly intended to be xnitems, but all other macros just refer to this as xitems, so change it to that.

Signed-off-by Charles Keepax <[email protected]>

---

Changes since v2:
- Use snd_soc_enum_item_to_val to get zero value from mux to account for non-value enums
- Improve handling in snd_soc_dapm_put_enum_double of the situation where the register and widget views of the control values don't match

Thanks,
Charles

 include/sound/soc.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
include/sound/soc.h +2 -2
index a73d855..45cfd69 100644
@@ -190,8 +190,8 @@
 #define SOC_VALUE_ENUM_DOUBLE(xreg, xshift_l, xshift_r, xmask, xitems, xtexts, xvalues) \
 {	.reg = xreg, .shift_l = xshift_l, .shift_r = xshift_r, \
 	.mask = xmask, .items = xitems, .texts = xtexts, .values = xvalues}
-#define SOC_VALUE_ENUM_SINGLE(xreg, xshift, xmask, xnitmes, xtexts, xvalues) \
-	SOC_VALUE_ENUM_DOUBLE(xreg, xshift, xshift, xmask, xnitmes, xtexts, xvalues)
+#define SOC_VALUE_ENUM_SINGLE(xreg, xshift, xmask, xitems, xtexts, xvalues) \
+	SOC_VALUE_ENUM_DOUBLE(xreg, xshift, xshift, xmask, xitems, xtexts, xvalues)
 #define SOC_ENUM_SINGLE_VIRT(xitems, xtexts) \
 	SOC_ENUM_SINGLE(SND_SOC_NOPM, 0, xitems, xtexts)
 #define SOC_ENUM(xname, xenum) \
Signature · 1 line
1.7.2.5
author
#1 lore raw

PATCH v3 2/5 ASoC: dapm: Remove local OOM error message

The memory subsystem is pretty chatty on failure no need to have local OOM messages as well.

Signed-off-by Charles Keepax <[email protected]>
---
 sound/soc/soc-dapm.c |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)
sound/soc/soc-dapm.c +1 -5
index 79b9478..beb48b6 100644
@@ -310,12 +310,8 @@ static int dapm_kcontrol_data_alloc(struct snd_soc_dapm_widget *widget,
 	struct soc_mixer_control *mc;
 
 	data = kzalloc(sizeof(*data), GFP_KERNEL);
-	if (!data) {
-		dev_err(widget->dapm->dev,
-				"ASoC: can't allocate kcontrol data for %s\n",
-				widget->name);
+	if (!data)
 		return -ENOMEM;
-	}
 
 	INIT_LIST_HEAD(&data->paths);
Signature · 1 line
1.7.2.5
maintainer Applied
#2 lore raw

Re: [PATCH v3 2/5] ASoC: dapm: Remove local OOM error message

Quoted 2 lines · Charles Keepax

The memory subsystem is pretty chatty on failure no need to have local OOM messages as well.

Applied, thanks.

author
#3 lore raw

PATCH v3 3/5 ASoC: dapm: Append "Autodisable" to autodisable widget names

In reply to Charles Keepax

This makes it a little easier to follow what is happening in debugfs. Additionally is also useful in facilitating work to add autodisable muxes because the control name is already used for the mux widget and thus shouldn't be reused for the autodisable widget.

Signed-off-by Charles Keepax <[email protected]>
---
 sound/soc/soc-dapm.c |   23 ++++++++++++++++++++---
 1 files changed, 20 insertions(+), 3 deletions(-)
sound/soc/soc-dapm.c +20 -3
index beb48b6..a0d97f8 100644
@@ -308,6 +308,8 @@ static int dapm_kcontrol_data_alloc(struct snd_soc_dapm_widget *widget,
 {
 	struct dapm_kcontrol_data *data;
 	struct soc_mixer_control *mc;
+	const char *name;
+	int ret;
 
 	data = kzalloc(sizeof(*data), GFP_KERNEL);
 	if (!data)

@@ -324,6 +326,13 @@ static int dapm_kcontrol_data_alloc(struct snd_soc_dapm_widget *widget,
 		if (mc->autodisable) {
 			struct snd_soc_dapm_widget template;
 
+			name = kasprintf(GFP_KERNEL, "%s %s", kcontrol->id.name,
+					 "Autodisable");
+			if (!name) {
+				ret = -ENOMEM;
+				goto err_data;
+			}
+
 			memset(&template, 0, sizeof(template));
 			template.reg = mc->reg;
 			template.mask = (1 << fls(mc->max)) - 1;

@@ -334,15 +343,15 @@ static int dapm_kcontrol_data_alloc(struct snd_soc_dapm_widget *widget,
 				template.off_val = 0;
 			template.on_val = template.off_val;
 			template.id = snd_soc_dapm_kcontrol;
-			template.name = kcontrol->id.name;
+			template.name = name;
 
 			data->value = template.on_val;
 
 			data->widget = snd_soc_dapm_new_control(widget->dapm,
 				&template);
 			if (!data->widget) {
-				kfree(data);
-				return -ENOMEM;
+				ret = -ENOMEM;
+				goto err_name;
 			}
 		}
 		break;

@@ -353,11 +362,19 @@ static int dapm_kcontrol_data_alloc(struct snd_soc_dapm_widget *widget,
 	kcontrol->private_data = data;
 
 	return 0;
+
+err_name:
+	kfree(name);
+err_data:
+	kfree(data);
+	return ret;
 }
 
 static void dapm_kcontrol_free(struct snd_kcontrol *kctl)
 {
 	struct dapm_kcontrol_data *data = snd_kcontrol_chip(kctl);
+	if (data->widget)
+		kfree(data->widget->name);
 	kfree(data->wlist);
 	kfree(data);
 }
Signature · 1 line
1.7.2.5
maintainer Applied
#4 lore raw

Re: [PATCH v3 3/5] ASoC: dapm: Append "Autodisable" to autodisable widget names

Quoted 4 lines · Charles Keepax

This makes it a little easier to follow what is happening in debugfs. Additionally is also useful in facilitating work to add autodisable muxes because the control name is already used for the mux widget and thus shouldn't be reused for the autodisable widget.

Applied, thanks.

author
#5 lore raw

PATCH v3 4/5 ASoC: dapm: Add support for autodisable mux controls

In reply to Charles Keepax

Commit 57295073b6ac ("ASoC: dapm: Implement mixer input auto-disable") added support for autodisable controls, controls whose values are only written to the hardware when their respective widgets are powered up. But it only added support for controls based on the mixer abstraction.

This patch add support for mux controls (DAPM controls based on the enum abstraction) to be auto-disabled as well. As each mux can only have a single control, there is no need to tie the autodisable widget to the inputs (as is done for the mixer controls) it can be tided directly to the mux widget itself.

Note that it is assumed that the first entry in a autodisable mux control will always represent the off state for the mux and is what the mux will be set to whilst it is disabled.

Signed-off-by Charles Keepax <[email protected]>
---
 include/sound/soc.h  |   10 ++++++
 sound/soc/soc-dapm.c |   78 +++++++++++++++++++++++++++++++++++++------------
 2 files changed, 69 insertions(+), 19 deletions(-)
include/sound/soc.h +10 -0
index 45cfd69..28b8ae6 100644
@@ -192,6 +192,10 @@
 	.mask = xmask, .items = xitems, .texts = xtexts, .values = xvalues}
 #define SOC_VALUE_ENUM_SINGLE(xreg, xshift, xmask, xitems, xtexts, xvalues) \
 	SOC_VALUE_ENUM_DOUBLE(xreg, xshift, xshift, xmask, xitems, xtexts, xvalues)
+#define SOC_VALUE_ENUM_SINGLE_AUTODISABLE(xreg, xshift, xmask, xitems, xtexts, xvalues) \
+{	.reg = xreg, .shift_l = xshift, .shift_r = xshift, \
+	.mask = xmask, .items = xitems, .texts = xtexts, \
+	.values = xvalues, .autodisable = 1}
 #define SOC_ENUM_SINGLE_VIRT(xitems, xtexts) \
 	SOC_ENUM_SINGLE(SND_SOC_NOPM, 0, xitems, xtexts)
 #define SOC_ENUM(xname, xenum) \

@@ -312,6 +316,11 @@
 							ARRAY_SIZE(xtexts), xtexts, xvalues)
 #define SOC_VALUE_ENUM_SINGLE_DECL(name, xreg, xshift, xmask, xtexts, xvalues) \
 	SOC_VALUE_ENUM_DOUBLE_DECL(name, xreg, xshift, xshift, xmask, xtexts, xvalues)
+
+#define SOC_VALUE_ENUM_SINGLE_AUTODISABLE_DECL(name, xreg, xshift, xmask, xtexts, xvalues) \
+	const struct soc_enum name = SOC_VALUE_ENUM_SINGLE_AUTODISABLE(xreg, \
+		xshift, xmask, ARRAY_SIZE(xtexts), xtexts, xvalues)
+
 #define SOC_ENUM_SINGLE_VIRT_DECL(name, xtexts) \
 	const struct soc_enum name = SOC_ENUM_SINGLE_VIRT(ARRAY_SIZE(xtexts), xtexts)
 

@@ -1200,6 +1209,7 @@ struct soc_enum {
 	unsigned int mask;
 	const char * const *texts;
 	const unsigned int *values;
+	unsigned int autodisable:1;
 };
 
 /**
sound/soc/soc-dapm.c +59 -19

146 lines not on this page · raw message

Signature · 1 line
1.7.2.5
maintainer Applied
#6 lore raw

Re: [PATCH v3 4/5] ASoC: dapm: Add support for autodisable mux controls

Quoted 4 lines · Charles Keepax

Commit 57295073b6ac ("ASoC: dapm: Implement mixer input auto-disable") added support for autodisable controls, controls whose values are only written to the hardware when their respective widgets are powered up. But it only added support for controls based on the mixer abstraction.

Applied, thanks.

author
#7 lore raw

PATCH v3 5/5 ASoC: arizona: Use auto disable muxes for routing

In reply to Charles Keepax

The mixer core on the Arizona devices is powered up whenever any routing is non-zero. This patch saves a little power and avoids a few difficult corner cases (around the mixer core being powered whilst there is no clock available), by using the autodisable mux functionality to only write out the settings for the muxes when they are powered up.

Signed-off-by Charles Keepax <[email protected]>
---
 sound/soc/codecs/arizona.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
sound/soc/codecs/arizona.h +2 -2
index 11ff899..bacc296 100644
@@ -107,8 +107,8 @@ extern int arizona_mixer_values[ARIZONA_NUM_MIXER_INPUTS];
 			     arizona_mixer_tlv)
 
 #define ARIZONA_MUX_ENUM_DECL(name, reg) \
-	SOC_VALUE_ENUM_SINGLE_DECL(name, reg, 0, 0xff,			\
-				   arizona_mixer_texts, arizona_mixer_values)
+	SOC_VALUE_ENUM_SINGLE_AUTODISABLE_DECL( \
+		name, reg, 0, 0xff, arizona_mixer_texts, arizona_mixer_values)
 
 #define ARIZONA_MUX_CTL_DECL(name) \
 	const struct snd_kcontrol_new name##_mux =	\
Signature · 1 line
1.7.2.5
maintainer Applied
#8 lore raw

Re: [PATCH v3 5/5] ASoC: arizona: Use auto disable muxes for routing

Quoted 5 lines · Charles Keepax

The mixer core on the Arizona devices is powered up whenever any routing is non-zero. This patch saves a little power and avoids a few difficult corner cases (around the mixer core being powered whilst there is no clock available), by using the autodisable mux functionality to only write out the settings for the muxes when they are powered up.

Applied, thanks.

maintainer
#10 lore raw
In reply to Charles Keepax
Quoted 11 lines · Charles Keepax

Changes since v2:
- Use snd_soc_enum_item_to_val to get zero value from mux to account for non-value enums
- Improve handling in snd_soc_dapm_put_enum_double of the situation where the register and widget views of the control values don't match

Thanks,
Charles

 include/sound/soc.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

This list of changes doesn't appear to have anything to do with this patch?

author
#11 lore raw
Quoted 8 lines · Mark Brown
Quoted 6 lines · Charles Keepax

Changes since v2:
- Use snd_soc_enum_item_to_val to get zero value from mux to account for non-value enums
- Improve handling in snd_soc_dapm_put_enum_double of the situation where the register and widget views of the control values don't match

Quoted 8 lines
Quoted 5 lines

Thanks,
Charles

 include/sound/soc.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

This list of changes doesn't appear to have anything to do with this patch?

Sorry, I probably should have either added a cover letter or put those on patch 4 that is the patch they relate to.

Thanks,
Charles