October 2010 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [RFC_iii/iv 2/2] ASoC: Allow register dailess codecs in machine driver
by Jarkko Nikula 29 Oct '10

29 Oct '10

This makes possible to register dailess codecs in a machine driver. Term dailess is used here for amplifiers and codecs without DAI or DAI being unused. Dailess codecs are registered by letting cpu_dai_name, codec_dai_name and platform_name to be NULL in struct snd_soc_dev_map. Other fields remain the same so machine driver can setup paths and widgets for dailess codecs as usual. Only difference is that the PCM is not created. Signed-off-by: Jarkko Nikula <jhnikula(a)gmail.com> --- include/sound/soc.h | 1 + sound/soc/soc-core.c | 32 ++++++++++++++++++++++---------- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/include/sound/soc.h b/include/sound/soc.h index 49e48f0..17f985c 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -603,6 +603,7 @@ struct snd_soc_pcm_runtime { unsigned int complete:1; unsigned int dev_registered:1; + unsigned int dailess:1; /* Symmetry data - only valid if symmetry is being enforced */ unsigned int rate; diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index fa05fa8..b904a20 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1217,7 +1217,7 @@ static int soc_bind_dev_map(struct snd_soc_card *card, int num) dev_dbg(card->dev, "binding %s at idx %d\n", dev_map->name, num); /* do we already have the CPU DAI for this link ? */ - if (rtd->cpu_dai) { + if (rtd->cpu_dai || !dev_map->cpu_dai_name) { goto find_codec; } /* no, then find CPU DAI from registered DAIs*/ @@ -1248,6 +1248,9 @@ find_codec: if (!try_module_get(codec->dev->driver->owner)) return -ENODEV; + if (!dev_map->codec_dai_name) + goto find_platform; + /* CODEC found, so find CODEC DAI from registered DAIs from this CODEC*/ list_for_each_entry(codec_dai, &dai_list, list) { if (codec->dev == codec_dai->dev && @@ -1267,7 +1270,7 @@ find_codec: find_platform: /* do we already have the CODEC DAI for this link ? */ - if (rtd->platform) { + if (rtd->platform || !dev_map->platform_name) { goto out; } /* no, then find CPU DAI from registered DAIs*/ @@ -1287,8 +1290,12 @@ find_platform: return 0; out: + rtd->dailess = (!dev_map->platform_name && !dev_map->cpu_dai_name && + !dev_map->codec_dai_name); /* mark rtd as complete if we found all 4 of our client devices */ - if (rtd->codec && rtd->codec_dai && rtd->platform && rtd->cpu_dai) { + if (rtd->codec && + ((rtd->codec_dai && rtd->platform && rtd->cpu_dai) || + rtd->dailess)) { rtd->complete = 1; card->num_rtd++; } @@ -1378,19 +1385,21 @@ static int soc_probe_dev_map(struct snd_soc_card *card, int num) dev_dbg(card->dev, "probe %s dai link %d\n", card->name, num); /* config components */ - codec_dai->codec = codec; codec->card = card; - cpu_dai->platform = platform; rtd->card = card; rtd->dev.parent = card->dev; - codec_dai->card = card; - cpu_dai->card = card; + if (!rtd->dailess) { + codec_dai->codec = codec; + codec_dai->card = card; + cpu_dai->platform = platform; + cpu_dai->card = card; + } /* set default power off timeout */ rtd->pmdown_time = pmdown_time; /* probe the cpu_dai */ - if (!cpu_dai->probed) { + if (cpu_dai && !cpu_dai->probed) { if (cpu_dai->driver->probe) { ret = cpu_dai->driver->probe(cpu_dai); if (ret < 0) { @@ -1425,7 +1434,7 @@ static int soc_probe_dev_map(struct snd_soc_card *card, int num) } /* probe the platform */ - if (!platform->probed) { + if (platform && !platform->probed) { if (platform->driver->probe) { ret = platform->driver->probe(platform); if (ret < 0) { @@ -1440,7 +1449,7 @@ static int soc_probe_dev_map(struct snd_soc_card *card, int num) } /* probe the CODEC DAI */ - if (!codec_dai->probed) { + if (codec_dai && !codec_dai->probed) { if (codec_dai->driver->probe) { ret = codec_dai->driver->probe(codec_dai); if (ret < 0) { @@ -1495,6 +1504,9 @@ static int soc_probe_dev_map(struct snd_soc_card *card, int num) if (ret < 0) printk(KERN_WARNING "asoc: failed to add codec sysfs files\n"); + if (rtd->dailess) + return 0; + /* create the pcm */ ret = soc_new_pcm(rtd, num); if (ret < 0) { -- 1.7.2.3

1 0

Re: [alsa-devel] [PATCH] ALSA: hda: Add setup for mario
by Takashi Iwai 29 Oct '10

29 Oct '10

At Thu, 28 Oct 2010 12:26:12 -0700, Todd Broch wrote: > > Hi Takashi, > > Thanks for the quick response. > > The system (mario) I'm working with has an external amplifier (EA) to drive > the > d-class speakers. The EA has 4 discrete gains determined by resistor > strappings. The chosen strapping coupled with maximum gain out of the > codec overdrives the speakers creating distortion. Changing the strappings > to a > lower gain would remove distortion but not allow maximum power to speakers. > > > The patch, most notably alc272_mario_inithook, decreases the codec's > internal > amplifier maximum by 5dB via the snd_hda_override_amp_caps function. This > remedies distortion while still providing maximum power. OK, so it's essentially only for overriding amp? In other words, if we can put only the amp-override somewhere for this device, the driver works as is? I'm asking this because you define init_verbs and mixer arrays. I understand that these are necessary for presets. But, if only the amp override is required, we may define another mechanism like fixup initverb or pin quirks. thanks, Takashi > > Todd > > > On Wed, Oct 27, 2010 at 11:04 PM, Takashi Iwai <tiwai(a)suse.de> wrote: > > > At Wed, 27 Oct 2010 13:18:41 -0700, > > Todd Broch wrote: > > > > > > Add preset configuration for mario to override amp capabilities > > > > > > Signed-off-by: Todd Broch <tbroch(a)chromium.org> > > > > Thanks for the patch. > > But could you give more background, e.g. why this change is necessary, > > and what exactly it fixes? > > > > > > Takashi > > > > > --- > > > sound/pci/hda/patch_realtek.c | 52 > > +++++++++++++++++++++++++++++++++++++++++ > > > 1 files changed, 52 insertions(+), 0 deletions(-) > > > > > > diff --git a/sound/pci/hda/patch_realtek.c > > b/sound/pci/hda/patch_realtek.c > > > index 79bf4c8..7c77950 100644 > > > --- a/sound/pci/hda/patch_realtek.c > > > +++ b/sound/pci/hda/patch_realtek.c > > > @@ -196,6 +196,7 @@ enum { > > > ALC272_DELL, > > > ALC272_DELL_ZM1, > > > ALC272_SAMSUNG_NC10, > > > + ALC272_MARIO, > > > ALC662_AUTO, > > > ALC662_MODEL_LAST, > > > }; > > > @@ -17643,6 +17644,18 @@ static struct hda_verb alc663_mode8_init_verbs[] > > = { > > > {} > > > }; > > > > > > +static struct hda_verb alc272_mario_init_verbs[] = { > > > + {0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN}, > > > + {0x21, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP}, > > > + {0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, > > > + {0x21, AC_VERB_SET_CONNECT_SEL, 0x01}, /* Headphone */ > > > + {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, > > > + {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(9)}, > > > + {0x18, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | > > ALC880_MIC_EVENT}, > > > + {0x21, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | > > ALC880_HP_EVENT}, > > > + {} > > > +}; > > > + > > > static struct snd_kcontrol_new alc662_auto_capture_mixer[] = { > > > HDA_CODEC_VOLUME("Capture Volume", 0x09, 0x0, HDA_INPUT), > > > HDA_CODEC_MUTE("Capture Switch", 0x09, 0x0, HDA_INPUT), > > > @@ -18126,6 +18139,20 @@ static void alc663_g50v_unsol_event(struct > > hda_codec *codec, > > > } > > > } > > > > > > +static void alc272_mario_inithook(struct hda_codec *codec) > > > +{ > > > + alc663_21jd_two_speaker_automute(codec); > > > + alc_mic_automute(codec); > > > + if (snd_hda_override_amp_caps(codec, 0x2, HDA_OUTPUT, > > > + (0x3b << AC_AMPCAP_OFFSET_SHIFT) | > > > + (0x3b << AC_AMPCAP_NUM_STEPS_SHIFT) | > > > + (0x03 << AC_AMPCAP_STEP_SIZE_SHIFT) | > > > + (0 << AC_AMPCAP_MUTE_SHIFT))) { > > > + printk(KERN_WARNING > > > + "hda_codec: failed to override amp caps for NID > > 0x2\n"); > > > + } > > > +} > > > + > > > #define alc663_g50v_setup alc663_m51va_setup > > > > > > static void alc663_g50v_inithook(struct hda_codec *codec) > > > @@ -18165,6 +18192,18 @@ static struct snd_kcontrol_new > > alc272_nc10_mixer[] = { > > > { } /* end */ > > > }; > > > > > > +static struct snd_kcontrol_new alc272_mario_mixer[] = { > > > + HDA_CODEC_VOLUME("Speaker Playback Volume", 0x2, 0x0, HDA_OUTPUT), > > > + HDA_CODEC_MUTE("Speaker Playback Switch", 0xc, 0x0, HDA_OUTPUT), > > > + HDA_CODEC_VOLUME("Headphone Playback Volume", 0x3, 0x0, > > HDA_OUTPUT), > > > + HDA_CODEC_MUTE("Headphone Playback Switch", 0xd, 0x0, HDA_OUTPUT), > > > + > > > + HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT), > > > + HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT), > > > + HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT), > > > + { } /* end */ > > > +}; > > > + > > > #ifdef CONFIG_SND_HDA_POWER_SAVE > > > #define alc662_loopbacks alc880_loopbacks > > > #endif > > > @@ -18203,6 +18242,7 @@ static const char > > *alc662_models[ALC662_MODEL_LAST] = { > > > [ALC272_DELL] = "dell", > > > [ALC272_DELL_ZM1] = "dell-zm1", > > > [ALC272_SAMSUNG_NC10] = "samsung-nc10", > > > + [ALC272_MARIO] = "mario", > > > [ALC662_AUTO] = "auto", > > > }; > > > > > > @@ -18590,6 +18630,18 @@ static struct alc_config_preset alc662_presets[] > > = { > > > .setup = alc663_mode4_setup, > > > .init_hook = alc663_mode4_inithook, > > > }, > > > + [ALC272_MARIO] = { > > > + .mixers = { alc272_mario_mixer }, > > > + .init_verbs = { alc662_init_verbs, > > > + alc272_mario_init_verbs}, > > > + .num_dacs = ARRAY_SIZE(alc272_dac_nids), > > > + .dac_nids = alc272_dac_nids, > > > + .num_channel_mode = ARRAY_SIZE(alc662_3ST_2ch_modes), > > > + .channel_mode = alc662_3ST_2ch_modes, > > > + .unsol_event = alc663_mode4_unsol_event, > > > + .setup = alc663_mode4_setup, > > > + .init_hook = alc272_mario_inithook, > > > + }, > > > }; > > > > > > > > > -- > > > 1.7.1 > > > > >

1 0

Re: [alsa-devel] Warning/error from ALSA’s pcm_min.c example. Possible problem?
by Raymond Yau 29 Oct '10

29 Oct '10

>> On Sat, 30 Jan 2010, Louise Hoffman wrote: >> Dear ALSA developers, >> >> When I compile ALSA's pcm_min.c[0] example with >> >> gcc -Wall -lasound pcm_min.c -o pcm_min >> >> Everything is fine, but running it, I get the white noise as expected, >> but I also get this warning/error: >> >> Short write (expected 16384, wrote 7616) >It was a bug in alsa-lib. I fixed it in patch bellow. Thank you for your >report. > http://git.alsa-project.org/?p=alsa-lib.git;a=commitdiff;h=2e48439ad93f6c8d… <http://git.alsa-project.org/?p=alsa-lib.git;a=commitdiff;h=2e48439ad93f6c8d…> Add snd_pcm_dump() after call snd_pcm_set_params in pcm_min.c The start threshold is equal to buffer size , so there should be a short write at the second write since 16384 + 7616 = 24000 ( start threshold ) your patch had changed the behaviour ./pcm_min ALSA <-> PulseAudio PCM I/O Plugin Its setup is: stream : PLAYBACK access : RW_INTERLEAVED format : U8 subformat : STD channels : 1 rate : 48000 exact rate : 48000 (48000/1) msbits : 8 buffer_size : 24000 period_size : 6000 period_time : 125000 tstamp_mode : NONE period_step : 1 avail_min : 6000 period_event : 0 start_threshold : 24000 stop_threshold : 24000 silence_threshold: 0 silence_size : 0 boundary : 1572864000 state = 2 write 16384 frames state = 2 write 16384 frames state = 3 write 16384 frames state = 3 write 16384 frames state = 3

3 2

[alsa-devel] New SoC layer codec registration problem
by Alexander 29 Oct '10

29 Oct '10

I'm trying to implement new SoC codec in linux-next-20101025 kernel. Part of the code: --- #if defined(CONFIG_SPI_MASTER) static int __devinit cs4271_spi_probe(struct spi_device *spi) { struct cs4271_private *cs4271; int ret; cs4271 = kzalloc(sizeof *cs4271, GFP_KERNEL); if (!cs4271) return -ENOMEM; spi_set_drvdata(spi, cs4271); cs4271->control_data = spi; cs4271->bus_type = SND_SOC_SPI; ret = snd_soc_register_codec(&spi->dev, &soc_codec_dev_cs4271, &cs4271_dai, 1); if (ret < 0) kfree(cs4271); return ret; } static int __devexit cs4271_spi_remove(struct spi_device *spi) { snd_soc_unregister_codec(&spi->dev); kfree(spi_get_drvdata(spi)); return 0; } static struct spi_driver cs4271_spi_driver = { .driver = { .name = "cs4271-codec", .owner = THIS_MODULE, }, .probe = cs4271_spi_probe, .remove = __devexit_p(cs4271_spi_remove), }; #endif /* defined(CONFIG_SPI_MASTER) */ --- So, codec name I expect is "cs4271-codec", but codec registered with name "spi0.0" Here is boot log: --- Jan 1 00:00:04 miniCio user.debug kernel: cs4271-codec spi0.0: codec register spi0.0 Jan 1 00:00:04 miniCio user.debug kernel: cs4271-codec spi0.0: dai register spi0.0 #1 Jan 1 00:00:04 miniCio user.debug kernel: Registered DAI 'cs4271-hifi' Jan 1 00:00:04 miniCio user.debug kernel: Registered codec 'spi0.0' Jan 1 00:00:04 miniCio user.info kernel: Codec driver for CS4271 registered Jan 1 00:00:04 miniCio user.debug kernel: ep93xx-pcm-audio ep93xx-pcm-audio: platform register ep93xx-pcm-audio Jan 1 00:00:04 miniCio user.debug kernel: Registered platform 'ep93xx-pcm-audio' Jan 1 00:00:04 miniCio user.debug kernel: ep93xx-i2s ep93xx-i2s: dai register ep93xx-i2s Jan 1 00:00:04 miniCio user.debug kernel: Registered DAI 'ep93xx-i2s' Jan 1 00:00:04 miniCio user.debug kernel: soc-audio soc-audio: binding CS4271 at idx 0 Jan 1 00:00:04 miniCio user.debug kernel: soc-audio soc-audio: CODEC cs4271-codec not registered Jan 1 00:00:04 miniCio user.debug kernel: soc-audio soc-audio: Registered card 'EDB93XX' Jan 1 00:00:04 miniCio user.info kernel: EDB93xx Machine ALSA Driver Jan 1 00:00:04 miniCio user.info kernel: ALSA device list: Jan 1 00:00:04 miniCio user.info kernel: No soundcards found. --- What am I doing wrong? Alexander.

3 4

[alsa-devel] [PATCH v5 0/9] Add Omapl138-Hawkboard support
by vm.rod25＠gmail.com 28 Oct '10

28 Oct '10

From: Victor Rodriguez <victor.rodriguez(a)sasken.com> This patch adds EMAC, EDMA, ASoC, SOUND, MMC/SD and USB OHCI support for the Hawkboard-L138 system It is under the machine name "omapl138_hawkboard". This system is based on the da850 davinci CPU architecture. Victor Rodriguez (9): davinci: EMAC support for Omapl138-Hawkboard davinci: EDMA support for Omapl138-Hawkboard davinci: ASoC support for Omapl138-Hawkboard davinci: McASP configuration for Omapl138-Hawkboard davinci: Audio support for Omapl138-Hawkboard davinci: MMC/SD and USB-OHCI configuration for Omapl138-Hawkboard davinci: MMC/SD support for Omapl138-Hawkboar davinci: USB clocks for Omapl138-Hawkboard davinci: USB1.1 support for Omapl138-Hawkboard arch/arm/mach-davinci/board-omapl138-hawk.c | 317 +++++++++++++++++++++++++++ arch/arm/mach-davinci/da850.c | 22 ++- arch/arm/mach-davinci/include/mach/mux.h | 4 + sound/soc/davinci/Kconfig | 5 +- sound/soc/davinci/davinci-evm.c | 6 +- 5 files changed, 349 insertions(+), 5 deletions(-)

4 13

Re: [alsa-devel] [PATCH v5 1/9] davinci: EMAC support for Omapl138-Hawkboard
by Victor Rodriguez 28 Oct '10

28 Oct '10

On Thu, Oct 28, 2010 at 10:54 AM, Sergei Shtylyov <sshtylyov(a)mvista.com> wrote: > Hello. > > On 28-10-2010 18:04, Nori, Sekhar wrote: > >> Sorry for jumping late on this. Some comments below: > >>> From: Victor Rodriguez<victor.rodriguez(a)sasken.com> > >>> This patch adds EMAC support for the Hawkboard-L138 system > >>> Signed-off-by: Victor Rodriguez<victor.rodriguez(a)sasken.com> >>> --- >>> arch/arm/mach-davinci/board-omapl138-hawk.c | 47 >>> +++++++++++++++++++++++++++ >>> 1 files changed, 47 insertions(+), 0 deletions(-) > >>> diff --git a/arch/arm/mach-davinci/board-omapl138-hawk.c >>> b/arch/arm/mach-davinci/board-omapl138-hawk.c >>> index c472dd8..8633245 100644 >>> --- a/arch/arm/mach-davinci/board-omapl138-hawk.c >>> +++ b/arch/arm/mach-davinci/board-omapl138-hawk.c >>> @@ -19,6 +19,51 @@ >>> >>> #include<mach/cp_intc.h> >>> #include<mach/da8xx.h> >>> +#include<mach/mux.h> >>> + >>> +#define HAWKBOARD_PHY_ID "0:07" >>> + >>> +static short omapl138_hawk_mii_pins[] __initdata = { >>> + DA850_MII_TXEN, DA850_MII_TXCLK, DA850_MII_COL, DA850_MII_TXD_3, >>> + DA850_MII_TXD_2, DA850_MII_TXD_1, DA850_MII_TXD_0, DA850_MII_RXER, >>> + DA850_MII_CRS, DA850_MII_RXCLK, DA850_MII_RXDV, DA850_MII_RXD_3, >>> + DA850_MII_RXD_2, DA850_MII_RXD_1, DA850_MII_RXD_0, DA850_MDIO_CLK, >>> + DA850_MDIO_D, >>> + -1 > >> -1 need not be a new line. In any case, please include a ',' after it. > > Why is that? It's always a last entry in the array. > > WBR, Sergei > Hey Sergei these patches have been tested by Rene Gonzales and ack by Liam and Mark Brown , I am going to send the patches V6 because of this change. I have been rechecking the code and seems that there is no problem on it, do you have any other comment before i send the series of patches v6 ? Thanks a lot for your comments Really appreciated Victor Rodriguez

1 0

Re: [alsa-devel] [PATCH v5 1/9] davinci: EMAC support for Omapl138-Hawkboard
by Victor Rodriguez 28 Oct '10

28 Oct '10

On Thu, Oct 28, 2010 at 10:54 AM, Sergei Shtylyov <sshtylyov(a)mvista.com> wrote: > Hello. > > On 28-10-2010 18:04, Nori, Sekhar wrote: > >> Sorry for jumping late on this. Some comments below: > >>> From: Victor Rodriguez<victor.rodriguez(a)sasken.com> > >>> This patch adds EMAC support for the Hawkboard-L138 system > >>> Signed-off-by: Victor Rodriguez<victor.rodriguez(a)sasken.com> >>> --- >>> arch/arm/mach-davinci/board-omapl138-hawk.c | 47 >>> +++++++++++++++++++++++++++ >>> 1 files changed, 47 insertions(+), 0 deletions(-) > >>> diff --git a/arch/arm/mach-davinci/board-omapl138-hawk.c >>> b/arch/arm/mach-davinci/board-omapl138-hawk.c >>> index c472dd8..8633245 100644 >>> --- a/arch/arm/mach-davinci/board-omapl138-hawk.c >>> +++ b/arch/arm/mach-davinci/board-omapl138-hawk.c >>> @@ -19,6 +19,51 @@ >>> >>> #include<mach/cp_intc.h> >>> #include<mach/da8xx.h> >>> +#include<mach/mux.h> >>> + >>> +#define HAWKBOARD_PHY_ID "0:07" >>> + >>> +static short omapl138_hawk_mii_pins[] __initdata = { >>> + DA850_MII_TXEN, DA850_MII_TXCLK, DA850_MII_COL, DA850_MII_TXD_3, >>> + DA850_MII_TXD_2, DA850_MII_TXD_1, DA850_MII_TXD_0, DA850_MII_RXER, >>> + DA850_MII_CRS, DA850_MII_RXCLK, DA850_MII_RXDV, DA850_MII_RXD_3, >>> + DA850_MII_RXD_2, DA850_MII_RXD_1, DA850_MII_RXD_0, DA850_MDIO_CLK, >>> + DA850_MDIO_D, >>> + -1 > >> -1 need not be a new line. In any case, please include a ',' after it. > > Why is that? It's always a last entry in the array. > > WBR, Sergei > Sergei Nori Sekhar explained that in the last comment. he said that there is no change on ti Regards Victor Rodriguez

1 0

Re: [alsa-devel] [PATCH v5 1/9] davinci: EMAC support for Omapl138-Hawkboard
by Victor Rodriguez 28 Oct '10

28 Oct '10

On Thu, Oct 28, 2010 at 9:18 AM, Nori, Sekhar <nsekhar(a)ti.com> wrote: > On Thu, Oct 28, 2010 at 19:34:10, Nori, Sekhar wrote: >> Hi Victor, >> >> Sorry for jumping late on this. Some comments below: >> >> On Tue, Oct 19, 2010 at 23:36:19, vm.rod25(a)gmail.com wrote: >> > From: Victor Rodriguez <victor.rodriguez(a)sasken.com> >> > >> > This patch adds EMAC support for the Hawkboard-L138 system >> > >> > Signed-off-by: Victor Rodriguez <victor.rodriguez(a)sasken.com> >> > --- >> > arch/arm/mach-davinci/board-omapl138-hawk.c | 47 +++++++++++++++++++++++++++ >> > 1 files changed, 47 insertions(+), 0 deletions(-) >> > >> > diff --git a/arch/arm/mach-davinci/board-omapl138-hawk.c b/arch/arm/mach-davinci/board-omapl138-hawk.c >> > index c472dd8..8633245 100644 >> > --- a/arch/arm/mach-davinci/board-omapl138-hawk.c >> > +++ b/arch/arm/mach-davinci/board-omapl138-hawk.c >> > @@ -19,6 +19,51 @@ >> > >> > #include <mach/cp_intc.h> >> > #include <mach/da8xx.h> >> > +#include <mach/mux.h> >> > + >> > +#define HAWKBOARD_PHY_ID "0:07" >> > + >> > +static short omapl138_hawk_mii_pins[] __initdata = { >> > + DA850_MII_TXEN, DA850_MII_TXCLK, DA850_MII_COL, DA850_MII_TXD_3, >> > + DA850_MII_TXD_2, DA850_MII_TXD_1, DA850_MII_TXD_0, DA850_MII_RXER, >> > + DA850_MII_CRS, DA850_MII_RXCLK, DA850_MII_RXDV, DA850_MII_RXD_3, >> > + DA850_MII_RXD_2, DA850_MII_RXD_1, DA850_MII_RXD_0, DA850_MDIO_CLK, >> > + DA850_MDIO_D, >> > + -1 >> >> -1 need not be a new line. In any case, please include a ',' after it. > > The justification for a ',' in the end is that it makes it easier > to add new initialization elements. Since -1 is going to be > the last one anyway, please ignore this comment. > > Thanks, > Sekhar > > Ok so let me see if I understand The only change that I should do is to remove > + if (!machine_is_omapl138_hawkboard()) > + return; right ? Regards Victor

1 0

Re: [alsa-devel] [PATCH v5 1/9] davinci: EMAC support for Omapl138-Hawkboard
by Victor Rodriguez 28 Oct '10

28 Oct '10

On Thu, Oct 28, 2010 at 9:04 AM, Nori, Sekhar <nsekhar(a)ti.com> wrote: > Hi Victor, > > Sorry for jumping late on this. Some comments below: > On Tue, Oct 19, 2010 at 23:36:19, vm.rod25(a)gmail.com wrote: >> From: Victor Rodriguez <victor.rodriguez(a)sasken.com> >> >> This patch adds EMAC support for the Hawkboard-L138 system >> >> Signed-off-by: Victor Rodriguez <victor.rodriguez(a)sasken.com> >> --- >> arch/arm/mach-davinci/board-omapl138-hawk.c | 47 +++++++++++++++++++++++++++ >> 1 files changed, 47 insertions(+), 0 deletions(-) >> >> diff --git a/arch/arm/mach-davinci/board-omapl138-hawk.c b/arch/arm/mach-davinci/board-omapl138-hawk.c >> index c472dd8..8633245 100644 >> --- a/arch/arm/mach-davinci/board-omapl138-hawk.c >> +++ b/arch/arm/mach-davinci/board-omapl138-hawk.c >> @@ -19,6 +19,51 @@ >> >> #include <mach/cp_intc.h> >> #include <mach/da8xx.h> >> +#include <mach/mux.h> >> + >> +#define HAWKBOARD_PHY_ID "0:07" >> + >> +static short omapl138_hawk_mii_pins[] __initdata = { >> + DA850_MII_TXEN, DA850_MII_TXCLK, DA850_MII_COL, DA850_MII_TXD_3, >> + DA850_MII_TXD_2, DA850_MII_TXD_1, DA850_MII_TXD_0, DA850_MII_RXER, >> + DA850_MII_CRS, DA850_MII_RXCLK, DA850_MII_RXDV, DA850_MII_RXD_3, >> + DA850_MII_RXD_2, DA850_MII_RXD_1, DA850_MII_RXD_0, DA850_MDIO_CLK, >> + DA850_MDIO_D, >> + -1 > > -1 need not be a new line. In any case, please include a ',' after it. > >> +}; >> + >> +static __init void omapl138_hawk_config_emac(void) >> +{ >> + void __iomem *cfgchip3 = DA8XX_SYSCFG0_VIRT(DA8XX_CFGCHIP3_REG); >> + int ret; >> + u32 val; >> + struct davinci_soc_info *soc_info = &davinci_soc_info; >> + >> + if (!machine_is_omapl138_hawkboard()) >> + return; > > This is not required since this function is called only on > a hawkboard. > > Thanks, > Sekhar > > Do not worry , and thanks a lot for the comments . I really appreciate it. Thanks Sincerely yours Victor Rodriguez

1 0

[alsa-devel] [PATCH] ASoC: Check return value of struct_strtoul() in pmdown_time_set()
by Mark Brown 28 Oct '10

28 Oct '10

strict_strtoul() has just been made must check so do so. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/soc-core.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 70d9a73..805343f 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -165,8 +165,11 @@ static ssize_t pmdown_time_set(struct device *dev, { struct snd_soc_pcm_runtime *rtd = container_of(dev, struct snd_soc_pcm_runtime, dev); + int ret; - strict_strtol(buf, 10, &rtd->pmdown_time); + ret = strict_strtol(buf, 10, &rtd->pmdown_time); + if (ret) + return ret; return count; } -- 1.7.1

2 1