August 2012 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH] ALSA: HDMI - Enable HBR feature on Intel chips
by Wang Xingchao 05 Sep '12

05 Sep '12

HDMI channel remapping apparently effects HBR packets on Intel's chips. For compressed non-PCM audio, use "straight-through" channel mapping. For uncompressed multi-channel pcm audio, use normal mapping. Signed-off-by: Wang Xingchao <xingchao.wang(a)intel.com> Signed-off-by: Anssi Hannula <anssi.hannula(a)iki.fi> --- sound/pci/hda/patch_hdmi.c | 50 +++++++++++++++++++++++++++----------------- 1 file changed, 31 insertions(+), 19 deletions(-) diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index d9439c5..fda89e3 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -231,6 +231,11 @@ static struct cea_channel_speaker_allocation channel_allocations[] = { { .ca_index = 0x01, .speakers = { 0, 0, 0, 0, 0, LFE, FR, FL } }, /* Dolby Surround */ { .ca_index = 0x02, .speakers = { 0, 0, 0, 0, FC, 0, FR, FL } }, +{ .ca_index = 0x03, .speakers = { 0, 0, 0, 0, FC, LFE, FR, FL } }, +{ .ca_index = 0x04, .speakers = { 0, 0, 0, RC, 0, 0, FR, FL } }, +{ .ca_index = 0x05, .speakers = { 0, 0, 0, RC, 0, LFE, FR, FL } }, +{ .ca_index = 0x06, .speakers = { 0, 0, 0, RC, FC, 0, FR, FL } }, +{ .ca_index = 0x07, .speakers = { 0, 0, 0, RC, FC, LFE, FR, FL } }, /* surround40 */ { .ca_index = 0x08, .speakers = { 0, 0, RR, RL, 0, 0, FR, FL } }, /* surround41 */ @@ -239,22 +244,15 @@ static struct cea_channel_speaker_allocation channel_allocations[] = { { .ca_index = 0x0a, .speakers = { 0, 0, RR, RL, FC, 0, FR, FL } }, /* surround51 */ { .ca_index = 0x0b, .speakers = { 0, 0, RR, RL, FC, LFE, FR, FL } }, - /* 6.1 */ -{ .ca_index = 0x0f, .speakers = { 0, RC, RR, RL, FC, LFE, FR, FL } }, - /* surround71 */ -{ .ca_index = 0x13, .speakers = { RRC, RLC, RR, RL, FC, LFE, FR, FL } }, - -{ .ca_index = 0x03, .speakers = { 0, 0, 0, 0, FC, LFE, FR, FL } }, -{ .ca_index = 0x04, .speakers = { 0, 0, 0, RC, 0, 0, FR, FL } }, -{ .ca_index = 0x05, .speakers = { 0, 0, 0, RC, 0, LFE, FR, FL } }, -{ .ca_index = 0x06, .speakers = { 0, 0, 0, RC, FC, 0, FR, FL } }, -{ .ca_index = 0x07, .speakers = { 0, 0, 0, RC, FC, LFE, FR, FL } }, { .ca_index = 0x0c, .speakers = { 0, RC, RR, RL, 0, 0, FR, FL } }, { .ca_index = 0x0d, .speakers = { 0, RC, RR, RL, 0, LFE, FR, FL } }, { .ca_index = 0x0e, .speakers = { 0, RC, RR, RL, FC, 0, FR, FL } }, +{ .ca_index = 0x0f, .speakers = { 0, RC, RR, RL, FC, LFE, FR, FL } }, { .ca_index = 0x10, .speakers = { RRC, RLC, RR, RL, 0, 0, FR, FL } }, { .ca_index = 0x11, .speakers = { RRC, RLC, RR, RL, 0, LFE, FR, FL } }, { .ca_index = 0x12, .speakers = { RRC, RLC, RR, RL, FC, 0, FR, FL } }, + /* surround71 */ +{ .ca_index = 0x13, .speakers = { RRC, RLC, RR, RL, FC, LFE, FR, FL } }, { .ca_index = 0x14, .speakers = { FRC, FLC, 0, 0, 0, 0, FR, FL } }, { .ca_index = 0x15, .speakers = { FRC, FLC, 0, 0, 0, LFE, FR, FL } }, { .ca_index = 0x16, .speakers = { FRC, FLC, 0, 0, FC, 0, FR, FL } }, @@ -537,22 +535,36 @@ static void hdmi_debug_channel_mapping(struct hda_codec *codec, static void hdmi_setup_channel_mapping(struct hda_codec *codec, hda_nid_t pin_nid, + hda_nid_t cvt_nid, int ca) { int i; int err; - - if (hdmi_channel_mapping[ca][1] == 0) { - for (i = 0; i < channel_allocations[ca].channels; i++) - hdmi_channel_mapping[ca][i] = i | (i << 4); + unsigned short val; + int tmp_mapping[8]; + bool non_pcm = false; + + val = snd_hda_codec_read(codec, cvt_nid, 0, AC_VERB_GET_DIGI_CONVERT_1, 0); + non_pcm = !!(val & AC_DIG1_NONAUDIO); + + if (hdmi_channel_mapping[ca][1] == 0 || non_pcm) { + for (i = 0; i < channel_allocations[ca].channels; i++) { + if (non_pcm) + tmp_mapping[i] = i | (i << 4); + else + hdmi_channel_mapping[ca][i] = i | (i << 4); + } for (; i < 8; i++) - hdmi_channel_mapping[ca][i] = 0xf | (i << 4); + if (non_pcm) + tmp_mapping[i] = 0xf | (i << 4); + else + hdmi_channel_mapping[ca][i] = 0xf | (i << 4); } for (i = 0; i < 8; i++) { err = snd_hda_codec_write(codec, pin_nid, 0, AC_VERB_SET_HDMI_CHAN_SLOT, - hdmi_channel_mapping[ca][i]); + non_pcm ? tmp_mapping[i] : hdmi_channel_mapping[ca][i]); if (err) { snd_printdd(KERN_NOTICE "HDMI: channel mapping failed\n"); @@ -686,7 +698,7 @@ static bool hdmi_infoframe_uptodate(struct hda_codec *codec, hda_nid_t pin_nid, } static void hdmi_setup_audio_infoframe(struct hda_codec *codec, int pin_idx, - struct snd_pcm_substream *substream) + hda_nid_t cvt_nid, struct snd_pcm_substream *substream) { struct hdmi_spec *spec = codec->spec; struct hdmi_spec_per_pin *per_pin = &spec->pins[pin_idx]; @@ -731,13 +743,13 @@ static void hdmi_setup_audio_infoframe(struct hda_codec *codec, int pin_idx, * sizeof(*dp_ai) to avoid partial match/update problems when * the user switches between HDMI/DP monitors. */ + hdmi_setup_channel_mapping(codec, pin_nid, cvt_nid, ca); if (!hdmi_infoframe_uptodate(codec, pin_nid, ai.bytes, sizeof(ai))) { snd_printdd("hdmi_setup_audio_infoframe: " "pin=%d channels=%d\n", pin_nid, channels); - hdmi_setup_channel_mapping(codec, pin_nid, ca); hdmi_stop_infoframe_trans(codec, pin_nid); hdmi_fill_audio_infoframe(codec, pin_nid, ai.bytes, sizeof(ai)); @@ -1151,7 +1163,7 @@ static int generic_hdmi_playback_pcm_prepare(struct hda_pcm_stream *hinfo, hdmi_set_channel_count(codec, cvt_nid, substream->runtime->channels); - hdmi_setup_audio_infoframe(codec, pin_idx, substream); + hdmi_setup_audio_infoframe(codec, pin_idx, cvt_nid, substream); pinctl = snd_hda_codec_read(codec, pin_nid, 0, AC_VERB_GET_PIN_WIDGET_CONTROL, 0); -- 1.7.9.5

