Skip to contentSkip to conversation

ASoC: Update Poodle to current ASoC API

PATCH In review Mark Brown 3 participants 37 messages Jul 29, 2008 – Aug 1, 2008

Subsystems (5)
lore
Share & tools
lore

Mark Brown

author
#0 lore raw

PATCH 1/14 ASoC: Update Poodle to current ASoC API

From: Dmitry Baryshkov <[email protected]>

---
This is a compile fix and it would therefore be good if it could be considered for merge into 2.6.27.

 sound/soc/pxa/poodle.c |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)
sound/soc/pxa/poodle.c +2 -6
index 65a4e9a..d968cf7 100644
@@ -85,17 +85,13 @@ static int poodle_startup(struct snd_pcm_substream *substream)
 }
 
 /* we need to unmute the HP at shutdown as the mute burns power on poodle */
-static int poodle_shutdown(struct snd_pcm_substream *substream)
+static void poodle_shutdown(struct snd_pcm_substream *substream)
 {
-	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-	struct snd_soc_codec *codec = rtd->socdev->codec;
-
 	/* set = unmute headphone */
 	locomo_gpio_write(&poodle_locomo_device.dev,
 		POODLE_LOCOMO_GPIO_MUTE_L, 1);
 	locomo_gpio_write(&poodle_locomo_device.dev,
 		POODLE_LOCOMO_GPIO_MUTE_R, 1);
-	return 0;
 }
 
 static int poodle_hw_params(struct snd_pcm_substream *substream,
@@ -232,7 +228,7 @@ static const struct soc_enum poodle_enum[] = {
 	SOC_ENUM_SINGLE_EXT(2, spk_function),
 };
 
-static const snd_kcontrol_new_t wm8731_poodle_controls[] = {
+static const struct snd_kcontrol_new wm8731_poodle_controls[] = {
 	SOC_ENUM_EXT("Jack Function", poodle_enum[0], poodle_get_jack,
 		poodle_set_jack),
 	SOC_ENUM_EXT("Speaker Function", poodle_enum[1], poodle_get_spk,
Signature · 1 line
1.5.6.3
author
#1 lore raw

PATCH 2/14 ASoC: Export dapm_reg_event() fully

dapm_reg_event() is used by devices using SND_SOC_DAPM_REG() so needs to be exported to support building them as modules and prototyped to avoid sparse warnings and potential build issues.

---
 include/sound/soc-dapm.h |    3 +++
 sound/soc/soc-dapm.c     |    1 +
 2 files changed, 4 insertions(+), 0 deletions(-)
include/sound/soc-dapm.h +3 -0
index 3030fdc..c1b26fc 100644
@@ -202,6 +202,9 @@ struct snd_soc_dapm_path;
 struct snd_soc_dapm_pin;
 struct snd_soc_dapm_route;
 
+int dapm_reg_event(struct snd_soc_dapm_widget *w,
+		   struct snd_kcontrol *kcontrol, int event);
+
 /* dapm controls */
 int snd_soc_dapm_put_volsw(struct snd_kcontrol *kcontrol,
 	struct snd_ctl_elem_value *ucontrol);
sound/soc/soc-dapm.c +1 -0
index 820347c..f9d100b 100644
@@ -470,6 +470,7 @@ int dapm_reg_event(struct snd_soc_dapm_widget *w,
 
 	return 0;
 }
+EXPORT_SYMBOL_GPL(dapm_reg_event);
 
 /*
  * Scan each dapm widget for complete audio path.
Signature · 1 line
1.5.6.3
author
#2 lore raw

PATCH 3/14 ASoC: Permit simultaneous compilation of both PXA AC97 drivers

From: Dmitry Baryshkov <[email protected]>

---
 sound/soc/pxa/pxa2xx-pcm.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
sound/soc/pxa/pxa2xx-pcm.c +2 -2
index 2df03ee..45ac468 100644
@@ -330,7 +330,7 @@ static void pxa2xx_pcm_free_dma_buffers(struct snd_pcm *pcm)
 
 static u64 pxa2xx_pcm_dmamask = DMA_32BIT_MASK;
 
-int pxa2xx_pcm_new(struct snd_card *card, struct snd_soc_dai *dai,
+static int pxa2xx_soc_pcm_new(struct snd_card *card, struct snd_soc_dai *dai,
 	struct snd_pcm *pcm)
 {
 	int ret = 0;
@@ -360,7 +360,7 @@ int pxa2xx_pcm_new(struct snd_card *card, struct snd_soc_dai *dai,
 struct snd_soc_platform pxa2xx_soc_platform = {
 	.name		= "pxa2xx-audio",
 	.pcm_ops 	= &pxa2xx_pcm_ops,
-	.pcm_new	= pxa2xx_pcm_new,
+	.pcm_new	= pxa2xx_soc_pcm_new,
 	.pcm_free	= pxa2xx_pcm_free_dma_buffers,
 };
 EXPORT_SYMBOL_GPL(pxa2xx_soc_platform);
Signature · 1 line
1.5.6.3
author
#3 lore raw

PATCH 4/14 ASoC: Allow codecs to override register display

Some codecs have unusual features in their register maps such as very large registers representing arrays of coefficients. Support these codecs in the register cache sysfs file by allowing them to provide a function register_display() overriding the default output for register contents.

Also ensure that we don't overflow PAGE_SIZE while writing out the register dump.

---
 include/sound/soc.h  |    2 ++
 sound/soc/soc-core.c |   26 +++++++++++++++++++++++---
 2 files changed, 25 insertions(+), 3 deletions(-)
include/sound/soc.h +2 -0
index 1890d87..2ce530e 100644
@@ -410,6 +410,8 @@ struct snd_soc_codec {
 	void *control_data; /* codec control (i2c/3wire) data */
 	unsigned int (*read)(struct snd_soc_codec *, unsigned int);
 	int (*write)(struct snd_soc_codec *, unsigned int, unsigned int);
+	int (*display_register)(struct snd_soc_codec *, char *,
+				size_t, unsigned int);
 	hw_write_t hw_write;
 	hw_read_t hw_read;
 	void *reg_cache;
sound/soc/soc-core.c +23 -3
index 83f1190..5d3bf73 100644
@@ -970,9 +970,29 @@ static ssize_t codec_reg_show(struct device *dev,
 		step = codec->reg_cache_step;
 
 	count += sprintf(buf, "%s registers\n", codec->name);
-	for (i = 0; i < codec->reg_cache_size; i += step)
-		count += sprintf(buf + count, "%2x: %4x\n", i,
-			codec->read(codec, i));
+	for (i = 0; i < codec->reg_cache_size; i += step) {
+		count += sprintf(buf + count, "%2x: ", i);
+		if (count >= PAGE_SIZE - 1)
+			break;
+
+		if (codec->display_register)
+			count += codec->display_register(codec, buf + count,
+							 PAGE_SIZE - count, i);
+		else
+			count += snprintf(buf + count, PAGE_SIZE - count,
+					  "%4x", codec->read(codec, i));
+
+		if (count >= PAGE_SIZE - 1)
+			break;
+
+		count += snprintf(buf + count, PAGE_SIZE - count, "\n");
+		if (count >= PAGE_SIZE - 1)
+			break;
+	}
+
+	/* Truncate count; min() would cause a warning */
+	if (count >= PAGE_SIZE)
+		count = PAGE_SIZE - 1;
 
 	return count;
 }
Signature · 1 line
1.5.6.3
author
#4 lore raw

PATCH 5/14 ASoC: Convert bitfields in ASoC into full int width

From: Jon Smirl <[email protected]>

Convert bitfields in ASoC into full int width. This is a simple mechanical conversion. Two places in the DAPM code were fixed to properly use mask.

---
 include/sound/soc.h  |   50 ++++++++++++++++++-----------
 sound/soc/soc-core.c |   86 ++++++++++++++++++++++++++++++--------------------
 sound/soc/soc-dapm.c |   52 ++++++++++++++++++------------
 3 files changed, 114 insertions(+), 74 deletions(-)
include/sound/soc.h +31 -19
index 2ce530e..e647a34 100644
@@ -26,10 +26,12 @@
 /*
  * Convenience kcontrol builders
  */
-#define SOC_SINGLE_VALUE(reg, shift, max, invert) ((reg) | ((shift) << 8) |\
-	((shift) << 12) | ((max) << 16) | ((invert) << 24))
-#define SOC_SINGLE_VALUE_EXT(reg, max, invert) ((reg) | ((max) << 16) |\
-	((invert) << 31))
+#define SOC_SINGLE_VALUE(xreg, xshift, xmax, xinvert) \
+	((unsigned long)&(struct soc_mixer_control) \
+	{.reg = xreg, .shift = xshift, .max = xmax, .invert = xinvert})
+#define SOC_SINGLE_VALUE_EXT(xreg, xmax, xinvert) \
+	((unsigned long)&(struct soc_mixer_control) \
+	{.reg = xreg, .max = xmax, .invert = xinvert})
 #define SOC_SINGLE(xname, reg, shift, max, invert) \
 {	.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
 	.info = snd_soc_info_volsw, .get = snd_soc_get_volsw,\
@@ -43,45 +45,49 @@
 	.info = snd_soc_info_volsw, .get = snd_soc_get_volsw,\
 	.put = snd_soc_put_volsw, \
 	.private_value =  SOC_SINGLE_VALUE(reg, shift, max, invert) }
-#define SOC_DOUBLE(xname, reg, shift_left, shift_right, max, invert) \
+#define SOC_DOUBLE(xname, xreg, shift_left, shift_right, xmax, xinvert) \
 {	.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname),\
 	.info = snd_soc_info_volsw, .get = snd_soc_get_volsw, \
 	.put = snd_soc_put_volsw, \
-	.private_value = (reg) | ((shift_left) << 8) | \
-		((shift_right) << 12) | ((max) << 16) | ((invert) << 24) }
-#define SOC_DOUBLE_R(xname, reg_left, reg_right, shift, max, invert) \
+	.private_value = (unsigned long)&(struct soc_mixer_control) \
+		{.reg = xreg, .shift = shift_left, .rshift = shift_right, \
+		 .max = xmax, .invert = xinvert} }
+#define SOC_DOUBLE_R(xname, reg_left, reg_right, xshift, xmax, xinvert) \
 {	.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname), \
 	.info = snd_soc_info_volsw_2r, \
 	.get = snd_soc_get_volsw_2r, .put = snd_soc_put_volsw_2r, \
-	.private_value = (reg_left) | ((shift) << 8)  | \
-		((max) << 12) | ((invert) << 20) | ((reg_right) << 24) }
-#define SOC_DOUBLE_TLV(xname, reg, shift_left, shift_right, max, invert, tlv_array) \
+	.private_value = (unsigned long)&(struct soc_mixer_control) \
+		{.reg = reg_left, .rreg = reg_right, .shift = xshift, \
+		.max = xmax, .invert = xinvert} }
+#define SOC_DOUBLE_TLV(xname, xreg, shift_left, shift_right, xmax, xinvert, tlv_array) \
 {	.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname),\
 	.access = SNDRV_CTL_ELEM_ACCESS_TLV_READ |\
 		 SNDRV_CTL_ELEM_ACCESS_READWRITE,\
 	.tlv.p = (tlv_array), \
 	.info = snd_soc_info_volsw, .get = snd_soc_get_volsw, \
 	.put = snd_soc_put_volsw, \
-	.private_value = (reg) | ((shift_left) << 8) | \
-		((shift_right) << 12) | ((max) << 16) | ((invert) << 24) }
-#define SOC_DOUBLE_R_TLV(xname, reg_left, reg_right, shift, max, invert, tlv_array) \
+	.private_value = (unsigned long)&(struct soc_mixer_control) \
+		{.reg = xreg, .shift = shift_left, .rshift = shift_right,\
+		 .max = xmax, .invert = xinvert} }
+#define SOC_DOUBLE_R_TLV(xname, reg_left, reg_right, xshift, xmax, xinvert, tlv_array) \
 {	.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname),\
 	.access = SNDRV_CTL_ELEM_ACCESS_TLV_READ |\
 		 SNDRV_CTL_ELEM_ACCESS_READWRITE,\
 	.tlv.p = (tlv_array), \
 	.info = snd_soc_info_volsw_2r, \
 	.get = snd_soc_get_volsw_2r, .put = snd_soc_put_volsw_2r, \
-	.private_value = (reg_left) | ((shift) << 8)  | \
-		((max) << 12) | ((invert) << 20) | ((reg_right) << 24) }
-#define SOC_DOUBLE_S8_TLV(xname, reg, min, max, tlv_array) \
+	.private_value = (unsigned long)&(struct soc_mixer_control) \
+		{.reg = reg_left, .rreg = reg_right, .shift = xshift, \
+		.max = xmax, .invert = xinvert} }
+#define SOC_DOUBLE_S8_TLV(xname, xreg, xmin, xmax, tlv_array) \
 {	.iface  = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname), \
 	.access = SNDRV_CTL_ELEM_ACCESS_TLV_READ | \
 		  SNDRV_CTL_ELEM_ACCESS_READWRITE, \
 	.tlv.p  = (tlv_array), \
 	.info   = snd_soc_info_volsw_s8, .get = snd_soc_get_volsw_s8, \
 	.put    = snd_soc_put_volsw_s8, \
-	.private_value = (reg) | (((signed char)max) << 16) | \
-			 (((signed char)min) << 24) }
+	.private_value = (unsigned long)&(struct soc_mixer_control) \
+		{.reg = xreg, .min = xmin, .max = xmax} }
 #define SOC_ENUM_DOUBLE(xreg, xshift_l, xshift_r, xmask, xtexts) \
 {	.reg = xreg, .shift_l = xshift_l, .shift_r = xshift_r, \
 	.mask = xmask, .texts = xtexts }
