gmane.linux.alsa.devel

[PATCH alsa-lib] Allow specifying the max number ofcards

Takashi Iwai — 2013-05-24T15:23:33

Add --with-max-cards option to specify the max number of cards in
configure script, when the support for more than 32 cards is
required.

Signed-off-by: Takashi Iwai <tiwai< at >suse.de>
---
 configure.in             | 14 ++++++++++++++
 src/confmisc.c           |  2 +-
 src/control/cards.c      |  6 +++---
 src/control/control_hw.c |  2 +-
 src/hwdep/hwdep_hw.c     |  2 +-
 5 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/configure.in b/configure.in
index 35b8e84..3d394fc 100644
--- a/configure.in
+++ b/configure.in
< at >< at > -632,6 +632,20 < at >< at > for t in $CTL_PLUGIN_LIST; do
   fi
 done
 
+dnl Max number of cards
+AC_MSG_CHECKING(for max number of cards)
+AC_ARG_WITH(max-cards,
+  AS_HELP_STRING([--with-max-cards], [Specify the max number of cards (default = 32)]),
+  [ max_cards="$withval" ], [ max_cards="32" ])
+AC_MSG_RESULT([$max_cards])
+
+if test "$max_cards" -lt 1; then
+   AC_ERROR([Invalid max cards $max_cards])
+elif test "$max_cards" -gt 256; then
+   AC_ERROR([Invalid max cards $max_cards])
+fi

[PATCH 2/2] ALSA: Add kconfig to specify the max cardnumbers

Takashi Iwai — 2013-05-24T14:46:44

Currently ALSA supports up to 32 card instances when the dynamic minor
is used.  While 32 cards are usually big enough for normal use cases,
there are sometimes weird requirements with more card support.

Actually, this limitation, 32, comes from the index option, where you
can pass the bit mask to assign the card.  Other than that, we can
actually give more cards up to the minor number limits (currently 256,
which can be extended more, too).

This patch adds a new Kconfig to specify the max card numbers, and
changes a few places to accept more than 32 cards.

The only incompatibility with high card numbers would be the handling
of index option.  The index option can be still used to pass the
bitmask for card assignments, but this works only up to 32 slots.
More than 32, no bitmask style option is available but only a single
slot can be specified via index option.

Signed-off-by: Takashi Iwai <tiwai< at >suse.de>
---
 include/sound/core.h |  2 +-
 sound/core/Kconfig   |  9 +++++++++
 sound/core/init.c    | 25 +++

[PATCH 1/2] ALSA: Fix the default suffix string withhigh card number

Takashi Iwai — 2013-05-24T14:46:43

ALSA core tries to add a suffix as "_1" automatically when the given
id string conflicts.  The current code assumes implicitly that the max
card number is 16 so that the single hex "_X" suffix can be put.
However, with the dynamic device management, the card can be at most
32, so it can put even a non-hex character there.  Also, when the max
card number is increased in future, this would result in worse.

This patch rewrites the code to add the suffix string in a simpler
(thus cleaner) way.  It can support up to three digits, so it should
suffice for most requirements.

Signed-off-by: Takashi Iwai <tiwai< at >suse.de>
---
 sound/core/init.c | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/sound/core/init.c b/sound/core/init.c