6 7

Re: [alsa-devel] How to define card specific pcm devices?
by Raymond Yau 05 Sep '12

05 Sep '12

2012-8-17 下午10:51 於 "Tanu Kaskinen" <tanu.kaskinen(a)digia.com> 寫道： > > Ping? > > If card specific pcm definitions are not possible, would it be > acceptable to have a generic "front_left:CARD" or "first_channel:CARD" > pcm, which would transform "front:CARD" or "hw:CARD" into a mono device? As pulseaudio server use SND_PCM_NO_AUTO_CHANNEL which diable channel conversion, this left channel device only work with other alsa applications except pulseaudio when your sound card does not support mono. http://cgit.freedesktop.org/pulseaudio/pulseaudio/commit/?id=ff4af902cf4ac0… the solution is to change the mixing in pulseaudio by using left channel for this mic and those stereo mic with inverted phase , and average for mono playback device . stereo mic and line-in how about the 4 channel mic? > > -- Tanu > > > On Fri, 2012-08-10 at 14:25 +0300, Tanu Kaskinen wrote: > > Hi, > > > > I'm writing UCM configuration for RX-51 (Nokia N900), and I have a > > problem: "hw:RX51" can't be opened in mono mode, but there's only one > > integrated mono microphone, and its audio is routed to the left input > > channel. Applications will get only silence in the right channel when > > they use "hw:RX51". > > > > The best solution that I have come up is to define a pcm that converts > > "hw:RX51" into a mono device. The problem is that I don't know how > > exactly to do that. I guess the route plugin can be used for that: > > > > pcm.rx51_mono_from_left { > > type route > > slave.pcm hw:RX51 > > slave.channels 2 > > ttable.0.0 1 > > } > > > > I tried putting that definition in /usr/share/alsa/cards/RX-51.conf (and > > also RX51.conf, since it's not entirely clear to me when the dash should > > be omitted). I have this in the UCM configuration: > > > > Value { > > CapturePCM "rx51_mono_from_left" > > CaptureChannels "1" > > } > > > > This is printed to the PulseAudio log: > > > > (alsa-lib)pcm.c: Unknown PCM rx51_mono_from_left > > > > So the rx51_mono_from_left definition is not loaded. I'm not terribly > > surprised: I guess the card configuration files are loaded only when > > necessary, and when PulseAudio tries to open "rx51_mono_from_left", > > alsa-lib can't really know that it's somehow related to the RX-51 card. > > > > How should I solve this? > > > >

2 4

[alsa-devel] [PATCH 0/3] ALSA: snd-usb: Regression fixes for 3.5
by Daniel Mack 04 Sep '12

04 Sep '12

Here are 3 more regression fixes for snd-usb in 3.5. It's annoying they haven't been found earlier, but at least we're now back to the streaming quality we had before the streaming refactoring. Anyone with a USB device, please give it a quick shot at least. Thanks, Daniel Daniel Mack (3): ALSA: snd-usb: restore delay information ALSA: snd-usb: fix calls to next_packet_size ALSA: snd-usb: fix cross-interface streaming devices sound/usb/endpoint.c | 13 +------------ sound/usb/endpoint.h | 1 + sound/usb/pcm.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++---- 3 files changed, 49 insertions(+), 16 deletions(-) -- 1.7.11.4