@@ -518,6 +524,12 @@ struct snd_soc_pcm_runtime {
 	struct snd_soc_device *socdev;
 };
 
+/* mixer control */
+struct soc_mixer_control {
+	int min, max;
+	uint reg, rreg, shift, rshift, invert;
+};
+
 /* enumerated kcontrol */
 struct soc_enum {
 	unsigned short reg;
sound/soc/soc-core.c +52 -34

146 lines not on this page · raw message

sound/soc/soc-dapm.c +31 -21

81 lines not on this page · raw message

Signature · 1 line
1.5.6.3
author
#5 lore raw

PATCH 6/14 ASoC: Rename mask to max to reflect usage

From: Jon Smirl <[email protected]>

Most of the ASoC controls refer to the maximum value that can be set for a control as mask but there is no actual requirement for all bits to be set at the highest possible value making the name mask misleading. Change the code to use max instead.

---
 include/sound/soc.h  |   22 +++++++++++-----------
 sound/soc/soc-core.c |   20 ++++++++++----------
 sound/soc/soc-dapm.c |   14 +++++++-------
 3 files changed, 28 insertions(+), 28 deletions(-)
include/sound/soc.h +11 -11
index e647a34..5ca231f 100644
@@ -88,25 +88,25 @@
 	.put    = snd_soc_put_volsw_s8, \
 	.private_value = (unsigned long)&(struct soc_mixer_control) \
 		{.reg = xreg, .min = xmin, .max = xmax} }
-#define SOC_ENUM_DOUBLE(xreg, xshift_l, xshift_r, xmask, xtexts) \
+#define SOC_ENUM_DOUBLE(xreg, xshift_l, xshift_r, xmax, xtexts) \
 {	.reg = xreg, .shift_l = xshift_l, .shift_r = xshift_r, \
-	.mask = xmask, .texts = xtexts }
-#define SOC_ENUM_SINGLE(xreg, xshift, xmask, xtexts) \
-	SOC_ENUM_DOUBLE(xreg, xshift, xshift, xmask, xtexts)
-#define SOC_ENUM_SINGLE_EXT(xmask, xtexts) \
-{	.mask = xmask, .texts = xtexts }
+	.max = xmax, .texts = xtexts }
+#define SOC_ENUM_SINGLE(xreg, xshift, xmax, xtexts) \
+	SOC_ENUM_DOUBLE(xreg, xshift, xshift, xmax, xtexts)
+#define SOC_ENUM_SINGLE_EXT(xmax, xtexts) \
+{	.max = xmax, .texts = xtexts }
 #define SOC_ENUM(xname, xenum) \
 {	.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname,\
 	.info = snd_soc_info_enum_double, \
 	.get = snd_soc_get_enum_double, .put = snd_soc_put_enum_double, \
 	.private_value = (unsigned long)&xenum }