index 6ef0640..ed4a481 100644
--- a/sound/core/init.c
+++ b/sound/core/init.c
< at >< at > -549,7 +549,6 < at >< at > static void snd_card_set_id_no_lock(struct snd_card *card, const char *src,
     const char *nid)
 {
 int len, loops;
-bool with_suffix;

Re: [PATCH] ALSA: Constify the snd_pcm_substreamstructops field

Takashi Iwai — 2013-05-24T13:42:16

At Fri, 24 May 2013 15:18:10 +0200,
Lars-Peter Clausen wrote:

Thanks, applied.


Takashi

Re: regression: from 3.8 to 3.9: headphones output nosound on Intel HDA, codec VIA VT1802

Takashi Iwai — 2013-05-24T13:29:10

At Sat, 18 May 2013 22:29:57 +0200,
Alex Riesen wrote:

Looking at the outputs above, it seems that turning on/off EAPD on VT
codecs triggers the automatic power up/down of the pin, which leads to
the unexpected result.

Could you try the patch below?


thanks,

Takashi

---
diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c
index ae85bbd2..ce5446b 100644
--- a/sound/pci/hda/hda_generic.c
+++ b/sound/pci/hda/hda_generic.c
< at >< at > -788,6 +788,8 < at >< at > static void set_pin_eapd(struct hda_codec *codec, hda_nid_t pin, bool enable)
 return;
 if (codec->inv_eapd)
 enable = !enable;
+if (spec->keep_eapd_on && !enable)
+return;
 snd_hda_codec_update_cache(codec, pin, 0,
    AC_VERB_SET_EAPD_BTLENABLE,
    enable ? 0x02 : 0x00);
diff --git a/sound/pci/hda/hda_generic.h b/sound/pci/hda/hda_generic.h
index 54e6651..7620031 100644
--- a/sound/pci/hda/hda_generic.h
+++ b/sound/pci/hda/hda_generic.h
< at >< at > -222,6 +222,7 < at >< at > struct hda_gen_spec {
 unsigned int multi_cap_vol:1; /* allow multiple capt

[PATCH] ALSA: Constify the snd_pcm_substream structops field

Lars-Peter Clausen — 2013-05-24T13:18:10

The ops field of the snd_pcm_substream struct is never modified inside the ALSA
core. Making it const allows drivers to declare their snd_pcm_ops struct as
const.

Signed-off-by: Lars-Peter Clausen <lars< at >metafoo.de>
---
 include/sound/pcm.h  | 5 +++--
 sound/core/pcm_lib.c | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/include/sound/pcm.h b/include/sound/pcm.h
index b48792f..84b10f9 100644
--- a/include/sound/pcm.h
+++ b/include/sound/pcm.h
< at >< at > -384,7 +384,7 < at >< at > struct snd_pcm_substream {
 unsigned int dma_buf_id;
 size_t dma_max;
 /* -- hardware operations -- */
-struct snd_pcm_ops *ops;
+const struct snd_pcm_ops *ops;
 /* -- runtime information -- */
 struct snd_pcm_runtime *runtime;
         /* -- timer section -- */
< at >< at > -871,7 +871,8 < at >< at > const unsigned char *snd_pcm_format_silence_64(snd_pcm_format_t format);
 int snd_pcm_format_set_silence(snd_pcm_format_t format, void *buf, unsigned int frames);
 snd_pcm_format_t snd_pcm_build_linear_format(int width, int unsigned, int big_e

Re: My ALSA amidicat program

Takashi Iwai — 2013-05-24T12:25:03

At Wed, 22 May 2013 01:41:25 -0700,
Josh Lehan wrote:

Could you simply submit a patch?  Then we review and merge it to the
git repo.


thanks,

Takashi

Re: [PATCH 1/6] ASoC: ux500: Drop pinctrl sleep support

Linus Walleij — 2013-05-24T11:11:09

On Fri, May 24, 2013 at 12:39 PM, Fabio Baltieri
<fabio.baltieri< at >linaro.org> wrote:


Acked-by: Linus Walleij <linus.walleij< at >linaro.org>

Yours,
Linus Walleij

Re: [PATCH] ucm: Fix segfault when device argumentismissing from _sw{dev, mod}

Takashi Iwai — 2013-05-24T11:05:04

At Fri, 24 May 2013 14:01:25 +0300,
Juho Hämäläinen wrote:

Thanks, applied.


Takashi

_______________________________________________
Alsa-devel mailing list
Alsa-devel< at >alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

[PATCH] ucm: Fix segfault when device argument ismissing from _sw{dev, mod}

Juho Hämäläinen — 2013-05-24T11:01:25

Signed-off-by: Juho Hämäläinen <juho.hamalainen< at >tieto.com>
---
 src/ucm/main.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/ucm/main.c b/src/ucm/main.c
index d38b7fa..0494728 100644
--- a/src/ucm/main.c
+++ b/src/ucm/main.c
< at >< at > -1647,7 +1647,8 < at >< at > int snd_use_case_set(snd_use_case_mgr_t *uc_mgr,
                 goto __end;
                         }
                 } else {
-                        str = NULL;
+                        err = -EINVAL;
+                        goto __end;
                 }
                 if (check_identifier(identifier, "_swdev"))
                         err = switch_device(uc_mgr, str, value);

[PATCH] ASoC: wm5110: Correct DSP4R Mixer control name

Charles Keepax — 2013-05-24T10:40:43

Signed-off-by: Charles Keepax <ckeepax< at >opensource.wolfsonmicro.com>
---
 sound/soc/codecs/wm5110.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sound/soc/codecs/wm5110.c b/sound/soc/codecs/wm5110.c
index c00480b..ba38f06 100644
--- a/sound/soc/codecs/wm5110.c
+++ b/sound/soc/codecs/wm5110.c
< at >< at > -190,7 +190,7 < at >< at > ARIZONA_MIXER_CONTROLS("DSP2R", ARIZONA_DSP2RMIX_INPUT_1_SOURCE),
 ARIZONA_MIXER_CONTROLS("DSP3L", ARIZONA_DSP3LMIX_INPUT_1_SOURCE),
 ARIZONA_MIXER_CONTROLS("DSP3R", ARIZONA_DSP3RMIX_INPUT_1_SOURCE),
 ARIZONA_MIXER_CONTROLS("DSP4L", ARIZONA_DSP4LMIX_INPUT_1_SOURCE),
-ARIZONA_MIXER_CONTROLS("DSP5R", ARIZONA_DSP4RMIX_INPUT_1_SOURCE),
+ARIZONA_MIXER_CONTROLS("DSP4R", ARIZONA_DSP4RMIX_INPUT_1_SOURCE),
 
 ARIZONA_MIXER_CONTROLS("Mic", ARIZONA_MICMIX_INPUT_1_SOURCE),
 ARIZONA_MIXER_CONTROLS("Noise", ARIZONA_NOISEMIX_INPUT_1_SOURCE),

Re: [PATCH] ucm: Fix segfault when device argumentismissing from _sw{dev, mod}

Takashi Iwai — 2013-05-24T10:50:17

At Fri, 24 May 2013 11:12:57 +0300,
Juho Hämäläinen wrote:

It's more straightforward to fold the error path into the else block
in the above.


thanks,

Takashi

_______________________________________________
Alsa-devel mailing list
Alsa-devel< at >alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

[PATCH] ASoC: wm5110: Correct DSP4R Mixer control name

Charles Keepax — 2013-05-24T10:38:24

Signed-off-by: Charles Keepax <ckeepax< at >opensource.wolfsonmicro.com>
---
 sound/soc/codecs/wm5110.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sound/soc/codecs/wm5110.c b/sound/soc/codecs/wm5110.c
index c00480b..ba38f06 100644
--- a/sound/soc/codecs/wm5110.c
+++ b/sound/soc/codecs/wm5110.c
< at >< at > -190,7 +190,7 < at >< at > ARIZONA_MIXER_CONTROLS("DSP2R", ARIZONA_DSP2RMIX_INPUT_1_SOURCE),
 ARIZONA_MIXER_CONTROLS("DSP3L", ARIZONA_DSP3LMIX_INPUT_1_SOURCE),
 ARIZONA_MIXER_CONTROLS("DSP3R", ARIZONA_DSP3RMIX_INPUT_1_SOURCE),
 ARIZONA_MIXER_CONTROLS("DSP4L", ARIZONA_DSP4LMIX_INPUT_1_SOURCE),
-ARIZONA_MIXER_CONTROLS("DSP5R", ARIZONA_DSP4RMIX_INPUT_1_SOURCE),
+ARIZONA_MIXER_CONTROLS("DSP4R", ARIZONA_DSP4RMIX_INPUT_1_SOURCE),
 
 ARIZONA_MIXER_CONTROLS("Mic", ARIZONA_MICMIX_INPUT_1_SOURCE),
 ARIZONA_MIXER_CONTROLS("Noise", ARIZONA_NOISEMIX_INPUT_1_SOURCE),

[PATCH 3/6] ASoC: ux500: Drop dangling structi2s_controller

Fabio Baltieri — 2013-05-24T10:39:17

Drop struct i2s_controller from the ux500 ASoC driver as right now it is
instantiated but not used anywhere.  Also drop a mismatched
device_unregister in the process.

Signed-off-by: Fabio Baltieri <fabio.baltieri< at >linaro.org>
---
 sound/soc/ux500/ux500_msp_i2s.c | 19 -------------------
 sound/soc/ux500/ux500_msp_i2s.h | 12 ------------
 2 files changed, 31 deletions(-)

diff --git a/sound/soc/ux500/ux500_msp_i2s.c b/sound/soc/ux500/ux500_msp_i2s.c
index b029b2d..cba0e86 100644
--- a/sound/soc/ux500/ux500_msp_i2s.c
+++ b/sound/soc/ux500/ux500_msp_i2s.c
< at >< at > -649,7 +649,6 < at >< at > int ux500_msp_i2s_init_msp(struct platform_device *pdev,
 struct msp_i2s_platform_data *platform_data)
 {
 struct resource *res = NULL;
-struct i2s_controller *i2s_cont;
 struct device_node *np = pdev->dev.of_node;
 struct ux500_msp *msp;
 
< at >< at > -694,22 +693,6 < at >< at > int ux500_msp_i2s_init_msp(struct platform_device *pdev,
 msp->msp_state = MSP_STATE_IDLE;
 msp->loopback_enable = 0;
 
-/* I2S-controller is allocated and added in I2S con

[PATCH 1/6] ASoC: ux500: Drop pinctrl sleep support

Fabio Baltieri — 2013-05-24T10:39:15

Drop pinctrl default/sleep state switching code, as it was breaking the
capture interface by putting the I2S pins in hi-z mode regardless of its
usage status, and not giving any real benefit.

Pinctrl default mode configuration is already managed automatically by a
specific pinctrl hog.

Signed-off-by: Fabio Baltieri <fabio.baltieri< at >linaro.org>
---
 sound/soc/ux500/ux500_msp_i2s.c | 56 ++---------------------------------------
 sound/soc/ux500/ux500_msp_i2s.h |  6 -----
 2 files changed, 2 insertions(+), 60 deletions(-)

diff --git a/sound/soc/ux500/ux500_msp_i2s.c b/sound/soc/ux500/ux500_msp_i2s.c
index f2db6c9..b029b2d 100644
--- a/sound/soc/ux500/ux500_msp_i2s.c
+++ b/sound/soc/ux500/ux500_msp_i2s.c
< at >< at > -15,7 +15,6 < at >< at >
 
 #include <linux/module.h>
 #include <linux/platform_device.h>
-#include <linux/pinctrl/consumer.h>
 #include <linux/delay.h>
 #include <linux/slab.h>
 #include <linux/io.h>
< at >< at > -26,9 +25,6 < at >< at >
 
 #include "ux500_msp_i2s.h"
 
-/* MSP1/3 Tx/Rx usage protection */
-static DEFINE_SPINLOCK(msp_rx

[PATCH 0/6] More code cleanup for ASoC ux500

Fabio Baltieri — 2013-05-24T10:39:14

Hi Mark,

this series contains more various code cleanup patches that I put
together while working on other stuff this drivers.

The first patch is actually a resend, as Linus Walleij agreed to drop
that code in the original thread (https://lkml.org/lkml/2013/5/17/487).

The others are just a bunch of sparse fixes and generic code cleanup and
dead code removal.

Thanks,
Fabio


Fabio Baltieri (6):
  ASoC: ux500: Drop pinctrl sleep support
  ASoC: ab8500-codec: Move codec ops on a separate structure
  ASoC: ux500: Drop dangling struct i2s_controller
  ASoC: ux500: Drop unused code from msp headers
  ASoC: ux500: Add missing mop500_ab8500.h include
  ASoC: ux500: Drop redundant msp id enumerations

 sound/soc/codecs/ab8500-codec.c | 19 ++++-------
 sound/soc/ux500/mop500_ab8500.c |  1 +
 sound/soc/ux500/ux500_msp_dai.h |  2 --
 sound/soc/ux500/ux500_msp_i2s.c | 75 ++---------------------------------------
 sound/soc/ux500/ux500_msp_i2s.h | 59 ++------------------------------
 5 files changed, 12 insertions(+),

Re: [PATCH 3/6] dma: Add a jz4740 dmaengine driver

Vinod Koul — 2013-05-24T07:54:03

One of them based on direction would be right

and that should change, typically the driver will preallocate a pool of
descriptors. These are to be used later for .device_prep_xxx calls.

--
~Vinod

[PATCH] ucm: Fix segfault when device argument ismissing from _sw{dev, mod}

Juho Hämäläinen — 2013-05-24T08:12:57

Signed-off-by: Juho Hämäläinen <juho.hamalainen< at >tieto.com>
---
 src/ucm/main.c |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/ucm/main.c b/src/ucm/main.c
index d38b7fa..74e1530 100644
--- a/src/ucm/main.c
+++ b/src/ucm/main.c
< at >< at > -1649,6 +1649,10 < at >< at > int snd_use_case_set(snd_use_case_mgr_t *uc_mgr,
                 } else {
                         str = NULL;
                 }
+                if (!str) {
+                    err = -EINVAL;
+                    goto __end;
+                }
                 if (check_identifier(identifier, "_swdev"))
                         err = switch_device(uc_mgr, str, value);
                 else if (check_identifier(identifier, "_swmod"))

Re: [PATCH 3/6] dma: Add a jz4740 dmaengine driver

Lars-Peter Clausen — 2013-05-24T05:58:04

I'd prefer to keep it the way it is. The JZ4740_DMA_WIDTH constants end up
being written to the hardware, while the DMA_SLAVE_BUSWIDTH constants are Linux
internal. I prefer to not mix these two up.


This one needs both.


I'm saving the whole config, which will later be used to retrieve the source or
dest address.

[...]

Well, zero descriptors have been allocated. As far as I can see only a negative
return value is treated as an error. Also the core doesn't seem to use the
return value for anything else but checking if it is an error.

[...]

But there are 6 channels ;)

[...]

I don't need it.

Thanks for the quick review.
- Lars

Re: How to specify data format if playback/capturewere different ?

Kuninori Morimoto — 2013-05-24T03:18:09

Hi Lars

Thank you for your comments


This (playback and capture wer different format) is first case for me.
Maybe ak4554 is very special.
OK, I understand, thank you very much

Best regards
---
Kuninori Morimoto

Re: Problem opening default device in haswell system using aplay

Raymond Yau — 2013-05-24T02:18:27

problem if I run aplay -D sysdefault.

defaults.pcm.dmix.device defaults.pcm.device

You have to change defaults.pcm.dmix.device to the device of  your hdmi if
your are not using the analog device 0