3 8

[alsa-devel] [PATCH v3 0/3] introduce device_buffer
by Vinod Koul 04 Sep '12

04 Sep '12

Old wine in a new bottle with added flavour now. Based on our discussions in LPC, now we will report the combined delay value as sum of the buffering done in driver and hardware. This is used to report delay Additionally we tell pcm what is buffer in device/driver, this is used to check for error calulcations Vinod Koul (3): ALSA: pcm - introduce device_buffer ASoC: add device_buffer in asoc ASoC: mid-x86 - implement buffer query in sst_platform driver include/sound/pcm.h | 1 + include/sound/soc-dai.h | 6 ++++++ include/sound/soc.h | 6 ++++++ sound/core/pcm_lib.c | 10 +++++++++- sound/soc/mid-x86/sst_platform.c | 23 +++++++++++++++++++++++ sound/soc/mid-x86/sst_platform.h | 4 +++- sound/soc/soc-pcm.c | 13 ++++++++++++- 7 files changed, 60 insertions(+), 3 deletions(-) -- 1.7.9.5

4 10

[alsa-devel] [PATCH 0/3] ALSA: Add DSP firmware loader
by Ian Minett 04 Sep '12

04 Sep '12

From: Ian Minett <ian_minett(a)creativelabs.com> Hi Takashi, Thanks for the recent code samples, they were very useful. We've built on them to produce this latest patchset, incorporating the updates you provided to add the loader functions, and doing a minimal update to the CA0132 codec to use the new ops to perform the firmware transfer. Please let us know if any tweaks are needed to the update. Thanks, - Ian Signed-off-by: Ian Minett <ian_minett(a)creativelabs.com> --- 1: - memalloc.h - pcm.h - pcm_memory.c - sgbuf.c Include Takashi's updates: Make snd_sgbuf_get_{ptr|addr}() available for non-SG cases. Passing struct snd_dma_buffer pointer instead, so that they work no matter whether real SG buffer is used or not. 2: - hda_intel.c - hda_codec.h Include Takashi's updates: Pass DMA buffer pointers in calls to setup_bdle(). Add new callback routines to controller to handle loading firmware binaries. Add new switch to Kconfig to enable DSP firmware loader. 3: - patch_ca0132.c - ca0132_regs.h Add support for DSP firmware transfer to CA0132 codec: Add transfer handler functions. Call the new snd_hda_codec_load_dsp_xxx loader ops to control download. Add chip access routines.

2 3

[alsa-devel] [PATCH] ALSA: hda - Fix runtime PM accounting
by Takashi Iwai 02 Sep '12

02 Sep '12

The flag codec->d3_clk_stop_ok isn't always set when the codec is powered off. If it's not set, the controller driver doesn't change the runtime PM count. This causes an unblanced accounting when multiple codecs are present. Usually, the first codec is powered down with CLK_STOP_OK=0, then the next codec with CLK_STOP_OK=1. At this moment, the first codec is changed also to CLK_STOP_OK=1, but this isn't informed to the controller. Thus it still thinks as if one codec is active. For fixing this issue, move the check of CLK_STOP_OK bit at the runtime suspend time, and simple up/down by the codec power save in azx_power_notifier(). For CLK_STOP_OK bit checks of all codecs, a new helper function is introduced. With this change, d3_clk_stop_ok field is no longer referred, thus removed. Also, d3_clk_stop bit field is moved to a place where more efficiently packed. Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- I faced this issue while I'm checking the pm issue. Mengdong, could you verify whether this change is OK? sound/pci/hda/hda_codec.c | 30 ++++++++++++++++++++---------- sound/pci/hda/hda_codec.h | 6 +++--- sound/pci/hda/hda_intel.c | 4 ++-- 3 files changed, 25 insertions(+), 15 deletions(-) diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index 4a2f35c..b7ac1ff 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -3546,10 +3546,6 @@ static void hda_set_power_state(struct hda_codec *codec, hda_nid_t fg, int count; unsigned int state; -#ifdef CONFIG_SND_HDA_POWER_SAVE - codec->d3_stop_clk_ok = 0; -#endif - if (codec->patch_ops.set_power_state) { codec->patch_ops.set_power_state(codec, fg, power_state); return; @@ -3572,12 +3568,6 @@ static void hda_set_power_state(struct hda_codec *codec, hda_nid_t fg, if (!(state & AC_PWRST_ERROR)) break; } - -#ifdef CONFIG_SND_HDA_POWER_SAVE - if ((power_state == AC_PWRST_D3) - && codec->d3_stop_clk && (state & AC_PWRST_CLK_STOP_OK)) - codec->d3_stop_clk_ok = 1; -#endif } #ifdef CONFIG_SND_HDA_HWDEP @@ -4532,6 +4522,26 @@ void snd_hda_power_save(struct hda_codec *codec, int delta, bool d3wait) } EXPORT_SYMBOL_HDA(snd_hda_power_save); +/* check whether all codecs are ready to stop clock */ +bool snd_hda_bus_ready_for_d3(struct hda_bus *bus) +{ + struct hda_codec *codec; + + list_for_each_entry(codec, &bus->codec_list, list) { + unsigned int state; + int fg = codec->afg ? codec->afg : codec->mfg; + + if (!codec->d3_stop_clk) + return false; + state = snd_hda_codec_read(codec, fg, 0, + AC_VERB_GET_POWER_STATE, 0); + if (!(state & AC_PWRST_CLK_STOP_OK)) + return false; + } + return true; +} +EXPORT_SYMBOL_HDA(snd_hda_bus_ready_for_d3); + /** * snd_hda_check_amp_list_power - Check the amp list and update the power * @codec: HD-audio codec diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h index 13c834f..abd85e5 100644 --- a/sound/pci/hda/hda_codec.h +++ b/sound/pci/hda/hda_codec.h @@ -868,6 +868,7 @@ struct hda_codec { unsigned int pcm_format_first:1; /* PCM format must be set first */ #ifdef CONFIG_SND_HDA_POWER_SAVE unsigned int power_on :1; /* current (global) power-state */ + unsigned int d3_stop_clk:1; /* support D3 operation without BCLK */ int power_transition; /* power-state in transition */ int power_count; /* current (global) power refcount */ struct delayed_work power_work; /* delayed task for powerdown */ @@ -875,9 +876,6 @@ struct hda_codec { unsigned long power_off_acct; unsigned long power_jiffies; spinlock_t power_lock; - - unsigned int d3_stop_clk:1; /* support D3 operation without BCLK */ - unsigned int d3_stop_clk_ok:1; /* BCLK can stop */ #endif /* codec-specific additional proc output */ @@ -1068,9 +1066,11 @@ const char *snd_hda_get_jack_location(u32 cfg); #ifdef CONFIG_SND_HDA_POWER_SAVE void snd_hda_power_save(struct hda_codec *codec, int delta, bool d3wait); void snd_hda_update_power_acct(struct hda_codec *codec); +bool snd_hda_bus_ready_for_d3(struct hda_bus *bus); #else static inline void snd_hda_power_save(struct hda_codec *codec, int delta, bool d3wait) {} +static inline bool snd_hda_bus_ready_for_d3(struct hda_bus *bus) { return false; } #endif /** diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 1c9c779..9b02174 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -2410,7 +2410,7 @@ static void azx_power_notify(struct hda_bus *bus, struct hda_codec *codec) { struct azx *chip = bus->private_data; - if (bus->power_keep_link_on || !codec->d3_stop_clk_ok) + if (bus->power_keep_link_on) return; if (codec->power_on) @@ -2529,7 +2529,7 @@ static int azx_runtime_suspend(struct device *dev) struct azx *chip = card->private_data; #ifdef CONFIG_SND_HDA_POWER_SAVE - if (!power_save_controller) + if (!power_save_controller || !snd_hda_bus_ready_for_d3(chip->bus)) return -EAGAIN; #endif -- 1.7.11.4