-#define SOC_SINGLE_EXT(xname, xreg, xshift, xmask, xinvert,\
+#define SOC_SINGLE_EXT(xname, xreg, xshift, xmax, xinvert,\
 	 xhandler_get, xhandler_put) \
 {	.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
 	.info = snd_soc_info_volsw, \
 	.get = xhandler_get, .put = xhandler_put, \
-	.private_value = SOC_SINGLE_VALUE(xreg, xshift, xmask, xinvert) }
-#define SOC_SINGLE_EXT_TLV(xname, xreg, xshift, xmask, xinvert,\
+	.private_value = SOC_SINGLE_VALUE(xreg, xshift, xmax, xinvert) }
+#define SOC_SINGLE_EXT_TLV(xname, xreg, xshift, xmax, xinvert,\
 	 xhandler_get, xhandler_put, tlv_array) \
 {	.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
 	.access = SNDRV_CTL_ELEM_ACCESS_TLV_READ |\
@@ -114,7 +114,7 @@
 	.tlv.p = (tlv_array), \
 	.info = snd_soc_info_volsw, \
 	.get = xhandler_get, .put = xhandler_put, \
-	.private_value = SOC_SINGLE_VALUE(xreg, xshift, xmask, xinvert) }
+	.private_value = SOC_SINGLE_VALUE(xreg, xshift, xmax, xinvert) }
 #define SOC_SINGLE_BOOL_EXT(xname, xdata, xhandler_get, xhandler_put) \
 {	.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
 	.info = snd_soc_info_bool_ext, \
@@ -536,7 +536,7 @@ struct soc_enum {
 	unsigned short reg2;
 	unsigned char shift_l;
 	unsigned char shift_r;
-	unsigned int mask;
+	unsigned int max;
 	const char **texts;
 	void *dapm;
 };
sound/soc/soc-core.c +10 -10
index 4b94f1f..11a881c 100644
@@ -1316,10 +1316,10 @@ int snd_soc_info_enum_double(struct snd_kcontrol *kcontrol,
 
 	uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
 	uinfo->count = e->shift_l == e->shift_r ? 1 : 2;
-	uinfo->value.enumerated.items = e->mask;
+	uinfo->value.enumerated.items = e->max;
 
-	if (uinfo->value.enumerated.item > e->mask - 1)
-		uinfo->value.enumerated.item = e->mask - 1;
+	if (uinfo->value.enumerated.item > e->max - 1)
+		uinfo->value.enumerated.item = e->max - 1;
 	strcpy(uinfo->value.enumerated.name,
 		e->texts[uinfo->value.enumerated.item]);
 	return 0;
@@ -1342,7 +1342,7 @@ int snd_soc_get_enum_double(struct snd_kcontrol *kcontrol,
 	struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
 	unsigned short val, bitmask;
 
-	for (bitmask = 1; bitmask < e->mask; bitmask <<= 1)
+	for (bitmask = 1; bitmask < e->max; bitmask <<= 1)
 		;
 	val = snd_soc_read(codec, e->reg);
 	ucontrol->value.enumerated.item[0]
@@ -1372,14 +1372,14 @@ int snd_soc_put_enum_double(struct snd_kcontrol *kcontrol,
 	unsigned short val;
 	unsigned short mask, bitmask;
 
-	for (bitmask = 1; bitmask < e->mask; bitmask <<= 1)
+	for (bitmask = 1; bitmask < e->max; bitmask <<= 1)
 		;
-	if (ucontrol->value.enumerated.item[0] > e->mask - 1)
+	if (ucontrol->value.enumerated.item[0] > e->max - 1)
 		return -EINVAL;
 	val = ucontrol->value.enumerated.item[0] << e->shift_l;
 	mask = (bitmask - 1) << e->shift_l;
 	if (e->shift_l != e->shift_r) {
-		if (ucontrol->value.enumerated.item[1] > e->mask - 1)
+		if (ucontrol->value.enumerated.item[1] > e->max - 1)
 			return -EINVAL;
 		val |= ucontrol->value.enumerated.item[1] << e->shift_r;
 		mask |= (bitmask - 1) << e->shift_r;
@@ -1406,10 +1406,10 @@ int snd_soc_info_enum_ext(struct snd_kcontrol *kcontrol,
 
 	uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
 	uinfo->count = 1;
-	uinfo->value.enumerated.items = e->mask;
+	uinfo->value.enumerated.items = e->max;
 
-	if (uinfo->value.enumerated.item > e->mask - 1)
-		uinfo->value.enumerated.item = e->mask - 1;
+	if (uinfo->value.enumerated.item > e->max - 1)
+		uinfo->value.enumerated.item = e->max - 1;
 	strcpy(uinfo->value.enumerated.name,
 		e->texts[uinfo->value.enumerated.item]);
 	return 0;
sound/soc/soc-dapm.c +7 -7
index bbdca0d..f08be8a 100644
@@ -125,13 +125,13 @@ static void dapm_set_path_status(struct snd_soc_dapm_widget *w,
 		struct soc_enum *e = (struct soc_enum *)w->kcontrols[i].private_value;
 		int val, item, bitmask;
 
-		for (bitmask = 1; bitmask < e->mask; bitmask <<= 1)
+		for (bitmask = 1; bitmask < e->max; bitmask <<= 1)
 		;
 		val = snd_soc_read(w->codec, e->reg);
 		item = (val >> e->shift_l) & (bitmask - 1);
 
 		p->connect = 0;
-		for (i = 0; i < e->mask; i++) {
+		for (i = 0; i < e->max; i++) {
 			if (!(strcmp(p->name, e->texts[i])) && item == i)
 				p->connect = 1;
 		}
@@ -168,7 +168,7 @@ static int dapm_connect_mux(struct snd_soc_codec *codec,
 	struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
 	int i;
 
-	for (i = 0; i < e->mask; i++) {
+	for (i = 0; i < e->max; i++) {
 		if (!(strcmp(control_name, e->texts[i]))) {
 			list_add(&path->list, &codec->dapm_paths);
 			list_add(&path->list_sink, &dest->sources);
@@ -1258,7 +1258,7 @@ int snd_soc_dapm_get_enum_double(struct snd_kcontrol *kcontrol,
 	struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
 	unsigned short val, bitmask;
 
-	for (bitmask = 1; bitmask < e->mask; bitmask <<= 1)
+	for (bitmask = 1; bitmask < e->max; bitmask <<= 1)
 		;
 	val = snd_soc_read(widget->codec, e->reg);
 	ucontrol->value.enumerated.item[0] = (val >> e->shift_l) & (bitmask - 1);
@@ -1288,15 +1288,15 @@ int snd_soc_dapm_put_enum_double(struct snd_kcontrol *kcontrol,
 	unsigned short mask, bitmask;
 	int ret = 0;
 
-	for (bitmask = 1; bitmask < e->mask; bitmask <<= 1)
+	for (bitmask = 1; bitmask < e->max; bitmask <<= 1)
 		;
-	if (ucontrol->value.enumerated.item[0] > e->mask - 1)
+	if (ucontrol->value.enumerated.item[0] > e->max - 1)
 		return -EINVAL;
 	mux = ucontrol->value.enumerated.item[0];
 	val = mux << e->shift_l;
 	mask = (bitmask - 1) << e->shift_l;
 	if (e->shift_l != e->shift_r) {
-		if (ucontrol->value.enumerated.item[1] > e->mask - 1)
+		if (ucontrol->value.enumerated.item[1] > e->max - 1)
 			return -EINVAL;
 		val |= ucontrol->value.enumerated.item[1] << e->shift_r;
 		mask |= (bitmask - 1) << e->shift_r;
Signature · 1 line
1.5.6.3
author
#6 lore raw

PATCH 7/14 ASoC: Add OpenFirmware helper for matching bus and codec drivers

From: Grant Likely <[email protected]>

Simple utility layer for creating ASoC machine instances based on data in the OpenFirmware device tree. OF aware platform drivers and codec drivers register themselves with this framework and the framework automatically instantiates a machine driver. At the moment, the driver is not very capable and it is expected to be extended as more features are needed for specifying the configuration in the device tree.

This is most likely temporary glue code to work around limitations in the ASoC v1 framework. When v2 is merged, most of this driver will need to be reworked.

---
 include/sound/soc-of-simple.h |   21 +++++
 sound/soc/fsl/Kconfig         |    3 +
 sound/soc/fsl/Makefile        |    3 +
 sound/soc/fsl/soc-of-simple.c |  171 +++++++++++++++++++++++++++++++++++++++++
 4 files changed, 198 insertions(+), 0 deletions(-)
 create mode 100644 include/sound/soc-of-simple.h
 create mode 100644 sound/soc/fsl/soc-of-simple.c
include/sound/soc-of-simple.h new file +21 -0
new file mode 100644
index 0000000..696fc51
@@ -0,0 +1,21 @@
+/*
+ * OF helpers for ALSA SoC
+ *
+ * Copyright (C) 2008, Secret Lab Technologies Ltd.
+ */
+
+#ifndef _INCLUDE_SOC_OF_H_
+#define _INCLUDE_SOC_OF_H_
+
+#include <linux/of.h>
+#include <sound/soc.h>
+
+int of_snd_soc_register_codec(struct snd_soc_codec_device *codec_dev,
+			      void *codec_data, struct snd_soc_dai *dai,
+			      struct device_node *node);
+
+int of_snd_soc_register_platform(struct snd_soc_platform *platform,
+				 struct device_node *node,
+				 struct snd_soc_dai *cpu_dai);
+
+#endif /* _INCLUDE_SOC_OF_H_ */
sound/soc/fsl/Kconfig +3 -0
index 3368ace..398f002 100644
@@ -1,3 +1,6 @@
+config SND_SOC_OF_SIMPLE
+	tristate
+
 config SND_SOC_MPC8610
 	bool "ALSA SoC support for the MPC8610 SOC"
 	depends on MPC8610_HPCD
sound/soc/fsl/Makefile +3 -0
index 62f680a..aa2100b 100644
@@ -1,3 +1,6 @@
+# Simple machine driver that extracts configuration from the OF device tree
+obj-$(CONFIG_SND_SOC_OF_SIMPLE) += soc-of-simple.o
+
 # MPC8610 HPCD Machine Support
 obj-$(CONFIG_SND_SOC_MPC8610_HPCD) += mpc8610_hpcd.o
 
sound/soc/fsl/soc-of-simple.c new file +171 -0

171 lines not on this page · raw message

Signature · 1 line
1.5.6.3
author
#7 lore raw

PATCH 8/14 ASoC: Make OpenFirmware helper include file conditional

The OpenFirmware API headers don't build on all platforms so ensure that they are not included unless they are being used.

---
 include/sound/soc-of-simple.h |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
include/sound/soc-of-simple.h +4 -0
index 696fc51..a064e19 100644
@@ -7,6 +7,8 @@
 #ifndef _INCLUDE_SOC_OF_H_
 #define _INCLUDE_SOC_OF_H_
 
+#if defined(CONFIG_SND_SOC_OF_SIMPLE) || defined(CONFIG_SND_SOC_OF_SIMPLE_MODULE)
+
 #include <linux/of.h>
 #include <sound/soc.h>
 
@@ -18,4 +20,6 @@ int of_snd_soc_register_platform(struct snd_soc_platform *platform,
 				 struct device_node *node,
 				 struct snd_soc_dai *cpu_dai);
 
+#endif
+
 #endif /* _INCLUDE_SOC_OF_H_ */
Signature · 1 line
1.5.6.3
author
#8 lore raw

PATCH 9/14 ASoC: Add mpc5200-psc I2S driver

From: Grant Likely <[email protected]>

This is an I2S bus driver for the MPC5200 PSC device. It depends on the soc-of helper functions to match a PSC device with a codec based on data in the device tree.

---
 sound/soc/fsl/Kconfig           |    7 +
 sound/soc/fsl/Makefile          |    2 +
 sound/soc/fsl/mpc5200_psc_i2s.c |  884 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 893 insertions(+), 0 deletions(-)
 create mode 100644 sound/soc/fsl/mpc5200_psc_i2s.c
sound/soc/fsl/Kconfig +7 -0
index 398f002..bba9546 100644
@@ -17,3 +17,10 @@ config SND_SOC_MPC8610_HPCD
 	default y if MPC8610_HPCD
 	help
 	  Say Y if you want to enable audio on the Freescale MPC8610 HPCD.
+
+config SND_SOC_MPC5200_I2S
+	tristate "Freescale MPC5200 PSC in I2S mode driver"
+	select SND_SOC_OF_SIMPLE
+	depends on SND_SOC && PPC_MPC52xx
+	help
+	  Say Y here to support the MPC5200 PSCs in I2S mode.
sound/soc/fsl/Makefile +2 -0
index aa2100b..035da4a 100644
@@ -7,3 +7,5 @@ obj-$(CONFIG_SND_SOC_MPC8610_HPCD) += mpc8610_hpcd.o
 # MPC8610 Platform Support
 obj-$(CONFIG_SND_SOC_MPC8610) += fsl_ssi.o fsl_dma.o
 
+obj-$(CONFIG_SND_SOC_MPC5200_I2S) += mpc5200_psc_i2s.o
+
sound/soc/fsl/mpc5200_psc_i2s.c new file +884 -0

884 lines not on this page · raw message

Signature · 1 line
1.5.6.3
author
#9 lore raw

PATCH 10/14 ASoC: Add Texas Instruments TLV320AIC26 codec driver

From: Grant Likely <[email protected]>

ASoC Codec driver for the TLV320AIC26 device. As it stands, this driver doesn't support all the modes and clocking options of the AIC16, but it is a start.

---
 sound/soc/codecs/Kconfig       |    4 +
 sound/soc/codecs/Makefile      |    2 +
 sound/soc/codecs/tlv320aic26.c |  519 ++++++++++++++++++++++++++++++++++++++++
 sound/soc/codecs/tlv320aic26.h |   93 +++++++
 4 files changed, 618 insertions(+), 0 deletions(-)
 create mode 100644 sound/soc/codecs/tlv320aic26.c
 create mode 100644 sound/soc/codecs/tlv320aic26.h
sound/soc/codecs/Kconfig +4 -0
index 1db04a2..9e09fa5 100644
@@ -47,6 +47,10 @@ config SND_SOC_CS4270_VD33_ERRATA
 	bool
 	depends on SND_SOC_CS4270
 
+config SND_SOC_TLV320AIC26
+	tristate "TI TLV320AIC26 Codec support"
+	depends on SND_SOC && SPI
+
 config SND_SOC_TLV320AIC3X
 	tristate
 	depends on I2C
sound/soc/codecs/Makefile +2 -0
index d7b97ab..dc0357e 100644
@@ -9,6 +9,7 @@ snd-soc-wm8990-objs := wm8990.o
 snd-soc-wm9712-objs := wm9712.o
 snd-soc-wm9713-objs := wm9713.o
 snd-soc-cs4270-objs := cs4270.o
+snd-soc-tlv320aic26-objs := tlv320aic26.o
 snd-soc-tlv320aic3x-objs := tlv320aic3x.o
 
 obj-$(CONFIG_SND_SOC_AC97_CODEC)	+= snd-soc-ac97.o
@@ -22,4 +23,5 @@ obj-$(CONFIG_SND_SOC_WM8990)	+= snd-soc-wm8990.o
 obj-$(CONFIG_SND_SOC_WM9712)	+= snd-soc-wm9712.o
 obj-$(CONFIG_SND_SOC_WM9713)	+= snd-soc-wm9713.o
 obj-$(CONFIG_SND_SOC_CS4270)	+= snd-soc-cs4270.o
+obj-$(CONFIG_SND_SOC_TLV320AIC26)	+= snd-soc-tlv320aic26.o
 obj-$(CONFIG_SND_SOC_TLV320AIC3X)	+= snd-soc-tlv320aic3x.o
sound/soc/codecs/tlv320aic26.c new file +519 -0

519 lines not on this page · raw message

sound/soc/codecs/tlv320aic26.h new file +93 -0

93 lines not on this page · raw message

Signature · 1 line
1.5.6.3
author
#10 lore raw

PATCH 11/14 ASoC: Export DAI and codec for TLV320AIC26

This fixes sparse warnings and allows non-OpenFirmware systems to attempt to bind to the device.

---
 sound/soc/codecs/tlv320aic26.c |    1 +
 sound/soc/codecs/tlv320aic26.h |    3 +++
 2 files changed, 4 insertions(+), 0 deletions(-)
sound/soc/codecs/tlv320aic26.c +1 -0
index 4621fda..73b7027 100644
@@ -383,6 +383,7 @@ struct snd_soc_codec_device aic26_soc_codec_dev = {
 	.probe = aic26_probe,
 	.remove = aic26_remove,
 };
+EXPORT_SYMBOL_GPL(aic26_soc_codec_dev);
 
 /* ---------------------------------------------------------------------
  * SPI device portion of driver: sysfs files for debugging
sound/soc/codecs/tlv320aic26.h +3 -0
index 62b1f22..786ba16 100644
@@ -90,4 +90,7 @@ enum aic26_wlen {
 	AIC26_WLEN_32	= 3 << 10,
 };
 
+extern struct snd_soc_dai aic26_dai;
+extern struct snd_soc_codec_device aic26_soc_codec_dev;
+
 #endif /* _TLV320AIC16_H_ */
Signature · 1 line
1.5.6.3
author
#11 lore raw

PATCH 12/14 ASoC: Staticise keyclick dev_attr in tlv320aic26

---
 sound/soc/codecs/tlv320aic26.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
sound/soc/codecs/tlv320aic26.c +1 -1
index 73b7027..bed8a9e 100644
@@ -418,7 +418,7 @@ static ssize_t aic26_keyclick_set(struct device *dev,
 	return count;
 }
 
-DEVICE_ATTR(keyclick, 0644, aic26_keyclick_show, aic26_keyclick_set);
+static DEVICE_ATTR(keyclick, 0644, aic26_keyclick_show, aic26_keyclick_set);
 
 /* ---------------------------------------------------------------------
  * SPI device portion of driver: probe and release routines and SPI
Signature · 1 line
1.5.6.3
author
#12 lore raw

PATCH 13/14 ASoC: AD1980 audio codec driver

From: Cliff Cai <[email protected]>

[Mechanical updates from code review applied -- broonie]

---
 sound/soc/codecs/Kconfig  |    3 +
 sound/soc/codecs/Makefile |    2 +
 sound/soc/codecs/ad1980.c |  309 +++++++++++++++++++++++++++++++++++++++++++++
 sound/soc/codecs/ad1980.h |   23 ++++
 4 files changed, 337 insertions(+), 0 deletions(-)
 create mode 100644 sound/soc/codecs/ad1980.c
 create mode 100644 sound/soc/codecs/ad1980.h
sound/soc/codecs/Kconfig +3 -0
index 9e09fa5..7ab74cd 100644
@@ -2,6 +2,9 @@ config SND_SOC_AC97_CODEC
 	tristate
 	select SND_AC97_CODEC
 
+config SND_SOC_AD1980
+	tristate
+
 config SND_SOC_AK4535
 	tristate
 
sound/soc/codecs/Makefile +2 -0
index dc0357e..409e4dd 100644
@@ -1,4 +1,5 @@
 snd-soc-ac97-objs := ac97.o
+snd-soc-ad1980-objs := ad1980.o
 snd-soc-ak4535-objs := ak4535.o
 snd-soc-uda1380-objs := uda1380.o
 snd-soc-wm8510-objs := wm8510.o
@@ -13,6 +14,7 @@ snd-soc-tlv320aic26-objs := tlv320aic26.o
 snd-soc-tlv320aic3x-objs := tlv320aic3x.o
 
 obj-$(CONFIG_SND_SOC_AC97_CODEC)	+= snd-soc-ac97.o
+obj-$(CONFIG_SND_SOC_AD1980)	+= snd-soc-ad1980.o
 obj-$(CONFIG_SND_SOC_AK4535)	+= snd-soc-ak4535.o
 obj-$(CONFIG_SND_SOC_UDA1380)	+= snd-soc-uda1380.o
 obj-$(CONFIG_SND_SOC_WM8510)	+= snd-soc-wm8510.o
sound/soc/codecs/ad1980.c new file +309 -0

309 lines not on this page · raw message

sound/soc/codecs/ad1980.h new file +23 -0
new file mode 100644
index 0000000..5d4710d
@@ -0,0 +1,23 @@
+/*
+ * ad1980.h  --  ad1980 Soc Audio driver
+ */
+
+#ifndef _AD1980_H
+#define _AD1980_H
+/* Bit definition of Power-Down Control/Status Register */
+#define ADC		0x0001
+#define DAC		0x0002
+#define ANL		0x0004
+#define REF		0x0008
+#define PR0		0x0100
+#define PR1		0x0200
+#define PR2		0x0400
+#define PR3		0x0800
+#define PR4		0x1000
+#define PR5		0x2000
+#define PR6		0x4000
+
+extern struct snd_soc_codec_dai ad1980_dai;
+extern struct snd_soc_codec_device soc_codec_dev_ad1980;
+
+#endif
Signature · 1 line
1.5.6.3
author
#13 lore raw

PATCH 14/14 ASoC: Add all CODECs Kconfig option

Allow all the CODEC drivers to be built without a machine driver in order to facilitate testing of subsystem-wide changes and gain better coverage from automated testing efforts. This also helps things like the generic OpenFirmware machine driver for PowerPC.

Currently AC97 CODECs are not included since the current setup relies on having a controller driver available.

---
 sound/soc/codecs/Kconfig |   23 +++++++++++++++++++++++
 1 files changed, 23 insertions(+), 0 deletions(-)
sound/soc/codecs/Kconfig +23 -0
index 7ab74cd..1c93423 100644
@@ -1,3 +1,26 @@
+config SND_SOC_ALL_CODECS
+	tristate "Build all ASoC CODEC drivers"
+	select I2C
+	select SPI
+	select SND_SOC_AK4535
+	select SND_SOC_UDA1380
+	select SND_SOC_WM8510
+	select SND_SOC_WM8731
+	select SND_SOC_WM8750
+	select SND_SOC_WM8753
+	select SND_SOC_WM8990
+	select SND_SOC_CS4270
+	select SND_SOC_TLV320AIC26
+	select SND_SOC_TLV320AIC3X
+        help
+          Normally ASoC codec drivers are only built if a machine driver which
+          uses them is also built since they are only usable with a machine
+          driver.  Selecting this option will allow these drivers to be built
+          without an explicit machine driver for test and development purposes.
+
+          If unsure select "N".
+
+
 config SND_SOC_AC97_CODEC
 	tristate
 	select SND_AC97_CODEC
Signature · 1 line
1.5.6.3
#14 lore raw

Re: [PATCH 05/14] ASoC: Convert bitfields in ASoC into full int width

In reply to Mark Brown
Quoted 5 lines · Mark Brown

From: Jon Smirl <[email protected]>

Convert bitfields in ASoC into full int width. This is a simple mechanical conversion. Two places in the DAPM code were fixed to properly use mask.

Do you want me to change the uints to unsigned int?

Quoted 361 lines

---

  include/sound/soc.h  |   50 ++++++++++++++++++-----------
  sound/soc/soc-core.c |   86 ++++++++++++++++++++++++++++++--------------------
  sound/soc/soc-dapm.c |   52 ++++++++++++++++++------------
  3 files changed, 114 insertions(+), 74 deletions(-)

diff --git a/include/sound/soc.h b/include/sound/soc.h
index 2ce530e..e647a34 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -26,10 +26,12 @@
/*
* Convenience kcontrol builders
*/
-#define SOC_SINGLE_VALUE(reg, shift, max, invert) ((reg) | ((shift) << 8) |\
- ((shift) << 12) | ((max) << 16) | ((invert) << 24))
-#define SOC_SINGLE_VALUE_EXT(reg, max, invert) ((reg) | ((max) << 16) |\
- ((invert) << 31))
+#define SOC_SINGLE_VALUE(xreg, xshift, xmax, xinvert) \
+ ((unsigned long)&(struct soc_mixer_control) \
+ {.reg = xreg, .shift = xshift, .max = xmax, .invert = xinvert})
+#define SOC_SINGLE_VALUE_EXT(xreg, xmax, xinvert) \
+ ((unsigned long)&(struct soc_mixer_control) \
+ {.reg = xreg, .max = xmax, .invert = xinvert})
#define SOC_SINGLE(xname, reg, shift, max, invert) \

  {      .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
        .info = snd_soc_info_volsw, .get = snd_soc_get_volsw,\
 @@ -43,45 +45,49 @@
        .info = snd_soc_info_volsw, .get = snd_soc_get_volsw,\
        .put = snd_soc_put_volsw, \
        .private_value =  SOC_SINGLE_VALUE(reg, shift, max, invert) }
 -#define SOC_DOUBLE(xname, reg, shift_left, shift_right, max, invert) \
 +#define SOC_DOUBLE(xname, xreg, shift_left, shift_right, xmax, xinvert) \
  {      .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname),\
        .info = snd_soc_info_volsw, .get = snd_soc_get_volsw, \
        .put = snd_soc_put_volsw, \
 -       .private_value = (reg) | ((shift_left) << 8) | \
 -               ((shift_right) << 12) | ((max) << 16) | ((invert) << 24) }
 -#define SOC_DOUBLE_R(xname, reg_left, reg_right, shift, max, invert) \
 +       .private_value = (unsigned long)&(struct soc_mixer_control) \
 +               {.reg = xreg, .shift = shift_left, .rshift = shift_right, \
 +                .max = xmax, .invert = xinvert} }
 +#define SOC_DOUBLE_R(xname, reg_left, reg_right, xshift, xmax, xinvert) \
  {      .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname), \
        .info = snd_soc_info_volsw_2r, \
        .get = snd_soc_get_volsw_2r, .put = snd_soc_put_volsw_2r, \
 -       .private_value = (reg_left) | ((shift) << 8)  | \
 -               ((max) << 12) | ((invert) << 20) | ((reg_right) << 24) }
 -#define SOC_DOUBLE_TLV(xname, reg, shift_left, shift_right, max, invert, tlv_array) \
 +       .private_value = (unsigned long)&(struct soc_mixer_control) \
 +               {.reg = reg_left, .rreg = reg_right, .shift = xshift, \
 +               .max = xmax, .invert = xinvert} }
 +#define SOC_DOUBLE_TLV(xname, xreg, shift_left, shift_right, xmax, xinvert, tlv_array) \
  {      .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname),\
        .access = SNDRV_CTL_ELEM_ACCESS_TLV_READ |\
                 SNDRV_CTL_ELEM_ACCESS_READWRITE,\
        .tlv.p = (tlv_array), \
        .info = snd_soc_info_volsw, .get = snd_soc_get_volsw, \
        .put = snd_soc_put_volsw, \
 -       .private_value = (reg) | ((shift_left) << 8) | \
 -               ((shift_right) << 12) | ((max) << 16) | ((invert) << 24) }
 -#define SOC_DOUBLE_R_TLV(xname, reg_left, reg_right, shift, max, invert, tlv_array) \
 +       .private_value = (unsigned long)&(struct soc_mixer_control) \
 +               {.reg = xreg, .shift = shift_left, .rshift = shift_right,\
 +                .max = xmax, .invert = xinvert} }
 +#define SOC_DOUBLE_R_TLV(xname, reg_left, reg_right, xshift, xmax, xinvert, tlv_array) \
  {      .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname),\
        .access = SNDRV_CTL_ELEM_ACCESS_TLV_READ |\
                 SNDRV_CTL_ELEM_ACCESS_READWRITE,\
        .tlv.p = (tlv_array), \
        .info = snd_soc_info_volsw_2r, \
        .get = snd_soc_get_volsw_2r, .put = snd_soc_put_volsw_2r, \
 -       .private_value = (reg_left) | ((shift) << 8)  | \
 -               ((max) << 12) | ((invert) << 20) | ((reg_right) << 24) }
 -#define SOC_DOUBLE_S8_TLV(xname, reg, min, max, tlv_array) \
 +       .private_value = (unsigned long)&(struct soc_mixer_control) \
 +               {.reg = reg_left, .rreg = reg_right, .shift = xshift, \
 +               .max = xmax, .invert = xinvert} }
 +#define SOC_DOUBLE_S8_TLV(xname, xreg, xmin, xmax, tlv_array) \
  {      .iface  = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname), \
        .access = SNDRV_CTL_ELEM_ACCESS_TLV_READ | \
                  SNDRV_CTL_ELEM_ACCESS_READWRITE, \
        .tlv.p  = (tlv_array), \
        .info   = snd_soc_info_volsw_s8, .get = snd_soc_get_volsw_s8, \
        .put    = snd_soc_put_volsw_s8, \
 -       .private_value = (reg) | (((signed char)max) << 16) | \
 -                        (((signed char)min) << 24) }
 +       .private_value = (unsigned long)&(struct soc_mixer_control) \
 +               {.reg = xreg, .min = xmin, .max = xmax} }
  #define SOC_ENUM_DOUBLE(xreg, xshift_l, xshift_r, xmask, xtexts) \
  {      .reg = xreg, .shift_l = xshift_l, .shift_r = xshift_r, \
        .mask = xmask, .texts = xtexts }
 @@ -518,6 +524,12 @@ struct snd_soc_pcm_runtime {
        struct snd_soc_device *socdev;

};

+/* mixer control */
+struct soc_mixer_control {
+ int min, max;
+ uint reg, rreg, shift, rshift, invert;
+};
+
/* enumerated kcontrol */

  struct soc_enum {
        unsigned short reg;
 diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
 index 5d3bf73..4b94f1f 100644
 --- a/sound/soc/soc-core.c
 +++ b/sound/soc/soc-core.c
 @@ -1454,9 +1454,11 @@ EXPORT_SYMBOL_GPL(snd_soc_info_volsw_ext);
  int snd_soc_info_volsw(struct snd_kcontrol *kcontrol,
        struct snd_ctl_elem_info *uinfo)
  {
 -       int max = (kcontrol->private_value >> 16) & 0xff;
 -       int shift = (kcontrol->private_value >> 8) & 0x0f;
 -       int rshift = (kcontrol->private_value >> 12) & 0x0f;
 +       struct soc_mixer_control *mc =
 +               (struct soc_mixer_control *)kcontrol->private_value;
 +       int max = mc->max;
 +       uint shift = mc->min;
 +       uint rshift = mc->rshift;
        if (max == 1)
                uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
 @@ -1482,13 +1484,15 @@ EXPORT_SYMBOL_GPL(snd_soc_info_volsw);
  int snd_soc_get_volsw(struct snd_kcontrol *kcontrol,
        struct snd_ctl_elem_value *ucontrol)
  {
 +       struct soc_mixer_control *mc =
 +               (struct soc_mixer_control *)kcontrol->private_value;
        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
 -       int reg = kcontrol->private_value & 0xff;
 -       int shift = (kcontrol->private_value >> 8) & 0x0f;
 -       int rshift = (kcontrol->private_value >> 12) & 0x0f;
 -       int max = (kcontrol->private_value >> 16) & 0xff;
 -       int mask = (1 << fls(max)) - 1;
 -       int invert = (kcontrol->private_value >> 24) & 0x01;
 +       uint reg = mc->reg;
 +       uint shift = mc->shift;
 +       uint rshift = mc->rshift;
 +       int max = mc->max;
 +       uint mask = (1 << fls(max)) - 1;
 +       uint invert = mc->invert;
        ucontrol->value.integer.value[0] =
                (snd_soc_read(codec, reg) >> shift) & mask;
 @@ -1519,13 +1523,15 @@ EXPORT_SYMBOL_GPL(snd_soc_get_volsw);
  int snd_soc_put_volsw(struct snd_kcontrol *kcontrol,
        struct snd_ctl_elem_value *ucontrol)
  {
 +       struct soc_mixer_control *mc =
 +               (struct soc_mixer_control *)kcontrol->private_value;
        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
 -       int reg = kcontrol->private_value & 0xff;
 -       int shift = (kcontrol->private_value >> 8) & 0x0f;
 -       int rshift = (kcontrol->private_value >> 12) & 0x0f;
 -       int max = (kcontrol->private_value >> 16) & 0xff;
 -       int mask = (1 << fls(max)) - 1;
 -       int invert = (kcontrol->private_value >> 24) & 0x01;
 +       uint reg = mc->reg;
 +       uint shift = mc->shift;
 +       uint rshift = mc->rshift;
 +       int max = mc->max;
 +       uint mask = (1 << fls(max)) - 1;
 +       uint invert = mc->invert;
        unsigned short val, val2, val_mask;

        val = (ucontrol->value.integer.value[0] & mask);

@@ -1557,7 +1563,9 @@ EXPORT_SYMBOL_GPL(snd_soc_put_volsw);
int snd_soc_info_volsw_2r(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_info *uinfo)
{
- int max = (kcontrol->private_value >> 12) & 0xff;
+ struct soc_mixer_control *mc =
+ (struct soc_mixer_control *)kcontrol->private_value;
+ int max = mc->max;

        if (max == 1)
                uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
 @@ -1583,13 +1591,15 @@ EXPORT_SYMBOL_GPL(snd_soc_info_volsw_2r);
  int snd_soc_get_volsw_2r(struct snd_kcontrol *kcontrol,
        struct snd_ctl_elem_value *ucontrol)
  {
 +       struct soc_mixer_control *mc =
 +               (struct soc_mixer_control *)kcontrol->private_value;
        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
 -       int reg = kcontrol->private_value & 0xff;
 -       int reg2 = (kcontrol->private_value >> 24) & 0xff;
 -       int shift = (kcontrol->private_value >> 8) & 0x0f;
 -       int max = (kcontrol->private_value >> 12) & 0xff;
 -       int mask = (1<<fls(max))-1;
 -       int invert = (kcontrol->private_value >> 20) & 0x01;
 +       uint reg = mc->reg;
 +       uint reg2 = mc->rreg;
 +       uint shift = mc->shift;
 +       int max = mc->max;
 +       uint mask = (1<<fls(max))-1;
 +       uint invert = mc->invert;
        ucontrol->value.integer.value[0] =
                (snd_soc_read(codec, reg) >> shift) & mask;
 @@ -1618,13 +1628,15 @@ EXPORT_SYMBOL_GPL(snd_soc_get_volsw_2r);
  int snd_soc_put_volsw_2r(struct snd_kcontrol *kcontrol,
        struct snd_ctl_elem_value *ucontrol)
  {
 +       struct soc_mixer_control *mc =
 +               (struct soc_mixer_control *)kcontrol->private_value;
        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
 -       int reg = kcontrol->private_value & 0xff;
 -       int reg2 = (kcontrol->private_value >> 24) & 0xff;
 -       int shift = (kcontrol->private_value >> 8) & 0x0f;
 -       int max = (kcontrol->private_value >> 12) & 0xff;
 -       int mask = (1 << fls(max)) - 1;
 -       int invert = (kcontrol->private_value >> 20) & 0x01;
 +       uint reg = mc->reg;
 +       uint reg2 = mc->rreg;
 +       uint shift = mc->shift;
 +       int max = mc->max;
 +       uint mask = (1 << fls(max)) - 1;
 +       uint invert = mc->invert;
        int err;
        unsigned short val, val2, val_mask;

@@ -1661,8 +1673,10 @@ EXPORT_SYMBOL_GPL(snd_soc_put_volsw_2r);
int snd_soc_info_volsw_s8(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_info *uinfo)
{

 -       int max = (signed char)((kcontrol->private_value >> 16) & 0xff);
 -       int min = (signed char)((kcontrol->private_value >> 24) & 0xff);
 +       struct soc_mixer_control *mc =

+ (struct soc_mixer_control *)kcontrol->private_value;
+ int max = mc->max;
+ int min = mc->min;

        uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
        uinfo->count = 2;
 @@ -1684,9 +1698,11 @@ EXPORT_SYMBOL_GPL(snd_soc_info_volsw_s8);
  int snd_soc_get_volsw_s8(struct snd_kcontrol *kcontrol,
        struct snd_ctl_elem_value *ucontrol)
  {
 +       struct soc_mixer_control *mc =
 +               (struct soc_mixer_control *)kcontrol->private_value;
        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
 -       int reg = kcontrol->private_value & 0xff;
 -       int min = (signed char)((kcontrol->private_value >> 24) & 0xff);
 +       uint reg = mc->reg;
 +       int min = mc->min;
        int val = snd_soc_read(codec, reg);

        ucontrol->value.integer.value[0] =
 @@ -1709,9 +1725,11 @@ EXPORT_SYMBOL_GPL(snd_soc_get_volsw_s8);
  int snd_soc_put_volsw_s8(struct snd_kcontrol *kcontrol,
        struct snd_ctl_elem_value *ucontrol)
  {
 +       struct soc_mixer_control *mc =
 +               (struct soc_mixer_control *)kcontrol->private_value;
        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
 -       int reg = kcontrol->private_value & 0xff;
 -       int min = (signed char)((kcontrol->private_value >> 24) & 0xff);
 +       uint reg = mc->reg;
 +       int min = mc->min;
        unsigned short val;

        val = (ucontrol->value.integer.value[0]+min) & 0xff;
 diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
 index f9d100b..bbdca0d 100644
 --- a/sound/soc/soc-dapm.c
 +++ b/sound/soc/soc-dapm.c
 @@ -104,10 +104,13 @@ static void dapm_set_path_status(struct snd_soc_dapm_widget *w,
        case snd_soc_dapm_switch:
        case snd_soc_dapm_mixer: {
                int val;
 -               int reg = w->kcontrols[i].private_value & 0xff;
 -               int shift = (w->kcontrols[i].private_value >> 8) & 0x0f;
 -               int mask = (w->kcontrols[i].private_value >> 16) & 0xff;
 -               int invert = (w->kcontrols[i].private_value >> 24) & 0x01;
 +               struct soc_mixer_control *mc = (struct soc_mixer_control *)
 +                       w->kcontrols[i].private_value;
 +               uint reg = mc->reg;
 +               uint shift = mc->shift;
 +               int max = mc->max;
 +               uint mask = (1 << fls(max)) - 1;
 +               uint invert = mc->invert;
                val = snd_soc_read(w->codec, reg);
                val = (val >> shift) & mask;
 @@ -247,16 +250,19 @@ static int dapm_set_pga(struct snd_soc_dapm_widget *widget, int power)
                return 0;

        if (widget->num_kcontrols && k) {
 -               int reg = k->private_value & 0xff;
 -               int shift = (k->private_value >> 8) & 0x0f;
 -               int mask = (k->private_value >> 16) & 0xff;
 -               int invert = (k->private_value >> 24) & 0x01;
 +               struct soc_mixer_control *mc =
 +                       (struct soc_mixer_control *)k->private_value;
 +               uint reg = mc->reg;
 +               uint shift = mc->shift;
 +               int max = mc->max;
 +               uint mask = (1 << fls(max)) - 1;
 +               uint invert = mc->invert;
                if (power) {
                        int i;
                        /* power up has happended, increase volume to last level */
                        if (invert) {
 -                               for (i = mask; i > widget->saved_value; i--)
 +                               for (i = max; i > widget->saved_value; i--)
                                        snd_soc_update_bits(widget->codec, reg, mask, i);
                        } else {
                                for (i = 0; i < widget->saved_value; i++)
 @@ -1133,12 +1139,14 @@ int snd_soc_dapm_get_volsw(struct snd_kcontrol *kcontrol,
        struct snd_ctl_elem_value *ucontrol)
  {
        struct snd_soc_dapm_widget *widget = snd_kcontrol_chip(kcontrol);
 -       int reg = kcontrol->private_value & 0xff;
 -       int shift = (kcontrol->private_value >> 8) & 0x0f;
 -       int rshift = (kcontrol->private_value >> 12) & 0x0f;
 -       int max = (kcontrol->private_value >> 16) & 0xff;
 -       int invert = (kcontrol->private_value >> 24) & 0x01;
 -       int mask = (1 << fls(max)) - 1;
 +       struct soc_mixer_control *mc =
 +               (struct soc_mixer_control *)kcontrol->private_value;
 +       uint reg = mc->reg;
 +       uint shift = mc->shift;
 +       uint rshift = mc->rshift;
 +       int max = mc->max;
 +       uint invert = mc->invert;
 +       uint mask = (1 << fls(max)) - 1;
        /* return the saved value if we are powered down */
        if (widget->id == snd_soc_dapm_pga && !widget->power) {
 @@ -1176,12 +1184,14 @@ int snd_soc_dapm_put_volsw(struct snd_kcontrol *kcontrol,
        struct snd_ctl_elem_value *ucontrol)
  {
        struct snd_soc_dapm_widget *widget = snd_kcontrol_chip(kcontrol);
 -       int reg = kcontrol->private_value & 0xff;
 -       int shift = (kcontrol->private_value >> 8) & 0x0f;
 -       int rshift = (kcontrol->private_value >> 12) & 0x0f;
 -       int max = (kcontrol->private_value >> 16) & 0xff;
 -       int mask = (1 << fls(max)) - 1;
 -       int invert = (kcontrol->private_value >> 24) & 0x01;
 +       struct soc_mixer_control *mc =
 +               (struct soc_mixer_control *)kcontrol->private_value;
 +       uint reg = mc->reg;
 +       uint shift = mc->shift;
 +       uint rshift = mc->rshift;
 +       int max = mc->max;
 +       uint mask = (1 << fls(max)) - 1;
 +       uint invert = mc->invert;
        unsigned short val, val2, val_mask;
        int ret;

--
1.5.6.3

Signature · 2 lines
Jon Smirl
[email protected]
author
#15 lore raw

Re: [PATCH 05/14] ASoC: Convert bitfields in ASoC into full int width

Quoted 1 line · Jon Smirl

Do you want me to change the uints to unsigned int?

Yes, that would be good.

#16 lore raw

Re: [PATCH 05/14] ASoC: Convert bitfields in ASoC into full int width

Quoted 6 lines · Mark Brown
Quoted 1 line · Jon Smirl

Do you want me to change the uints to unsigned int?

Yes, that would be good.

Other patches in this series are stacked on top of this one. Let's put it in as in and then do a new one with only uint to unsigned int replacements.

Signature · 2 lines
Jon Smirl
[email protected]
#17 lore raw

Re: [PATCH 05/14] ASoC: Convert bitfields in ASoC into full int width

At Tue, 29 Jul 2008 10:06:40 -0400,

Quoted 4 lines · Jon Smirl
Quoted 2 lines · Mark Brown

On Tue, Jul 29, 2008 at 09:49:30AM -0400, Jon Smirl wrote:

Quoted 8 lines
Quoted 4 lines
Quoted 1 line

Do you want me to change the uints to unsigned int?

Yes, that would be good.

Other patches in this series are stacked on top of this one. Let's put it in as in and then do a new one with only uint to unsigned int replacements.

They are already there, master and devel branches on

     git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git

Takashi

#18 lore raw

Re: [PATCH 05/14] ASoC: Convert bitfields in ASoC into full int width

In reply to Jon Smirl

At Tue, 29 Jul 2008 09:49:30 -0400,

Quoted 9 lines · Jon Smirl
Quoted 5 lines · Mark Brown

From: Jon Smirl <[email protected]>

Convert bitfields in ASoC into full int width. This is a simple mechanical conversion. Two places in the DAPM code were fixed to properly use mask.

Do you want me to change the uints to unsigned int?

Yes, that'll be cleaner.

thanks,

Takashi

#19 lore raw

Re: [PATCH 04/14] ASoC: Allow codecs to override register display

In reply to Mark Brown

Mark, I see this patch is already in your tree. I have rewritten it a little differently to ensure that too many results can't be returned. This is in my system and tested. I had a bug too so I know the limiting it to pagesize code works.

---

 include/sound/soc.h  |    1 +
 sound/soc/soc-core.c |   19 +++++++++++++------
 2 files changed, 14 insertions(+), 6 deletions(-)
include/sound/soc.h +1 -0
index 1890d87..b95c0c2 100644
@@ -410,6 +410,7 @@ struct snd_soc_codec {
 	void *control_data; /* codec control (i2c/3wire) data */
 	unsigned int (*read)(struct snd_soc_codec *, unsigned int);
 	int (*write)(struct snd_soc_codec *, unsigned int, unsigned int);
+	int (*display_register)(struct snd_soc_codec *, char *, unsigned

int, unsigned int);
hw_write_t hw_write;
hw_read_t hw_read;
void *reg_cache;

sound/soc/soc-core.c +13 -6
index 83f1190..55f7559 100644
@@ -961,7 +961,7 @@ static ssize_t codec_reg_show(struct device *dev,
 {
 	struct snd_soc_device *devdata = dev_get_drvdata(dev);
 	struct snd_soc_codec *codec = devdata->codec;
-	int i, step = 1, count = 0;
+	int i, step = 1, count;
 
 	if (!codec->reg_cache_size)
 		return 0;
@@ -969,11 +969,18 @@ static ssize_t codec_reg_show(struct device *dev,
 	if (codec->reg_cache_step)
 		step = codec->reg_cache_step;
 
-	count += sprintf(buf, "%s registers\n", codec->name);
-	for (i = 0; i < codec->reg_cache_size; i += step)
-		count += sprintf(buf + count, "%2x: %4x\n", i,
-			codec->read(codec, i));
-
+	count = sprintf(buf, "%s registers\n", codec->name);
+	for (i = 0; i < codec->reg_cache_size; i += step) {
+		if (codec->display_register)
+			count += codec->display_register(codec,
+							 buf + count, PAGE_SIZE - count, i);
+		else {
+			count += snprintf(buf + count, PAGE_SIZE - count, "%2x: ", i);
+			count += snprintf(buf + count, PAGE_SIZE - count, "%4x",
+					 codec->read(codec, i));
+			count += snprintf(buf + count, PAGE_SIZE - count, "\n");
+		}
+	}
 	return count;
 }
 static DEVICE_ATTR(codec_reg, 0444, codec_reg_show, NULL);
Signature · 2 lines
Jon Smirl
[email protected]
#20 lore raw

Re: [PATCH 04/14] ASoC: Allow codecs to override register display

At Thu, 31 Jul 2008 21:41:48 -0400,

Quoted 5 lines · Jon Smirl

Mark, I see this patch is already in your tree. I have rewritten it a little differently to ensure that too many results can't be returned. This is in my system and tested. I had a bug too so I know the limiting it to pagesize code works.

Mark's patch was already applied. Could you re-generated your change based on that?

thanks,

Takashi

Quoted 64 lines

---

 include/sound/soc.h  |    1 +
 sound/soc/soc-core.c |   19 +++++++++++++------
 2 files changed, 14 insertions(+), 6 deletions(-)
include/sound/soc.h +1 -0
index 1890d87..b95c0c2 100644
@@ -410,6 +410,7 @@ struct snd_soc_codec {
 	void *control_data; /* codec control (i2c/3wire) data */
 	unsigned int (*read)(struct snd_soc_codec *, unsigned int);
 	int (*write)(struct snd_soc_codec *, unsigned int, unsigned int);
+	int (*display_register)(struct snd_soc_codec *, char *, unsigned
 int, unsigned int);
 	hw_write_t hw_write;
 	hw_read_t hw_read;
include/sound/soc.h +0 -0
 	void *reg_cache;
sound/soc/soc-core.c +13 -6
index 83f1190..55f7559 100644
@@ -961,7 +961,7 @@ static ssize_t codec_reg_show(struct device *dev,
 {
 	struct snd_soc_device *devdata = dev_get_drvdata(dev);
 	struct snd_soc_codec *codec = devdata->codec;
-	int i, step = 1, count = 0;
+	int i, step = 1, count;
 
 	if (!codec->reg_cache_size)
 		return 0;
@@ -969,11 +969,18 @@ static ssize_t codec_reg_show(struct device *dev,
 	if (codec->reg_cache_step)
 		step = codec->reg_cache_step;
 
-	count += sprintf(buf, "%s registers\n", codec->name);
-	for (i = 0; i < codec->reg_cache_size; i += step)
-		count += sprintf(buf + count, "%2x: %4x\n", i,
-			codec->read(codec, i));
-
+	count = sprintf(buf, "%s registers\n", codec->name);
+	for (i = 0; i < codec->reg_cache_size; i += step) {
+		if (codec->display_register)
+			count += codec->display_register(codec,
+							 buf + count, PAGE_SIZE - count, i);
+		else {
+			count += snprintf(buf + count, PAGE_SIZE - count, "%2x: ", i);
+			count += snprintf(buf + count, PAGE_SIZE - count, "%4x",
+					 codec->read(codec, i));
+			count += snprintf(buf + count, PAGE_SIZE - count, "\n");
+		}
+	}
 	return count;
 }
 static DEVICE_ATTR(codec_reg, 0444, codec_reg_show, NULL);
Signature · 3 lines
-- 
Jon Smirl
[email protected]
author
#21 lore raw

Re: [PATCH 04/14] ASoC: Allow codecs to override register display

Quoted 9 lines · Takashi Iwai
Quoted 4 lines · Jon Smirl

Mark, I see this patch is already in your tree. I have rewritten it a little differently to ensure that too many results can't be returned. This is in my system and tested. I had a bug too so I know the limiting it to pagesize code works.

Mark's patch was already applied. Could you re-generated your change based on that?

In general it's easiest if ASoC patches are generated against Takashi's master branch - that's where ASoC gets merged and usually the diff between the two trees is very small.

#22 lore raw

Re: [PATCH 04/14] ASoC: Allow codecs to override register display

Quoted 8 lines · Mark Brown
Quoted 6 lines · Takashi Iwai
Quoted 4 lines · Jon Smirl

Mark, I see this patch is already in your tree. I have rewritten it a little differently to ensure that too many results can't be returned. This is in my system and tested. I had a bug too so I know the limiting it to pagesize code works.

Quoted 8 lines
Quoted 2 lines

Mark's patch was already applied. Could you re-generated your change based on that?

In general it's easiest if ASoC patches are generated against Takashi's
master branch - that's where ASoC gets merged and usually the diff between the two trees is very small.

This is against Takashi's tree. I handled PAGE_LIMIT differently, instead of breaking from the loop I just let the loop finished and told snprintf it had zero bytes.

Allow external display_register()'s to skip sparse registers.

---

 include/sound/soc.h  |    3 +--
 sound/soc/soc-core.c |   33 ++++++++++-----------------------
 2 files changed, 11 insertions(+), 25 deletions(-)
include/sound/soc.h +1 -2
index a1e0357..1f4a9a2 100644
@@ -416,8 +416,7 @@ struct snd_soc_codec {
 	void *control_data; /* codec control (i2c/3wire) data */
 	unsigned int (*read)(struct snd_soc_codec *, unsigned int);
 	int (*write)(struct snd_soc_codec *, unsigned int, unsigned int);
-	int (*display_register)(struct snd_soc_codec *, char *,
-				size_t, unsigned int);
+	int (*display_register)(struct snd_soc_codec *, char *, unsigned

int, unsigned int);
hw_write_t hw_write;
hw_read_t hw_read;
void *reg_cache;

sound/soc/soc-core.c +10 -23
index 1563cee..fcc613c 100644
@@ -961,7 +961,7 @@ static ssize_t codec_reg_show(struct device *dev,
 {
 	struct snd_soc_device *devdata = dev_get_drvdata(dev);
 	struct snd_soc_codec *codec = devdata->codec;
-	int i, step = 1, count = 0;
+	int i, step = 1, count;
 
 	if (!codec->reg_cache_size)
 		return 0;
@@ -969,31 +969,18 @@ static ssize_t codec_reg_show(struct device *dev,
 	if (codec->reg_cache_step)
 		step = codec->reg_cache_step;
 
-	count += sprintf(buf, "%s registers\n", codec->name);
+	count = sprintf(buf, "%s registers\n", codec->name);
 	for (i = 0; i < codec->reg_cache_size; i += step) {
-		count += sprintf(buf + count, "%2x: ", i);
-		if (count >= PAGE_SIZE - 1)
-			break;
-
 		if (codec->display_register)
-			count += codec->display_register(codec, buf + count,
-							 PAGE_SIZE - count, i);
-		else
-			count += snprintf(buf + count, PAGE_SIZE - count,
-					  "%4x", codec->read(codec, i));
-
-		if (count >= PAGE_SIZE - 1)
-			break;
-
-		count += snprintf(buf + count, PAGE_SIZE - count, "\n");
-		if (count >= PAGE_SIZE - 1)
-			break;
+			count += codec->display_register(codec,
+							 buf + count, PAGE_SIZE - count, i);
+		else {
+			count += snprintf(buf + count, PAGE_SIZE - count, "%2x: ", i);
+			count += snprintf(buf + count, PAGE_SIZE - count, "%4x",
+					 codec->read(codec, i));
+			count += snprintf(buf + count, PAGE_SIZE - count, "\n");
+		}
 	}
-
-	/* Truncate count; min() would cause a warning */
-	if (count >= PAGE_SIZE)
-		count = PAGE_SIZE - 1;
-
 	return count;
 }
 static DEVICE_ATTR(codec_reg, 0444, codec_reg_show, NULL);
Signature · 2 lines
Jon Smirl
[email protected]
#23 lore raw

Re: [PATCH 04/14] ASoC: Allow codecs to override register display

At Fri, 1 Aug 2008 10:50:37 -0400,

Quoted 38 lines · Jon Smirl
Quoted 8 lines · Mark Brown
Quoted 6 lines · Takashi Iwai
Quoted 4 lines · Jon Smirl

Mark, I see this patch is already in your tree. I have rewritten it a little differently to ensure that too many results can't be returned. This is in my system and tested. I had a bug too so I know the limiting it to pagesize code works.

Quoted 8 lines
Quoted 2 lines

Mark's patch was already applied. Could you re-generated your change based on that?

In general it's easiest if ASoC patches are generated against Takashi's
master branch - that's where ASoC gets merged and usually the diff between the two trees is very small.

This is against Takashi's tree. I handled PAGE_LIMIT differently, instead of breaking from the loop I just let the loop finished and told snprintf it had zero bytes.

Allow external display_register()'s to skip sparse registers.

---

 include/sound/soc.h  |    3 +--
 sound/soc/soc-core.c |   33 ++++++++++-----------------------
 2 files changed, 11 insertions(+), 25 deletions(-)
include/sound/soc.h +0 -0
index a1e0357..1f4a9a2 100644

include/sound/soc.h struct snd_soc_codec { · line 420

Quoted 7 lines
include/sound/soc.h +1 -2
@@ -416,8 +416,7 @@ struct snd_soc_codec {
 	void *control_data; /* codec control (i2c/3wire) data */
 	unsigned int (*read)(struct snd_soc_codec *, unsigned int);
 	int (*write)(struct snd_soc_codec *, unsigned int, unsigned int);
-	int (*display_register)(struct snd_soc_codec *, char *,
-				size_t, unsigned int);
+	int (*display_register)(struct snd_soc_codec *, char *, unsigned
 int, unsigned int);

This change is backward.

Quoted 16 lines
include/sound/soc.h +1 -9
@@ -969,31 +969,18 @@ static ssize_t codec_reg_show(struct device *dev,
 	if (codec->reg_cache_step)
 		step = codec->reg_cache_step;
 
-	count += sprintf(buf, "%s registers\n", codec->name);
+	count = sprintf(buf, "%s registers\n", codec->name);
 	for (i = 0; i < codec->reg_cache_size; i += step) {
-		count += sprintf(buf + count, "%2x: ", i);
-		if (count >= PAGE_SIZE - 1)
-			break;
-
 		if (codec->display_register)
-			count += codec->display_register(codec, buf + count,
-							 PAGE_SIZE - count, i);
-		else
-			count += snprintf(buf + count, PAGE_SIZE - count,

include/sound/soc.h static ssize_t codec_reg_show(struct device *dev, · line 976

Quoted 10 lines
include/sound/soc.h +2 -8
-					  "%4x", codec->read(codec, i));
-
-		if (count >= PAGE_SIZE - 1)
-			break;
-
-		count += snprintf(buf + count, PAGE_SIZE - count, "\n");
-		if (count >= PAGE_SIZE - 1)
-			break;
+			count += codec->display_register(codec,
+							 buf + count, PAGE_SIZE - count, i);

Please make it fit in 80 chars like the original code.

include/sound/soc.h static ssize_t codec_reg_show(struct device *dev, · line 981

Quoted 5 lines
include/sound/soc.h +5 -0
+		else {
+			count += snprintf(buf + count, PAGE_SIZE - count, "%2x: ", i);
+			count += snprintf(buf + count, PAGE_SIZE - count, "%4x",
+					 codec->read(codec, i));
+			count += snprintf(buf + count, PAGE_SIZE - count, "\n");

These can be a single snprintf().

You should add the loop break condition (count >= PAGE_SIZE - 1) somewhere, too.

include/sound/soc.h static ssize_t codec_reg_show(struct device *dev, · line 996

Quoted 7 lines
include/sound/soc.h +1 -5
+		}
 	}
-
-	/* Truncate count; min() would cause a warning */
-	if (count >= PAGE_SIZE)
-		count = PAGE_SIZE - 1;
-

Really safe to remove this?

thanks,

Takashi

author
#24 lore raw

Re: [PATCH 04/14] ASoC: Allow codecs to override register display

Quoted 4 lines · Takashi Iwai
Quoted 2 lines · Jon Smirl
sound/soc/soc-core.c +0 -2
-			count += codec->display_register(codec, buf + count,
-							 PAGE_SIZE - count, i);

...

Quoted 4 lines

sound/soc/soc-core.c static ssize_t codec_reg_show(struct device *dev, · line 976

Quoted 2 lines
sound/soc/soc-core.c +2 -0
+			count += codec->display_register(codec,
+							 buf + count, PAGE_SIZE - count, i);

Please make it fit in 80 chars like the original code.

This also seems to be an indentation-only change but perhaps I'm missing something here?

Quoted 6 lines

sound/soc/soc-core.c static ssize_t codec_reg_show(struct device *dev, · line 996

Quoted 4 lines
sound/soc/soc-core.c +0 -4
-	/* Truncate count; min() would cause a warning */
-	if (count >= PAGE_SIZE)
-		count = PAGE_SIZE - 1;
-

Really safe to remove this?

No. snprintf() returns how many bytes it wanted to write, not the number of bytes it wrote, which means that if the end of the buffer is hit then count will include the overspill and sysfs will complain.

#25 lore raw

Re: [PATCH 04/14] ASoC: Allow codecs to override register display

At Fri, 1 Aug 2008 16:35:40 +0100,

Quoted 9 lines · Mark Brown
Quoted 4 lines · Takashi Iwai
Quoted 2 lines · Jon Smirl
sound/soc/soc-core.c +0 -2
-			count += codec->display_register(codec, buf + count,
-							 PAGE_SIZE - count, i);

...

Quoted 7 lines
Quoted 4 lines

sound/soc/soc-core.c static ssize_t codec_reg_show(struct device *dev, · line 976

Quoted 2 lines
sound/soc/soc-core.c +2 -0
+			count += codec->display_register(codec,
+							 buf + count, PAGE_SIZE - count, i);

Please make it fit in 80 chars like the original code.

This also seems to be an indentation-only change but perhaps I'm missing something here?

In the new code, display_register() prints both the index and the value. This allows you to skip the unnecessary registers.

Quoted 10 lines
Quoted 6 lines

sound/soc/soc-core.c static ssize_t codec_reg_show(struct device *dev, · line 996

Quoted 4 lines
sound/soc/soc-core.c +0 -4
-	/* Truncate count; min() would cause a warning */
-	if (count >= PAGE_SIZE)
-		count = PAGE_SIZE - 1;
-

Really safe to remove this?

No. snprintf() returns how many bytes it wanted to write, not the number of bytes it wrote, which means that if the end of the buffer is hit then count will include the overspill and sysfs will complain.

Ah, yes. Then it has to be checked.

thanks,

Takashi

#26 lore raw

Re: [PATCH 04/14] ASoC: Allow codecs to override register display

Allow external register display to suppress sparse registers

---

 sound/soc/soc-core.c |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)
sound/soc/soc-core.c +11 -11
index 1563cee..74e626f 100644
@@ -961,7 +961,7 @@ static ssize_t codec_reg_show(struct device *dev,
 {
 	struct snd_soc_device *devdata = dev_get_drvdata(dev);
 	struct snd_soc_codec *codec = devdata->codec;
-	int i, step = 1, count = 0;
+	int i, step = 1, count;
 
 	if (!codec->reg_cache_size)
 		return 0;
@@ -969,23 +969,23 @@ static ssize_t codec_reg_show(struct device *dev,
 	if (codec->reg_cache_step)
 		step = codec->reg_cache_step;
 
-	count += sprintf(buf, "%s registers\n", codec->name);
+	count = sprintf(buf, "%s registers\n", codec->name);
 	for (i = 0; i < codec->reg_cache_size; i += step) {
-		count += sprintf(buf + count, "%2x: ", i);
-		if (count >= PAGE_SIZE - 1)
-			break;
-
 		if (codec->display_register)
 			count += codec->display_register(codec, buf + count,
 							 PAGE_SIZE - count, i);
-		else
+		else {
+			count += sprintf(buf + count, "%2x: ", i);
+			if (count >= PAGE_SIZE - 1)
+				break;
+
 			count += snprintf(buf + count, PAGE_SIZE - count,
 					  "%4x", codec->read(codec, i));
+			if (count >= PAGE_SIZE - 1)
+				break;
 
-		if (count >= PAGE_SIZE - 1)
-			break;
-
-		count += snprintf(buf + count, PAGE_SIZE - count, "\n");
+			count += snprintf(buf + count, PAGE_SIZE - count, "\n");
+		}
 		if (count >= PAGE_SIZE - 1)
 			break;
 	}
Signature · 2 lines
Jon Smirl
[email protected]
author
#27 lore raw

Re: [PATCH 04/14] ASoC: Allow codecs to override register display

Quoted 1 line · Jon Smirl

Allow external register display to suppress sparse registers

As I said when you originally proposed this I'm really not happy about changing to that interface.

Adding explicit information about registers to skip and having this function use it would be useful but munging it in makes the register display function non-reusable and means that other parts of ASoC will be unable to use the information about the void registers should they have a use for it.

#28 lore raw

Re: [PATCH 04/14] ASoC: Allow codecs to override register display

Quoted 5 lines · Mark Brown
Quoted 1 line · Jon Smirl

Allow external register display to suppress sparse registers

Quoted 9 lines

As I said when you originally proposed this I'm really not happy about
changing to that interface.

Adding explicit information about registers to skip and having this function use it would be useful but munging it in makes the register display function non-reusable and means that other parts of ASoC will be unable to use the information about the void registers should they have a use for it.

Why would ASoC care about the holes in my sparse register list? You can't use this info for suspend/resume, my registers are variable length too. I need quite a bit of information to build a cache of sparse variable length registers.

/* Size and number of variable length entries in the cache */ #define TAS_CACHE_1_MAX 41
#define TAS_CACHE_2_MAX 16
#define TAS_CACHE_3_MAX 2
#define TAS_CACHE_4_MAX 8
#define TAS_CACHE_5_MAX 30
#define TAS_CACHE_6_MAX 4

/* Size and offset of specific entries in the cache */

static struct {
	u8 size;
	u8 offset;
} cache_map[] = {

[0x00]= {1, 0xff}, /* TAS_REG_CLOCK_CONTROL */
[0x01]= {1, 0xff}, /* TAS_REG_GENERAL_STATUS */
[0x02]= {1, 0xff}, /* TAS_REG_ERROR_STATUS */
[0x03]= {1, 0}, /* TAS_REG_SYS_CONTROL_1 */
[0x04]= {1, 1}, /* TAS_REG_SYS_CONTROL_2 */
[0x05]= {1, 2}, /* TAS_REG_CH_CONFIG_1 */
[0x06]= {1, 3}, /* TAS_REG_CH_CONFIG_2 */
[0x0b]= {1, 4}, /* TAS_REG_CH_CONFIG_3 */
[0x0c]= {1, 5}, /* TAS_REG_CH_CONFIG_4 */
[0x0d]= {1, 6}, /* TAS_REG_HP_CONFIG */
[0x0e]= {1, 0xff}, /* TAS_REG_SERIAL_CONTROL */
[0x0f]= {1, 7}, /* TAS_REG_SOFT_MUTE */
[0x14]= {1, 8}, /* TAS_REG_AUTO_MUTE */
[0x15]= {1, 9}, /* TAS_REG_AUTO_MUTE_PWM */
[0x16]= {1, 10}, /* TAS_REG_MODULATE_LIMIT */
[0x1b]= {1, 11}, /* TAS_REG_IC_DELAY_1 */
[0x1c]= {1, 12}, /* TAS_REG_IC_DELAY_2 */
[0x21]= {1, 13}, /* TAS_REG_IC_DELAY_3 */
[0x22]= {1, 14}, /* TAS_REG_IC_DELAY_4 */
[0x23]= {1, 15}, /* TAS_REG_IC_OFFSET */
[0x40]= {1, 16}, /* TAS_REG_BANK_SWITCH */
[0x41]= {8, 1,}, /* TAS_REG_IN8X4_1 */
[0x42]= {8, 2,}, /* TAS_REG_IN8X4_2 */
[0x47]= {8, 3,}, /* TAS_REG_IN8X4_3 */
[0x48]= {8, TAS_CACHE_2_MAX,}, /* TAS_REG_IN8X4_4 */
[0x49]= {1, 17}, /* TAS_REG_IPMIX_1_TO_CH4 */
[0x4a]= {1, 18}, /* TAS_REG_IPMIX_2_TO_CH4 */
[0x4b]= {1, 19}, /* TAS_REG_IPMIX_3_TO_CH2 */
[0x4c]= {1, 20}, /* TAS_REG_CH3_BP_BQ2 */
[0x4d]= {1, 21}, /* TAS_REG_CH3_BP */
[0x4e]= {1, 22}, /* TAS_REG_IPMIX_4_TO_CH12 */
[0x4f]= {1, 23}, /* TAS_REG_CH4_BP_BQ2 */
[0x50]= {1, 24}, /* TAS_REG_CH4_BP */
[0x51]= {5, 1,}, /* TAS_REG_CH1_BQ_1 */
[0x52]= {5, 2,}, /* TAS_REG_CH1_BQ_2 */
[0x53]= {5, 3,}, /* TAS_REG_CH1_BQ_3 */
[0x54]= {5, 4,}, /* TAS_REG_CH1_BQ_4 */
[0x55]= {5, 5,}, /* TAS_REG_CH1_BQ_5 */
[0x56]= {5, 6,}, /* TAS_REG_CH1_BQ_6 */
[0x57]= {5, 7,}, /* TAS_REG_CH1_BQ_7 */
[0x58]= {5, 8,}, /* TAS_REG_CH2_BQ_1 */
[0x59]= {5, 9,}, /* TAS_REG_CH2_BQ_2 */
[0x5a]= {5, 10,}, /* TAS_REG_CH2_BQ_3 */
[0x5b]= {5, 11,}, /* TAS_REG_CH2_BQ_4 */
[0x5c]= {5, 12,}, /* TAS_REG_CH2_BQ_5 */
[0x5d]= {5, 13,}, /* TAS_REG_CH2_BQ_6 */
[0x5e]= {5, 14,}, /* TAS_REG_CH2_BQ_7 */
[0x7b]= {5, 15,}, /* TAS_REG_CH3_BQ_1 */
[0x7c]= {5, 16,}, /* TAS_REG_CH3_BQ_2 */
[0x7d]= {5, 17,}, /* TAS_REG_CH3_BQ_3 */
[0x7e]= {5, 18,}, /* TAS_REG_CH3_BQ_4 */
[0x7f]= {5, 19,}, /* TAS_REG_CH3_BQ_5 */
[0x80]= {5, 20,}, /* TAS_REG_CH3_BQ_6 */
[0x81]= {5, 21,}, /* TAS_REG_CH3_BQ_7 */
[0x82]= {5, 22,}, /* TAS_REG_CH4_BQ_1 */
[0x83]= {5, 23,}, /* TAS_REG_CH4_BQ_2 */
[0x84]= {5, 24,}, /* TAS_REG_CH4_BQ_3 */
[0x85]= {5, 25,}, /* TAS_REG_CH4_BQ_4 */
[0x86]= {5, 26,}, /* TAS_REG_CH4_BQ_5 */
[0x87]= {5, 27,}, /* TAS_REG_CH4_BQ_6 */
[0x88]= {5, 28,}, /* TAS_REG_CH4_BQ_7 */
[0x89]= {2, 1,}, /* TAS_REG_BT_BYPASS_CH1 */
[0x8a]= {2, 2,}, /* TAS_REG_BT_BYPASS_CH2 */
[0x8f]= {2, 3,}, /* TAS_REG_BT_BYPASS_CH3 */
[0x90]= {2, 4,}, /* TAS_REG_BT_BYPASS_CH4 */
[0x91]= {1, 25,}, /* TAS_REG_LOUDNESS_LG */
[0x92]= {2, 5,}, /* TAS_REG_LOUDNESS_LO */
[0x93]= {1, 26,}, /* TAS_REG_LOUDNESS_G */
[0x94]= {2, 6,}, /* TAS_REG_LOUDNESS_O */
[0x95]= {5, 29,}, /* TAS_REG_LOUDNESS_BQ */
[0x96]= {1, 27,}, /* TAS_REG_DRC1_CNTL_123 */
[0x97]= {1, 28,}, /* TAS_REG_DRC2_CNTL_4 */
[0x98]= {2, 7,}, /* TAS_REG_DRC1_ENERGY */
[0x99]= {4, 3,}, /* TAS_REG_DRC1_THRESHOLD */
[0x9a]= {3, 1,}, /* TAS_REG_DRC1_SLOPE */
[0x9b]= {4, 4,}, /* TAS_REG_DRC1_OFFSET */
[0x9c]= {4, 5,}, /* TAS_REG_DRC1_ATTACK */
[0x9d]= {2, 8,}, /* TAS_REG_DRC2_ENERGY */
[0x9e]= {4, 6,}, /* TAS_REG_DRC2_THRESHOLD */
[0x9f]= {2, TAS_CACHE_3_MAX,}, /* TAS_REG_DRC2_SLOPE */
[0xa0]= {4, 7,}, /* TAS_REG_DRC2_OFFSET */
[0xa1]= {4, TAS_CACHE_2_MAX,}, /* TAS_REG_DRC2_ATTACK */
[0xa2]= {2, 9,}, /* TAS_REG_DRC_BYPASS_1 */
[0xa3]= {2, 10,}, /* TAS_REG_DRC_BYPASS_2 */
[0xa8]= {2, 11,}, /* TAS_REG_DRC_BYPASS_3 */
[0xa9]= {2, 12,}, /* TAS_REG_DRC_BYPASS_4 */
[0xaa]= {2, 13,}, /* TAS_REG_SEL_OP14_S */
[0xab]= {2, 14,}, /* TAS_REG_SEL_OP14_T */
[0xb0]= {2, 15,}, /* TAS_REG_SEL_OP14_Y */
[0xb1]= {2, TAS_CACHE_2_MAX,}, /* TAS_REG_SEL_OP14_Z */
[0xcf]= {5, TAS_CACHE_5_MAX,}, /* TAS_REG_VOLUME_BQ */
[0xd0]= {1, 29}, /* TAS_REG_VOL_TB_SLEW */
[0xd1]= {1, 30}, /* TAS_REG_VOL_CH1 */
[0xd2]= {1, 31}, /* TAS_REG_VOL_CH2 */
[0xd7]= {1, 32}, /* TAS_REG_VOL_CH3 */
[0xd8]= {1, 33}, /* TAS_REG_VOL_CH4 */
[0xd9]= {1, 34}, /* TAS_REG_VOL_MASTER */
[0xda]= {1, 35}, /* TAS_REG_BASS_SET */
[0xdb]= {1, 36}, /* TAS_REG_BASS_INDEX */
[0xdc]= {1, 37}, /* TAS_REG_TREBLE_SET */
[0xdd]= {1, 38}, /* TAS_REG_TREBLE_INDEX */
[0xde]= {1, 39}, /* TAS_REG_AM_MODE */
[0xdf]= {1, 40}, /* TAS_REG_PSVC */
[0xe0]= {1, TAS_CACHE_1_MAX,}, /* TAS_REG_GENERAL_CONTROL */
};

/* location of each variable length segment in the cache array */ #define TAS_CACHE_1_BASE 0
#define TAS_CACHE_2_BASE TAS_CACHE_1_BASE + (TAS_CACHE_1_MAX + 1) #define TAS_CACHE_3_BASE TAS_CACHE_2_BASE + (TAS_CACHE_2_MAX + 1) * 2 #define TAS_CACHE_4_BASE TAS_CACHE_3_BASE + (TAS_CACHE_3_MAX + 1) * 3 #define TAS_CACHE_5_BASE TAS_CACHE_4_BASE + (TAS_CACHE_4_MAX + 1) * 4 #define TAS_CACHE_8_BASE TAS_CACHE_5_BASE + (TAS_CACHE_5_MAX + 1) * 5 #define TAS_CACHE_MAX TAS_CACHE_8_BASE + (TAS_CACHE_5_MAX + 1) * 8

/* tas5504 driver private data */

struct tas5504_priv {
	struct i2c_client *client;
	struct snd_soc_codec codec;

	/* performance shadow of i2c registers */
	u32 reg_cache[TAS_CACHE_MAX];
	u8 valid[TAS_CACHE_MAX];
};

/* these are using custom controls */

static const struct snd_kcontrol_new tas5504_snd_controls[] = {
	TAS_CTL_1R(0x00, 0, 0, "Clock Control"),
	TAS_CTL_1R(0x01, 0, 0, "General Status"),
	TAS_CTL_1(0x02, 0, 0, "Error Status"),
	TAS_CTL_1(0x03, 0, 0, "System Control 1"),
	TAS_CTL_1(0x04, 0, 0, "System Control 2"),
	TAS_CTL_1(0x05, 1, 0, "General Config"),
	TAS_CTL_1(0x06, 2, 0, "General Config"),
	TAS_CTL_1(0x0b, 3, 0, "General Config"),
	TAS_CTL_1(0x0c, 4, 0, "General Config"),
	TAS_CTL_1(0x0d, 0, 0, "Headphone Config"),
	TAS_CTL_1R(0x0e, 0, 0, "Serial Data Interface"),
	TAS_CTL_1(0x0f, 0, 0, "Soft Mute"),
	TAS_CTL_1(0x14, 0, 0, "Auto Mute"),
	TAS_CTL_1(0x15, 0, 0, "Auto Mute PWM"),
	TAS_CTL_1R(0x16, 0, 0, "Modulation"),
	TAS_CTL_1(0x1b, 1, 0, "Interchannel Delay"),
	TAS_CTL_1(0x1c, 2, 0, "Interchannel Delay"),
	TAS_CTL_1(0x21, 3, 0, "Interchannel Delay"),
	TAS_CTL_1(0x22, 4, 0, "Interchannel Delay"),
	TAS_CTL_1(0x23, 0, 0, "Interchannel Offset"),
	TAS_CTL_1(0x40, 4, 0, "Bank Switching"),
	TAS_CTL_8(0x41, 1, 0, "Input Mixer"),
	TAS_CTL_8(0x42, 2, 0, "Input Mixer"),
	TAS_CTL_8(0x47, 3, 0, "Input Mixer"),
	TAS_CTL_8(0x48, 4, 0, "Input Mixer"),
	TAS_CTL_1(0x49, 0, 0, "Bass ipmix_1_to_ch4"),
	TAS_CTL_1(0x4a, 0, 0, "Bass ipmix_2_to_ch4"),
	TAS_CTL_1(0x4b, 0, 0, "Bass ipmix_3_to_ch12"),
	TAS_CTL_1(0x4c, 0, 0, "Bass ch3_bp_bq2"),
	TAS_CTL_1(0x4d, 0, 0, "Bass ch3_bq2"),
	TAS_CTL_1(0x4e, 0, 0, "Bass ipmix_4_to_ch12"),
	TAS_CTL_1(0x4f, 0, 0, "Bass ch4_bp_bq2"),
	TAS_CTL_1(0x50, 0, 0, "Bass ch4_bq2"),
	TAS_CTL_5(0x51, 1, 1, "Biquad"),
	TAS_CTL_5(0x52, 1, 2, "Biquad"),
	TAS_CTL_5(0x53, 1, 3, "Biquad"),
	TAS_CTL_5(0x54, 1, 4, "Biquad"),
	TAS_CTL_5(0x55, 1, 5, "Biquad"),
	TAS_CTL_5(0x56, 1, 6, "Biquad"),
	TAS_CTL_5(0x57, 1, 7, "Biquad"),
	TAS_CTL_5(0x58, 2, 1, "Biquad"),
	TAS_CTL_5(0x59, 2, 2, "Biquad"),
	TAS_CTL_5(0x5a, 2, 3, "Biquad"),
	TAS_CTL_5(0x5b, 2, 4, "Biquad"),
	TAS_CTL_5(0x5c, 2, 5, "Biquad"),
	TAS_CTL_5(0x5d, 2, 6, "Biquad"),
	TAS_CTL_5(0x5e, 2, 7, "Biquad"),
	TAS_CTL_5(0x7b, 3, 1, "Biquad"),
	TAS_CTL_5(0x7c, 3, 2, "Biquad"),
	TAS_CTL_5(0x7d, 3, 3, "Biquad"),
	TAS_CTL_5(0x7e, 3, 4, "Biquad"),
	TAS_CTL_5(0x7f, 3, 5, "Biquad"),
	TAS_CTL_5(0x80, 3, 6, "Biquad"),
	TAS_CTL_5(0x81, 3, 7, "Biquad"),
	TAS_CTL_5(0x82, 4, 1, "Biquad"),
	TAS_CTL_5(0x83, 4, 2, "Biquad"),
	TAS_CTL_5(0x84, 4, 3, "Biquad"),
	TAS_CTL_5(0x85, 4, 4, "Biquad"),
	TAS_CTL_5(0x86, 4, 5, "Biquad"),
	TAS_CTL_5(0x87, 4, 6, "Biquad"),
	TAS_CTL_5(0x88, 4, 7, "Biquad"),
	TAS_CTL_2(0x89, 1, 0, "Bass/Treble Bypass"),
	TAS_CTL_2(0x8a, 2, 0, "Bass/Treble Bypass"),
	TAS_CTL_2(0x8f, 3, 0, "Bass/Treble Bypass"),
	TAS_CTL_2(0x90, 4, 0, "Bass/Treble Bypass"),
	TAS_CTL_1(0x91, 0, 0, "Loudness Log2 Gain"),
	TAS_CTL_1_64(0x92, 0, 0, "Loudness Log2 Offset"),
	TAS_CTL_1(0x93, 0, 0, "Loudness Gain"),
	TAS_CTL_1_64(0x94, 0, 0, "Loudness Offset"),
	TAS_CTL_5(0x95, 0, 0, "Loudness Biquad"),
	TAS_CTL_1(0x96, 0, 0, "DRC Control 1-3"),
	TAS_CTL_1(0x97, 0, 0, "DRC Control 4"),
	TAS_CTL_2(0x97, 0, 0, "DRC Energy"),
	TAS_CTL_2_64(0x97, 0, 0, "DRC Threshold"),
	TAS_CTL_3(0x97, 0, 0, "DRC Slope"),
	TAS_CTL_2_64(0x97, 0, 0, "DRC Offset"),
	TAS_CTL_4(0x97, 0, 0, "DRC Attack/Delay"),
	TAS_CTL_2(0x9d, 4, 0, "DRC Energy"),
	TAS_CTL_2_64(0x9e, 4, 0, "DRC Threshold"),
	TAS_CTL_3(0x9f, 4, 0, "DRC Slope"),
	TAS_CTL_2_64(0xa0, 4, 0, "DRC Offset"),
	TAS_CTL_4(0xa1, 4, 0, "DRC Attack/Delay"),
	TAS_CTL_2(0xa2, 1, 0, "DRC Bypass"),
	TAS_CTL_2(0xa3, 2, 0, "DRC Bypass"),
	TAS_CTL_2(0xa8, 3, 0, "DRC Bypass"),
	TAS_CTL_2(0xa9, 4, 0, "DRC Bypass"),
	TAS_CTL_2(0xaa, 1, 0, "Output Mixer"),
	TAS_CTL_2(0xab, 2, 0, "Output Mixer"),
	TAS_CTL_3(0xb0, 3, 0, "Output Mixer"),
	TAS_CTL_3(0xb1, 4, 0, "Output Mixer"),
	TAS_CTL_5(0xcf, 0, 0, "Volume Biquad"),
	TAS_CTL_1(0xd0, 0, 0, "Volume Slew"),
	TAS_CTL_1(0xd1, 1, 0, "Volume"),
	TAS_CTL_1(0xd2, 2, 0, "Volume"),
	TAS_CTL_1(0xd7, 3, 0, "Volume"),
	TAS_CTL_1(0xd8, 4, 0, "Volume"),
	SOC_SINGLE("PCM Playback Volume", 0xd9, 0, 0x3ff, 1),
	TAS_CTL_1(0xda, 0, 0, "Bass Filter Set"),
	TAS_CTL_1(0xdb, 0, 0, "Bass Filter Index"),
	TAS_CTL_1(0xdc, 0, 0, "Treble Filter Set"),
	TAS_CTL_1(0xdd, 0, 0, "Treble Filter Index"),
	TAS_CTL_1(0xde, 0, 0, "AM Mode"),
	TAS_CTL_1(0xdf, 0, 0, "PSCV Range"),
	TAS_CTL_1(0xe0, 0, 0, "General Control"),
};

root@phyCORE-MPC5200B-tiny:/sys cat ./devices/platform/soc-audio.0/codec_reg tas5504 registers

 0:  54
 1:  03
 2:  78
 3:  90
 4:  00
 5:  e0
 6:  e0
 b:  e0
 c:  e0
 d:  00
 e:  05
 f:  00
14:  84
15:  05
16:  02
1b:  80
1c:  00
21:  e0
22:  60
23:  00
40:  0000ff00
41:  fffffff6 000000cf c3809000 c39e9e90 c01df494 c0338890 00000001 000000cf
42:  00000ae3 c3052000 c3809004 c39e9eb0 00000000 00000000 00000000 00000000
47:  00000000 00000000 00000000 00000000 00000000 00000000 00800000 00000000
48:  00000000 00000000 00000000 00000000 00000000 00000000 00000000 00800000
49:  00000000
4a:  00000000
4b:  00000000
4c:  00000000
4d:  00800000
4e:  00000000
4f:  00000000
50:  00800000
51:  fffffff6 000000a0 c3809000 00000000 00000000
52:  00800000 00000000 00000000 00000000 00000000
53:  00800000 00000000 00000000 00000000 00000000
54:  00800000 00000000 00000000 00000000 00000000
55:  00800000 00000000 00000000 0000883f 007f77c0
56:  00000056 003fffa8 c39e9e70 c01324a4 03000000
57:  c39e9e78 c39e9e50 c38ebfc0 a1052000 00000000
58:  00000000 fffffff6 000000a1 c3809000 00000000
59:  00800000 00000000 00000000 00000000 00000000
5a:  00800000 00000000 00000000 00000000 00000000
5b:  00800000 00000000 00000000 00000000 00000000
5c:  00800000 00000000 00000000 00000000 00000000
5d:  00800000 00000000 00000000 00000000 00000000
5e:  00800000 00000000 00000000 00000000 00000000
7b:  00800000 00000000 00000000 00000000 00000000
7c:  00800000 00000000 00000000 00000000 00000000
7d:  00800000 00000000 00000000 00000000 00000000
7e:  00800000 00000000 00000000 00000000 00000000
7f:  00800000 00000000 00000000 00000000 00000000
80:  00800000 00000000 00000000 00000000 00000000
81:  00800000 00000000 00000000 00000000 00000000
82:  00800000 00000000 00000000 00000000 00000000
83:  00800000 00000000 00000000 00000000 00000000
84:  00800000 00000000 00000000 00000000 00000000
85:  00800000 00000000 00000000 00000000 00000000
86:  00800000 00000000 00000000 00000000 00000005
87:  00800000 00000000 00000000 00000000 00000000
88:  00800000 00000000 00000000 00000000 00000000
89:  00800000 00000000
8a:  00400000 0fc00000
8f:  00000005 00000028
90:  00800000 00000000
91:  0fc00000
92:  00000000 00000000
93:  00000000
94:  00000000 00000000
95:  0000d513 00000000 0fff2aed 00fe5045 0f81aa27
96:  00000000
97:  00000000
98:  0000883f 007f77c0
99:  00000000 0b20e2b2 00000000 06f9de58
9a:  00400000 0fc00000 0f900000
9b:  0000ffff ff823098 00000000 0195b2c0
9c:  0000883f 007f77c0 00000056 003fffa8
9d:  0000883f 007f77c0
9e:  00000000 0b20e2b2 00000000 06f9de58
9f:  00400000 0fc00000
a0:  0000ffff ff823098 00000000 0195b2c0
a1:  0000883f 007f77c0 00000056 003fffa8
a2:  00800000 00000000
a3:  00800000 00000000
a8:  00800000 00000000
a9:  00800000 00000000
aa:  00800000 00000000
ab:  10800000 00000000
b0:  60800000 00000000
b1:  70800000 00000000
cf:  00800000 00000000 00000000 00000000 00000000
d0:  0000013f
d1:  00000048
d2:  00000048
d7:  00000048
d8:  00000048
d9:  00000245
da:  03030303
db:  12121212
dc:  03030303
dd:  12121212
de:  00000000
df:  00000002
e0:  00000000

root@phyCORE-MPC5200B-tiny:/sys

Signature · 2 lines
Jon Smirl
[email protected]
author
#29 lore raw

Re: [PATCH 04/14] ASoC: Allow codecs to override register display

Quoted 4 lines · Jon Smirl

Why would ASoC care about the holes in my sparse register list? You can't use this info for suspend/resume, my registers are variable length too. I need quite a bit of information to build a cache of sparse variable length registers.

Well, this function here is one example - any other diagnostic output for registers will have the same issue, such as the more detailed information about register/control mapping which I talked about in my previous e-mail.

#30 lore raw

Re: [PATCH 04/14] ASoC: Allow codecs to override register display

In reply to Mark Brown

At Fri, 1 Aug 2008 17:16:13 +0100,

Quoted 5 lines · Mark Brown
Quoted 1 line · Jon Smirl

Allow external register display to suppress sparse registers

Quoted 8 lines

As I said when you originally proposed this I'm really not happy about changing to that interface.

Adding explicit information about registers to skip and having this function use it would be useful but munging it in makes the register display function non-reusable and means that other parts of ASoC will be unable to use the information about the void registers should they have a use for it.

Hm, is display_register already used in asoc tree by any drivers? If so, then it's a step backward, and I understand your statement.

OTOH, showing lots of meaningless registers is bad, too.

Looking back soc-core.c again, the primary problem is that codec_reg_show() assumes that the continuous register table beginning from 0. It'd be much easier if the driver provides a complete show method by itself for non-standard cases, e.g. sparse registers (i.e. just pass buf and let fill the whole page).

Takashi

author
#31 lore raw

Re: [PATCH 04/14] ASoC: Allow codecs to override register display

Quoted 2 lines · Takashi Iwai

Hm, is display_register already used in asoc tree by any drivers? If so, then it's a step backward, and I understand your statement.

No, there are no users. It was added purely due to Jon's request.

Quoted 1 line

OTOH, showing lots of meaningless registers is bad, too.

I agree - as I say, I do think supporting suppression of the display of irrelevant/nonexistant registers would be a win.

Quoted 5 lines

Looking back soc-core.c again, the primary problem is that codec_reg_show() assumes that the continuous register table beginning from 0. It'd be much easier if the driver provides a complete show method by itself for non-standard cases, e.g. sparse registers (i.e. just pass buf and let fill the whole page).

There are two issues:

- I don't like pushing the entire file format into the codec driver; it feels wrong since it increases the amount of non-shared code.

- Doing that prevents reuse of any part of the information elsewhere. For example, if we were to display a register value anywhere else a different interface would be required to allow codecs to override the display there.

I know there are people who'd love to see things like more detailed register/control mapping information.

#32 lore raw

Re: [PATCH 04/14] ASoC: Allow codecs to override register display

Quoted 25 lines · Mark Brown
Quoted 2 lines · Takashi Iwai

Hm, is display_register already used in asoc tree by any drivers? If so, then it's a step backward, and I understand your statement.

No, there are no users. It was added purely due to Jon's request.

Quoted 1 line

OTOH, showing lots of meaningless registers is bad, too.

I agree - as I say, I do think supporting suppression of the display of
irrelevant/nonexistant registers would be a win.

Quoted 5 lines

Looking back soc-core.c again, the primary problem is that codec_reg_show() assumes that the continuous register table beginning from 0. It'd be much easier if the driver provides a complete show method by itself for non-standard cases, e.g. sparse registers (i.e. just pass buf and let fill the whole page).

There are two issues:

Quoted 7 lines

- I don't like pushing the entire file format into the codec driver; it feels wrong since it increases the amount of non-shared code.

- Doing that prevents reuse of any part of the information elsewhere. For example, if we were to display a register value anywhere else a different interface would be required to allow codecs to override the display there.

But you are stuck with the override. You don't know how to display or even read the 256 bit registers present on the TI chips.

There are more fundamental issues, struct snd_kcontrol doesn't have a field for storing the register address, it is being carried around in the private_value data.

Quoted 8 lines

I know there are people who'd love to see things like more detailed register/control mapping information.

_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

Signature · 2 lines
Jon Smirl
[email protected]
author
#33 lore raw

Re: [PATCH 04/14] ASoC: Allow codecs to override register display

Quoted 8 lines · Jon Smirl
Quoted 3 lines · Mark Brown

For example, if we were to display a register value anywhere else a different interface would be required to allow codecs to override the display there.

But you are stuck with the override. You don't know how to display or even read the 256 bit registers present on the TI chips.

Yes, absolutely - this is my point. I have no problem at all with having the ability to override the register display, it seems useful.

Quoted 3 lines

There are more fundamental issues, struct snd_kcontrol doesn't have a field for storing the register address, it is being carried around in the private_value data.

Yes, I don't see the implementation being enormously elegant. We should have enough information to figure it out, though.

#34 lore raw
In reply to Mark Brown

At Tue, 29 Jul 2008 11:42:22 +0100,

Quoted 9 lines · Mark Brown

From: Dmitry Baryshkov <[email protected]>

---
This is a compile fix and it would therefore be good if it could be considered for merge into 2.6.27.

OK, applied and put to for-linus / for-next trees.

All others are for the next kernel, right?

thanks,

Takashi

author
#35 lore raw
Quoted 1 line · Takashi Iwai

All others are for the next kernel, right?

Actually, "Export dapm_reg_event() fully" should probably be pushed in too but it's not so urgent.

There's no urgent reason to hold the drivers out of mainline but that'd bypass -next.

The core changes should definitely wait for next.

#36 lore raw

At Tue, 29 Jul 2008 14:47:13 +0100,

Quoted 7 lines · Mark Brown
Quoted 1 line · Takashi Iwai

All others are for the next kernel, right?

Actually, "Export dapm_reg_event() fully" should probably be pushed in too but it's not so urgent.

OK, let's push it too.

thanks,

Takashi