2 12

[alsa-devel] [PATCH] ASoC: samsung dma - Don't indicate support for pause/resume.
by Dylan Reid 01 Sep '12

01 Sep '12

The pause and resume operations indicate that the stream can be un-paused/resumed from the exact location they were paused/suspended. This is not true for this driver, the pause and suspend triggers share the same code path with stop, they flush all pending DMA transfers. This drops all pending samples. The pause_release/resume triggers are the same as start, except that prepare won't be called beforehand, nothing will be enqueued to the DMA engine and nothing will happen (no audio). Removing the pause flag will let apps know that it isn't supported. Removing the resume flag will cause user space to call prepare and start instead of resume, so audio will continue playing when the system wakes up. Before removing the pause and resume flags, I tested this on an exynos 5250, using 'aplay -i'. Pause/un-pause leads to silence followed by a write error. Suspend/resume testing led to the same result. Removing the two flags fixes suspend/resume (since snd_pcm_prepare is called again). And leads to a proper reporting of pause not supported. Signed-off-by: Dylan Reid <dgreid(a)chromium.org> --- sound/soc/samsung/dma.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sound/soc/samsung/dma.c b/sound/soc/samsung/dma.c index f3ebc38..56a507a 100644 --- a/sound/soc/samsung/dma.c +++ b/sound/soc/samsung/dma.c @@ -34,9 +34,7 @@ static const struct snd_pcm_hardware dma_hardware = { .info = SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_MMAP | - SNDRV_PCM_INFO_MMAP_VALID | - SNDRV_PCM_INFO_PAUSE | - SNDRV_PCM_INFO_RESUME, + SNDRV_PCM_INFO_MMAP_VALID, .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_U16_LE | SNDRV_PCM_FMTBIT_U8 | -- 1.7.12.146.g16d26b1

2 2

[alsa-devel] [PATCH 6/9] ARM: OMAP: Move gpio.h to include/linux/platform_data
by Tony Lindgren 01 Sep '12

01 Sep '12

This way we can remove includes of plat/gpio.h which won't work with the single zImage support. Note that we also remove the cpu_class_is_omap2() check in gpio-omap.c as the drivers should not call it as we need to make it local to arch/arm/mach-omap2 for single zImage support. While at it, arrange the related includes in the standard way. Cc: Grant Likely <grant.likely(a)secretlab.ca> Cc: Linus Walleij <linus.walleij(a)linaro.org> Cc: linux-mtd(a)lists.infradead.org Cc: alsa-devel(a)alsa-project.org Acked-by: Tony Lindgren <tony(a)atomide.com> --- arch/arm/mach-omap1/board-ams-delta.c | 3 ++- arch/arm/mach-omap1/board-osk.c | 1 + arch/arm/mach-omap1/gpio15xx.c | 1 + arch/arm/mach-omap1/gpio16xx.c | 1 + arch/arm/mach-omap1/gpio7xx.c | 1 + arch/arm/mach-omap1/include/mach/gpio.h | 2 -- arch/arm/mach-omap1/leds-h2p2-debug.c | 4 +++- arch/arm/mach-omap1/leds.c | 1 + arch/arm/mach-omap2/board-am3517evm.c | 9 ++++++--- arch/arm/mach-omap2/board-cm-t35.c | 12 +++++++----- arch/arm/mach-omap2/board-zoom-display.c | 6 +++++- arch/arm/mach-omap2/board-zoom-peripherals.c | 1 + arch/arm/mach-omap2/gpio.c | 1 + arch/arm/mach-omap2/hsmmc.c | 5 ++++- arch/arm/mach-omap2/include/mach/gpio.h | 2 -- arch/arm/mach-omap2/msdi.c | 1 + arch/arm/mach-omap2/omap_hwmod_2420_data.c | 1 - arch/arm/mach-omap2/omap_hwmod_2430_data.c | 6 +++--- arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 2 +- arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 6 +++--- arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 6 +++--- arch/arm/mach-omap2/pm24xx.c | 1 + arch/arm/mach-omap2/pm34xx.c | 2 ++ drivers/gpio/gpio-omap.c | 15 ++++++++------- drivers/mtd/nand/ams-delta.c | 8 ++++++-- include/linux/platform_data/gpio-omap.h | 15 ++------------- sound/soc/omap/sdp3430.c | 1 + 27 files changed, 65 insertions(+), 49 deletions(-) rename arch/arm/plat-omap/include/plat/gpio.h => include/linux/platform_data/gpio-omap.h (94%) diff --git a/arch/arm/mach-omap1/board-ams-delta.c b/arch/arm/mach-omap1/board-ams-delta.c index 147d665..4b5578b 100644 --- a/arch/arm/mach-omap1/board-ams-delta.c +++ b/arch/arm/mach-omap1/board-ams-delta.c @@ -26,6 +26,8 @@ #include <linux/export.h> #include <linux/omapfb.h> #include <linux/io.h> +#include <linux/platform_data/gpio-omap.h> +#include <linux/platform_data/keypad-omap.h> #include <media/soc_camera.h> @@ -35,7 +37,6 @@ #include <asm/mach/map.h> #include <plat/board-ams-delta.h> -#include <linux/platform_data/keypad-omap.h> #include <plat/mux.h> #include <mach/hardware.h> diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c index 9413fd3..c780a1b 100644 --- a/arch/arm/mach-omap1/board-osk.c +++ b/arch/arm/mach-omap1/board-osk.c @@ -39,6 +39,7 @@ #include <linux/mtd/partitions.h> #include <linux/mtd/physmap.h> #include <linux/i2c/tps65010.h> +#include <linux/platform_data/gpio-omap.h> #include <linux/platform_data/omap1_bl.h> #include <asm/mach-types.h> diff --git a/arch/arm/mach-omap1/gpio15xx.c b/arch/arm/mach-omap1/gpio15xx.c index ebef15e..98e6f39 100644 --- a/arch/arm/mach-omap1/gpio15xx.c +++ b/arch/arm/mach-omap1/gpio15xx.c @@ -17,6 +17,7 @@ */ #include <linux/gpio.h> +#include <linux/platform_data/gpio-omap.h> #define OMAP1_MPUIO_VBASE OMAP1_MPUIO_BASE #define OMAP1510_GPIO_BASE 0xFFFCE000 diff --git a/arch/arm/mach-omap1/gpio16xx.c b/arch/arm/mach-omap1/gpio16xx.c index 2a48cd2..33f4192 100644 --- a/arch/arm/mach-omap1/gpio16xx.c +++ b/arch/arm/mach-omap1/gpio16xx.c @@ -17,6 +17,7 @@ */ #include <linux/gpio.h> +#include <linux/platform_data/gpio-omap.h> #define OMAP1610_GPIO1_BASE 0xfffbe400 #define OMAP1610_GPIO2_BASE 0xfffbec00 diff --git a/arch/arm/mach-omap1/gpio7xx.c b/arch/arm/mach-omap1/gpio7xx.c index acf12b7..958ce9a 100644 --- a/arch/arm/mach-omap1/gpio7xx.c +++ b/arch/arm/mach-omap1/gpio7xx.c @@ -17,6 +17,7 @@ */ #include <linux/gpio.h> +#include <linux/platform_data/gpio-omap.h> #define OMAP7XX_GPIO1_BASE 0xfffbc000 #define OMAP7XX_GPIO2_BASE 0xfffbc800 diff --git a/arch/arm/mach-omap1/include/mach/gpio.h b/arch/arm/mach-omap1/include/mach/gpio.h index e737706..ebf86c0 100644 --- a/arch/arm/mach-omap1/include/mach/gpio.h +++ b/arch/arm/mach-omap1/include/mach/gpio.h @@ -1,5 +1,3 @@ /* * arch/arm/mach-omap1/include/mach/gpio.h */ - -#include <plat/gpio.h> diff --git a/arch/arm/mach-omap1/leds-h2p2-debug.c b/arch/arm/mach-omap1/leds-h2p2-debug.c index f6b14a1..3ea12c7 100644 --- a/arch/arm/mach-omap1/leds-h2p2-debug.c +++ b/arch/arm/mach-omap1/leds-h2p2-debug.c @@ -14,13 +14,15 @@ #include <linux/kernel_stat.h> #include <linux/sched.h> #include <linux/io.h> +#include <linux/platform_data/gpio-omap.h> -#include <mach/hardware.h> #include <asm/leds.h> #include <asm/mach-types.h> #include <plat/fpga.h> +#include <mach/hardware.h> + #include "leds.h" diff --git a/arch/arm/mach-omap1/leds.c b/arch/arm/mach-omap1/leds.c index ae6dd93..7b1a383 100644 --- a/arch/arm/mach-omap1/leds.c +++ b/arch/arm/mach-omap1/leds.c @@ -6,6 +6,7 @@ #include <linux/gpio.h> #include <linux/kernel.h> #include <linux/init.h> +#include <linux/platform_data/gpio-omap.h> #include <asm/leds.h> #include <asm/mach-types.h> diff --git a/arch/arm/mach-omap2/board-am3517evm.c b/arch/arm/mach-omap2/board-am3517evm.c index 00abda1..c6d63d7 100644 --- a/arch/arm/mach-omap2/board-am3517evm.c +++ b/arch/arm/mach-omap2/board-am3517evm.c @@ -25,19 +25,22 @@ #include <linux/can/platform/ti_hecc.h> #include <linux/davinci_emac.h> #include <linux/mmc/host.h> +#include <linux/platform_data/gpio-omap.h> -#include <mach/hardware.h> -#include <mach/am35xx.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> -#include "common.h" #include <plat/usb.h> + +#include <mach/hardware.h> +#include <mach/am35xx.h> + #include <video/omapdss.h> #include <video/omap-panel-generic-dpi.h> #include <video/omap-panel-tfp410.h> +#include "common.h" #include "am35xx-emac.h" #include "mux.h" #include "control.h" diff --git a/arch/arm/mach-omap2/board-cm-t35.c b/arch/arm/mach-omap2/board-cm-t35.c index ad83654..c2b2371 100644 --- a/arch/arm/mach-omap2/board-cm-t35.c +++ b/arch/arm/mach-omap2/board-cm-t35.c @@ -23,6 +23,9 @@ #include <linux/input/matrix_keypad.h> #include <linux/delay.h> #include <linux/gpio.h> +#include <linux/platform_data/gpio-omap.h> +#include <linux/platform_data/mtd-nand-omap2.h> +#include <linux/platform_data/spi-omap2-mcspi.h> #include <linux/i2c/at24.h> #include <linux/i2c/twl.h> @@ -37,17 +40,16 @@ #include <asm/mach/arch.h> #include <asm/mach/map.h> -#include "common.h" -#include <linux/platform_data/mtd-nand-omap2.h> #include <plat/gpmc.h> #include <plat/usb.h> + +#include <mach/hardware.h> + #include <video/omapdss.h> #include <video/omap-panel-generic-dpi.h> #include <video/omap-panel-tfp410.h> -#include <linux/platform_data/spi-omap2-mcspi.h> - -#include <mach/hardware.h> +#include "common.h" #include "mux.h" #include "sdram-micron-mt46h32m32lf-6.h" #include "hsmmc.h" diff --git a/arch/arm/mach-omap2/board-zoom-display.c b/arch/arm/mach-omap2/board-zoom-display.c index 660a2932..0e48a51 100644 --- a/arch/arm/mach-omap2/board-zoom-display.c +++ b/arch/arm/mach-omap2/board-zoom-display.c @@ -15,9 +15,13 @@ #include <linux/i2c/twl.h> #include <linux/spi/spi.h> #include <linux/platform_data/spi-omap2-mcspi.h> -#include <video/omapdss.h> + +#include <plat/cpu.h> + #include <mach/board-zoom.h> +#include <video/omapdss.h> + #define LCD_PANEL_RESET_GPIO_PROD 96 #define LCD_PANEL_RESET_GPIO_PILOT 55 #define LCD_PANEL_QVGA_GPIO 56 diff --git a/arch/arm/mach-omap2/board-zoom-peripherals.c b/arch/arm/mach-omap2/board-zoom-peripherals.c index 00f73b7..ae5d36b 100644 --- a/arch/arm/mach-omap2/board-zoom-peripherals.c +++ b/arch/arm/mach-omap2/board-zoom-peripherals.c @@ -19,6 +19,7 @@ #include <linux/regulator/fixed.h> #include <linux/wl12xx.h> #include <linux/mmc/host.h> +#include <linux/platform_data/gpio-omap.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> diff --git a/arch/arm/mach-omap2/gpio.c b/arch/arm/mach-omap2/gpio.c index 9ad7d48..7b52bdf 100644 --- a/arch/arm/mach-omap2/gpio.c +++ b/arch/arm/mach-omap2/gpio.c @@ -21,6 +21,7 @@ #include <linux/slab.h> #include <linux/interrupt.h> #include <linux/of.h> +#include <linux/platform_data/gpio-omap.h> #include <plat/omap_hwmod.h> #include <plat/omap_device.h> diff --git a/arch/arm/mach-omap2/hsmmc.c b/arch/arm/mach-omap2/hsmmc.c index a9675d8..4b0e166 100644 --- a/arch/arm/mach-omap2/hsmmc.c +++ b/arch/arm/mach-omap2/hsmmc.c @@ -14,12 +14,15 @@ #include <linux/string.h> #include <linux/delay.h> #include <linux/gpio.h> -#include <mach/hardware.h> +#include <linux/platform_data/gpio-omap.h> + #include <plat/mmc.h> #include <plat/omap-pm.h> #include <plat/mux.h> #include <plat/omap_device.h> +#include <mach/hardware.h> + #include "mux.h" #include "hsmmc.h" #include "control.h" diff --git a/arch/arm/mach-omap2/include/mach/gpio.h b/arch/arm/mach-omap2/include/mach/gpio.h index be4d290..5621cc5 100644 --- a/arch/arm/mach-omap2/include/mach/gpio.h +++ b/arch/arm/mach-omap2/include/mach/gpio.h @@ -1,5 +1,3 @@ /* * arch/arm/mach-omap2/include/mach/gpio.h */ - -#include <plat/gpio.h> diff --git a/arch/arm/mach-omap2/msdi.c b/arch/arm/mach-omap2/msdi.c index fb5bc6c..9e57b4a 100644 --- a/arch/arm/mach-omap2/msdi.c +++ b/arch/arm/mach-omap2/msdi.c @@ -23,6 +23,7 @@ #include <linux/kernel.h> #include <linux/err.h> +#include <linux/platform_data/gpio-omap.h> #include <plat/omap_hwmod.h> #include <plat/omap_device.h> diff --git a/arch/arm/mach-omap2/omap_hwmod_2420_data.c b/arch/arm/mach-omap2/omap_hwmod_2420_data.c index 558c300..b305d7f 100644 --- a/arch/arm/mach-omap2/omap_hwmod_2420_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_2420_data.c @@ -18,7 +18,6 @@ #include <plat/dma.h> #include <plat/serial.h> #include <plat/i2c.h> -#include <plat/gpio.h> #include <linux/platform_data/spi-omap2-mcspi.h> #include <plat/dmtimer.h> #include <plat/l3_2xxx.h> diff --git a/arch/arm/mach-omap2/omap_hwmod_2430_data.c b/arch/arm/mach-omap2/omap_hwmod_2430_data.c index d662766..79ac236 100644 --- a/arch/arm/mach-omap2/omap_hwmod_2430_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_2430_data.c @@ -12,15 +12,15 @@ * XXX handle crossbar/shared link difference for L3? * XXX these should be marked initdata for multi-OMAP kernels */ +#include <linux/platform_data/dsp-mcbsp.h> +#include <linux/platform_data/spi-omap2-mcspi.h> + #include <plat/omap_hwmod.h> #include <mach/irqs.h> #include <plat/cpu.h> #include <plat/dma.h> #include <plat/serial.h> #include <plat/i2c.h> -#include <plat/gpio.h> -#include <linux/platform_data/dsp-mcbsp.h> -#include <linux/platform_data/spi-omap2-mcspi.h> #include <plat/dmtimer.h> #include <plat/mmc.h> #include <plat/l3_2xxx.h> diff --git a/arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c b/arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c index 161ae0a..44e4764 100644 --- a/arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c @@ -10,9 +10,9 @@ */ #include <plat/omap_hwmod.h> #include <plat/serial.h> -#include <plat/gpio.h> #include <plat/dma.h> #include <plat/dmtimer.h> +#include <linux/platform_data/gpio-omap.h> #include <linux/platform_data/spi-omap2-mcspi.h> #include <mach/irqs.h> diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c index 656bb7f..15f617e 100644 --- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c @@ -15,6 +15,9 @@ * XXX these should be marked initdata for multi-OMAP kernels */ #include <linux/power/smartreflex.h> +#include <linux/platform_data/gpio-omap.h> +#include <linux/platform_data/dsp-mcbsp.h> +#include <linux/platform_data/spi-omap2-mcspi.h> #include <plat/omap_hwmod.h> #include <mach/irqs.h> @@ -24,10 +27,7 @@ #include <plat/l3_3xxx.h> #include <plat/l4_3xxx.h> #include <plat/i2c.h> -#include <plat/gpio.h> #include <plat/mmc.h> -#include <linux/platform_data/dsp-mcbsp.h> -#include <linux/platform_data/spi-omap2-mcspi.h> #include <plat/dmtimer.h> #include "omap_hwmod_common_data.h" diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c index 3a06e7d..c9edaf2 100644 --- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c @@ -19,15 +19,15 @@ */ #include <linux/io.h> +#include <linux/platform_data/gpio-omap.h> +#include <linux/platform_data/spi-omap2-mcspi.h> +#include <linux/platform_data/dsp-mcbsp.h> #include <linux/power/smartreflex.h> #include <plat/omap_hwmod.h> #include <plat/cpu.h> #include <plat/i2c.h> -#include <plat/gpio.h> #include <plat/dma.h> -#include <linux/platform_data/spi-omap2-mcspi.h> -#include <linux/platform_data/dsp-mcbsp.h> #include <plat/mmc.h> #include <plat/dmtimer.h> #include <plat/common.h> diff --git a/arch/arm/mach-omap2/pm24xx.c b/arch/arm/mach-omap2/pm24xx.c index de1caf1..2708a8b 100644 --- a/arch/arm/mach-omap2/pm24xx.c +++ b/arch/arm/mach-omap2/pm24xx.c @@ -29,6 +29,7 @@ #include <linux/irq.h> #include <linux/time.h> #include <linux/gpio.h> +#include <linux/platform_data/gpio-omap.h> #include <asm/mach/time.h> #include <asm/mach/irq.h> diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c index e4fc88c..2a08978 100644 --- a/arch/arm/mach-omap2/pm34xx.c +++ b/arch/arm/mach-omap2/pm34xx.c @@ -28,6 +28,8 @@ #include <linux/clk.h> #include <linux/delay.h> #include <linux/slab.h> +#include <linux/platform_data/gpio-omap.h> + #include <trace/events/power.h> #include <asm/suspend.h> diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c index e6efd77..64fbce3 100644 --- a/drivers/gpio/gpio-omap.c +++ b/drivers/gpio/gpio-omap.c @@ -25,11 +25,9 @@ #include <linux/of.h> #include <linux/of_device.h> #include <linux/irqdomain.h> +#include <linux/gpio.h> +#include <linux/platform_data/gpio-omap.h> -#include <mach/hardware.h> -#include <asm/irq.h> -#include <mach/irqs.h> -#include <asm/gpio.h> #include <asm/mach/irq.h> #define OFF_MODE 1 @@ -385,13 +383,16 @@ static int _set_gpio_triggering(struct gpio_bank *bank, int gpio, static int gpio_irq_type(struct irq_data *d, unsigned type) { struct gpio_bank *bank = irq_data_get_irq_chip_data(d); - unsigned gpio; + unsigned gpio = 0; int retval; unsigned long flags; - if (!cpu_class_is_omap2() && d->irq > IH_MPUIO_BASE) +#ifdef CONFIG_ARCH_OMAP1 + if (d->irq > IH_MPUIO_BASE) gpio = OMAP_MPUIO(d->irq - IH_MPUIO_BASE); - else +#endif + + if (!gpio) gpio = irq_to_gpio(bank, d->irq); if (type & ~IRQ_TYPE_SENSE_MASK) diff --git a/drivers/mtd/nand/ams-delta.c b/drivers/mtd/nand/ams-delta.c index 861ca8f..78a524b 100644 --- a/drivers/mtd/nand/ams-delta.c +++ b/drivers/mtd/nand/ams-delta.c @@ -23,12 +23,16 @@ #include <linux/mtd/mtd.h> #include <linux/mtd/nand.h> #include <linux/mtd/partitions.h> +#include <linux/gpio.h> +#include <linux/platform_data/gpio-omap.h> + #include <asm/io.h> -#include <mach/hardware.h> #include <asm/sizes.h> -#include <linux/gpio.h> + #include <plat/board-ams-delta.h> +#include <mach/hardware.h> + /* * MTD structure for E3 (Delta) */ diff --git a/arch/arm/plat-omap/include/plat/gpio.h b/include/linux/platform_data/gpio-omap.h similarity index 94% rename from arch/arm/plat-omap/include/plat/gpio.h rename to include/linux/platform_data/gpio-omap.h index 50fb7cc..e8741c2 100644 --- a/arch/arm/plat-omap/include/plat/gpio.h +++ b/include/linux/platform_data/gpio-omap.h @@ -1,6 +1,4 @@ /* - * arch/arm/plat-omap/include/mach/gpio.h - * * OMAP GPIO handling defines and functions * * Copyright (C) 2003-2005 Nokia Corporation @@ -155,6 +153,8 @@ #define OMAP4_GPIO_CLEARDATAOUT 0x0190 #define OMAP4_GPIO_SETDATAOUT 0x0194 +#define OMAP_MAX_GPIO_LINES 192 + #define OMAP_MPUIO(nr) (OMAP_MAX_GPIO_LINES + (nr)) #define OMAP_GPIO_IS_MPUIO(nr) ((nr) >= OMAP_MAX_GPIO_LINES) @@ -213,16 +213,5 @@ extern void omap2_gpio_prepare_for_idle(int off_mode); extern void omap2_gpio_resume_after_idle(void); extern void omap_set_gpio_debounce(int gpio, int enable); extern void omap_set_gpio_debounce_time(int gpio, int enable); -/*-------------------------------------------------------------------------*/ - -/* - * Wrappers for "new style" GPIO calls, using the new infrastructure - * which lets us plug in FPGA, I2C, and other implementations. - * - * The original OMAP-specific calls should eventually be removed. - */ - -#include <linux/errno.h> -#include <asm-generic/gpio.h> #endif diff --git a/sound/soc/omap/sdp3430.c b/sound/soc/omap/sdp3430.c index 33f4ac2..da45b51 100644 --- a/sound/soc/omap/sdp3430.c +++ b/sound/soc/omap/sdp3430.c @@ -33,6 +33,7 @@ #include <asm/mach-types.h> #include <mach/hardware.h> #include <mach/gpio.h> +#include <linux/platform_data/gpio-omap.h> #include <linux/platform_data/dsp-mcbsp.h> /* Register descriptions for twl4030 codec part */

2 1

Re: [alsa-devel] [PATCH] ASoC: correct the check for NULL dma_buffer pointer
by Mark Brown 31 Aug '12

31 Aug '12

On Fri, Aug 31, 2012 at 08:55:21AM +0530, Prasad Joshi wrote: > The if condition > if (!buf && !buf->area) > > checks if the buf pointer is NULL and then dereferences it again to > check if the buffer area is NULL, resulting in possible NULL > dereference. Applied, thanks.

1 0

[alsa-devel] [PATCH 0/3] introduce device_buffer
by Vinod Koul 31 Aug '12

31 Aug '12

Old wine ina new bottle, so here is the second attempt for adding the notion of how devices (in my case a DSP) can buffer data and that can be used by sound core Vinod Koul (3): ALSA: pcm - introduce device_buffer ASoC: add device_buffer in asoc ASoC: mid-x86 - implement buffer query in sst_platform driver include/sound/pcm.h | 1 + include/sound/soc-dai.h | 6 ++++++ include/sound/soc.h | 7 ++++++- sound/core/pcm_lib.c | 14 +++++++++++--- sound/core/pcm_native.c | 6 +++--- sound/soc/mid-x86/sst_platform.c | 23 +++++++++++++++++++++++ sound/soc/mid-x86/sst_platform.h | 4 +++- sound/soc/soc-pcm.c | 13 +++++++++++++ 8 files changed, 66 insertions(+), 8 deletions(-) -- 1.7.9.5

2 4