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

[alsa-devel] Audio codec volume control
by Rajeev kumar 20 Sep '12

20 Sep '12

Hello Mark, We have three volume control in audio codec. 1. Master volume: control both left and right channel volume 2. left volume: control left channel vol 3. right volume: control right channel vol. So we can provide interfaces for all volume control to the user. Please find below the control I can provide to the user space case 1: 1. Provide master volume control 2. Provide Left channel volume control. 3. Provide Right channel volume control. case 2: 1. Provide master volume control 2. Instead of providing separate control for left and right channel, combined it and provide a single control to user space. so that left and right volume is always in sync. Please let me know which case is better and why? Thank you very much for your support. Best Regards Rajeev

2 5

[alsa-devel] [PATCH] ALSA: usb - disable broken hw volume for Tenx TP6911
by David Henningsson 20 Sep '12

20 Sep '12

While going through Ubuntu bugs, I discovered this patch being posted and a confirmation that the patch works as expected. Finding out how the hw volume really works would be preferrable to just disabling the broken one, but this would be better than nothing. Credit: sndfnsdfin (qawsnews) BugLink: https://bugs.launchpad.net/bugs/559939 Signed-off-by: David Henningsson <david.henningsson(a)canonical.com> --- sound/usb/mixer.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c index 4f40ba8..fe56c9d 100644 --- a/sound/usb/mixer.c +++ b/sound/usb/mixer.c @@ -1267,6 +1267,13 @@ static int parse_audio_feature_unit(struct mixer_build *state, int unitid, void /* disable non-functional volume control */ master_bits &= ~UAC_CONTROL_BIT(UAC_FU_VOLUME); break; + case USB_ID(0x1130, 0xf211): + snd_printk(KERN_INFO + "usbmixer: volume control quirk for Tenx TP6911 Audio Headset\n"); + /* disable non-functional volume control */ + channels = 0; + break; + } if (channels > 0) first_ch_bits = snd_usb_combine_bytes(bmaControls + csize, csize); -- 1.7.9.5

2 1

Re: [alsa-devel] snd_usb changes broke audio
by Daniel Mack 20 Sep '12

20 Sep '12

(Cc the ALSA list - please don't drop it in replies) On 20.09.2012 02:16, Nate Garner wrote: > I recently updated my kernel from 3.5.3 to 3.5.4. Upon rebooting, I no > longer got any audio through my external sound card, but my headphones > worked. I noticed in the kernel change log that you made some changes to > snd-usb, and thought that might be the culprit. I hope you're the right > person to report this too, if not, feel free to ignore. > Relevant info: > Distro: arch linux, x86_64 > sound card: creative labs model SB0490 (soundblaser Live! 24-bit > external (link here > <http://support.creative.com/Products/ProductDetails.aspx?catID=1&subCatID=2…>) > alsa version 1.0.26 > pulseaudio version 2.1 Argh! I believed we finally fixed all the regressions. Are there any messages in the logs or in dmesg that look releated? Can you send the output of "lsusb -v", please? Daniel

1 0

[alsa-devel] Internal speaker output from Sony Vaio Z (2010 model) lost somewhere between 3.1.0 and 3.2.6
by Adam Williamson 20 Sep '12

20 Sep '12

Welp, pretty much as the topic says. I just noticed today that sound is no longer playing from the internal speakers of my laptop, a 2010 model Sony Vaio Z. Plugging in headphones causes sound to be played fine through those. There are three possible choices for 'Connector' - 'Analog Speakers', 'Analog Output', and 'Analog Headphones' - but none of these seems to make sound come out of the internal speakers. The default is 'Analog Speakers', and when it's set to this, headphone output does work when headphones are plugged in. I've verified that it's broken on Fedora 16 kernels 3.2.6-4, 3.2.8-3 and 3.2.10-1. It's also broken in a very recent Fedora 17 kernel, 3.3.0rc6 or so. It works on a Fedora 16 live image, with kernel 3.1.0-1. Unfortunately the kernels before 3.2.6 have been trashed from Fedora's buildsystem archives, I think, so it's hard to narrow things down any further :/ the alsa-info output is http://www.alsa-project.org/db/?f=368e2359757b537d4daa0f5399830d3942540196 . Thanks! -- Adam Williamson Fedora QA Community Monkey IRC: adamw | Twitter: AdamW_Fedora | identi.ca: adamwfedora http://www.happyassassin.net

3 22

[alsa-devel] [PATCH 00/34] i.MX multi-platform support
by Shawn Guo 20 Sep '12

20 Sep '12

The series enables multi-platform support for imx. Since the required frameworks (clk, pwm) and spare_irq have already been adopted on imx, the series is all about cleaning up mach/* headers. Along with the changes, arch/arm/plat-mxc gets merged into arch/arm/mach-imx. It's based on a bunch of branches (works from others), Rob's initial multi-platform series, Arnd's platform-data and smp_ops (Marc's) and imx 3.7 material (Sascha and myself). It's available on branch below. git://git.linaro.org/people/shawnguo/linux-2.6.git imx/multi-platform It's been tested on imx5 and imx6, and only compile-tested on imx2 and imx3, so testing on imx2/3 are appreciated. Subsystem maintainers, I plan to send the whole series via arm-soc tree at the end of 3.7 merge window when all dependant bits hit mainline. Please have a look at the patches you get copied and provide ACKs if the changes are good. Thanks. Shawn Guo (34): ARM: imx: include board headers in the same folder ASoC: mx27vis: retrieve gpio numbers from platform_data ARM: imx: move iomux drivers and headers into mach-imx ARM: imx: remove unnecessary inclusion from device-imx*.h ARM: imx: move platform device code into mach-imx ARM: imx: merge plat-mxc into mach-imx ARM: imx: include common.h rather than mach/common.h ARM: imx: ARM: imx: include cpuidle.h rather than mach/cpuidle.h ARM: imx: include iim.h rather than mach/iim.h ARM: imx: include iram.h rather than mach/iram.h ARM: imx: include ulpi.h rather than mach/ulpi.h media: mx1_camera: remove the driver ARM: imx: remove mach/dma-mx1-mx2.h dma: ipu: rename mach/ipu.h to include/linux/dma/ipu-dma.h dma: imx-sdma: remove unneeded mach/hardware.h inclusion ASoC: imx-ssi: remove unneeded mach/hardware.h inclusion usb: ehci-mxc: remove unneeded mach/hardware.h inclusion video: mx3fb: remove unneeded mach/hardware.h inclusion watchdog: imx2_wdt: remove unneeded mach/hardware.h inclusion i2c: imx: remove mach/hardware.h inclusion mtd: mxc_nand: remove mach/hardware.h inclusion rtc: mxc_rtc: remove mach/hardware.h inclusion dma: imx-dma: use devm_kzalloc and devm_request_irq dma: imx-dma: retrieve MEM and IRQ from resources dma: imx-dma: remove mach/hardware.h inclusion media: mx2_camera: remove dead code in mx2_camera_add_device media: mx2_camera: use managed functions to clean up code media: mx2_camera: remove mach/hardware.h inclusion mmc: mxcmmc: remove mach/hardware.h inclusion video: imxfb: remove mach/hardware.h inclusion ARM: imx: move debug macros to include/debug ARM: imx: include hardware.h rather than mach/hardware.h ARM: imx: remove header file mach/irqs.h ARM: imx: enable multi-platform build .../devicetree/bindings/i2c/fsl-imx-i2c.txt | 4 +- arch/arm/Kconfig | 15 +- arch/arm/Kconfig.debug | 8 + arch/arm/Makefile | 1 - arch/arm/boot/dts/imx27.dtsi | 4 +- arch/arm/boot/dts/imx51.dtsi | 4 +- arch/arm/boot/dts/imx53.dtsi | 6 +- arch/arm/boot/dts/imx6q.dtsi | 6 +- .../mach/debug-macro.S => include/debug/imx.S} | 33 +- arch/arm/{plat-mxc => mach-imx}/3ds_debugboard.c | 2 +- .../include/mach => mach-imx}/3ds_debugboard.h | 0 arch/arm/mach-imx/Kconfig | 86 ++ arch/arm/mach-imx/Makefile | 23 +- arch/arm/{plat-mxc => mach-imx}/avic.c | 5 +- .../include/mach => mach-imx}/board-mx31lilly.h | 0 .../include/mach => mach-imx}/board-mx31lite.h | 0 .../include/mach => mach-imx}/board-mx31moboard.h | 0 .../include/mach => mach-imx}/board-pcm038.h | 0 arch/arm/mach-imx/clk-imx1.c | 15 +- arch/arm/mach-imx/clk-imx21.c | 14 +- arch/arm/mach-imx/clk-imx25.c | 26 +- arch/arm/mach-imx/clk-imx27.c | 36 +- arch/arm/mach-imx/clk-imx31.c | 21 +- arch/arm/mach-imx/clk-imx35.c | 13 +- arch/arm/mach-imx/clk-imx51-imx53.c | 15 +- arch/arm/mach-imx/clk-imx6q.c | 3 +- arch/arm/mach-imx/clk-pllv1.c | 4 +- .../{plat-mxc/include/mach => mach-imx}/common.h | 0 arch/arm/mach-imx/cpu-imx25.c | 5 +- arch/arm/mach-imx/cpu-imx27.c | 2 +- arch/arm/mach-imx/cpu-imx31.c | 7 +- arch/arm/mach-imx/cpu-imx35.c | 5 +- arch/arm/mach-imx/cpu-imx5.c | 3 +- arch/arm/{plat-mxc => mach-imx}/cpu.c | 3 +- arch/arm/mach-imx/cpu_op-mx51.c | 3 +- arch/arm/{plat-mxc => mach-imx}/cpufreq.c | 3 +- arch/arm/{plat-mxc => mach-imx}/cpuidle.c | 0 .../{plat-mxc/include/mach => mach-imx}/cpuidle.h | 0 arch/arm/mach-imx/devices-imx1.h | 3 +- arch/arm/mach-imx/devices-imx21.h | 3 +- arch/arm/mach-imx/devices-imx25.h | 3 +- arch/arm/mach-imx/devices-imx27.h | 3 +- arch/arm/mach-imx/devices-imx31.h | 3 +- arch/arm/mach-imx/devices-imx35.h | 3 +- arch/arm/mach-imx/devices-imx50.h | 3 +- arch/arm/mach-imx/devices-imx51.h | 3 +- arch/arm/{plat-mxc => mach-imx}/devices/Kconfig | 3 - arch/arm/{plat-mxc => mach-imx}/devices/Makefile | 3 +- .../mach => mach-imx/devices}/devices-common.h | 19 +- arch/arm/{plat-mxc => mach-imx/devices}/devices.c | 1 - .../devices/platform-ahci-imx.c | 5 +- .../{plat-mxc => mach-imx}/devices/platform-fec.c | 5 +- .../devices/platform-flexcan.c | 4 +- .../devices/platform-fsl-usb2-udc.c | 5 +- .../devices/platform-gpio-mxc.c | 2 +- .../devices/platform-gpio_keys.c | 5 +- .../devices/platform-imx-dma.c | 23 +- .../devices/platform-imx-fb.c | 16 +- .../devices/platform-imx-i2c.c | 31 +- .../devices/platform-imx-keypad.c | 4 +- .../devices/platform-imx-ssi.c | 4 +- .../devices/platform-imx-uart.c | 4 +- .../devices/platform-imx2-wdt.c | 5 +- .../devices/platform-imx21-hcd.c | 4 +- .../devices/platform-imx_udc.c | 4 +- .../devices/platform-imxdi_rtc.c | 5 +- .../devices/platform-ipu-core.c | 5 +- .../devices/platform-mx2-camera.c | 16 +- .../devices/platform-mxc-ehci.c | 5 +- .../devices/platform-mxc-mmc.c | 20 +- .../devices/platform-mxc_nand.c | 25 +- .../devices/platform-mxc_pwm.c | 4 +- .../devices/platform-mxc_rnga.c | 4 +- .../devices/platform-mxc_rtc.c | 13 +- .../devices/platform-mxc_w1.c | 4 +- .../devices/platform-pata_imx.c | 4 +- .../devices/platform-sdhci-esdhc-imx.c | 5 +- .../devices/platform-spi_imx.c | 4 +- arch/arm/mach-imx/ehci-imx25.c | 4 +- arch/arm/mach-imx/ehci-imx27.c | 4 +- arch/arm/mach-imx/ehci-imx31.c | 4 +- arch/arm/mach-imx/ehci-imx35.c | 4 +- arch/arm/mach-imx/ehci-imx5.c | 4 +- arch/arm/{plat-mxc => mach-imx}/epit.c | 6 +- .../include/mach => mach-imx}/eukrea-baseboards.h | 0 arch/arm/mach-imx/eukrea_mbimx27-baseboard.c | 7 +- arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c | 8 +- arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c | 7 +- arch/arm/mach-imx/eukrea_mbimxsd51-baseboard.c | 7 +- .../{plat-mxc/include/mach => mach-imx}/hardware.h | 26 +- arch/arm/mach-imx/hotplug.c | 3 +- arch/arm/{plat-mxc/include/mach => mach-imx}/iim.h | 0 arch/arm/mach-imx/imx27-dt.c | 11 +- arch/arm/mach-imx/imx31-dt.c | 5 +- arch/arm/mach-imx/imx51-dt.c | 9 +- arch/arm/mach-imx/include/mach/dma-mx1-mx2.h | 10 - arch/arm/mach-imx/iomux-imx31.c | 5 +- .../include/mach => mach-imx}/iomux-mx1.h | 2 +- .../include/mach => mach-imx}/iomux-mx21.h | 4 +- .../include/mach => mach-imx}/iomux-mx25.h | 2 +- .../include/mach => mach-imx}/iomux-mx27.h | 4 +- .../include/mach => mach-imx}/iomux-mx2x.h | 0 .../include/mach => mach-imx}/iomux-mx3.h | 0 .../include/mach => mach-imx}/iomux-mx35.h | 2 +- .../include/mach => mach-imx}/iomux-mx50.h | 2 +- .../include/mach => mach-imx}/iomux-mx51.h | 2 +- arch/arm/{plat-mxc => mach-imx}/iomux-v1.c | 5 +- .../{plat-mxc/include/mach => mach-imx}/iomux-v1.h | 0 arch/arm/{plat-mxc => mach-imx}/iomux-v3.c | 5 +- .../{plat-mxc/include/mach => mach-imx}/iomux-v3.h | 0 .../arm/{plat-mxc/include/mach => mach-imx}/iram.h | 0 arch/arm/{plat-mxc => mach-imx}/iram_alloc.c | 3 +- arch/arm/{plat-mxc => mach-imx}/irq-common.c | 0 arch/arm/{plat-mxc => mach-imx}/irq-common.h | 3 + arch/arm/mach-imx/lluart.c | 3 +- arch/arm/mach-imx/mach-apf9328.c | 7 +- arch/arm/mach-imx/mach-armadillo5x0.c | 9 +- arch/arm/mach-imx/mach-bug.c | 7 +- arch/arm/mach-imx/mach-cpuimx27.c | 11 +- arch/arm/mach-imx/mach-cpuimx35.c | 9 +- arch/arm/mach-imx/mach-cpuimx51sd.c | 9 +- arch/arm/mach-imx/mach-eukrea_cpuimx25.c | 10 +- arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 48 +- arch/arm/mach-imx/mach-imx27ipcam.c | 6 +- arch/arm/mach-imx/mach-imx27lite.c | 6 +- arch/arm/mach-imx/mach-imx53.c | 11 +- arch/arm/mach-imx/mach-imx6q.c | 6 +- arch/arm/mach-imx/mach-kzm_arm11_01.c | 7 +- arch/arm/mach-imx/mach-mx1ads.c | 7 +- arch/arm/mach-imx/mach-mx21ads.c | 6 +- arch/arm/mach-imx/mach-mx25_3ds.c | 8 +- arch/arm/mach-imx/mach-mx27_3ds.c | 10 +- arch/arm/mach-imx/mach-mx27ads.c | 6 +- arch/arm/mach-imx/mach-mx31_3ds.c | 12 +- arch/arm/mach-imx/mach-mx31ads.c | 5 +- arch/arm/mach-imx/mach-mx31lilly.c | 11 +- arch/arm/mach-imx/mach-mx31lite.c | 11 +- arch/arm/mach-imx/mach-mx31moboard.c | 14 +- arch/arm/mach-imx/mach-mx35_3ds.c | 8 +- arch/arm/mach-imx/mach-mx50_rdp.c | 7 +- arch/arm/mach-imx/mach-mx51_3ds.c | 9 +- arch/arm/mach-imx/mach-mx51_babbage.c | 7 +- arch/arm/mach-imx/mach-mxt_td60.c | 6 +- arch/arm/mach-imx/mach-pca100.c | 8 +- arch/arm/mach-imx/mach-pcm037.c | 8 +- arch/arm/mach-imx/mach-pcm037_eet.c | 5 +- arch/arm/mach-imx/mach-pcm038.c | 13 +- arch/arm/mach-imx/mach-pcm043.c | 9 +- arch/arm/mach-imx/mach-qong.c | 6 +- arch/arm/mach-imx/mach-scb9328.c | 7 +- arch/arm/mach-imx/mach-vpr200.c | 7 +- arch/arm/mach-imx/mm-imx1.c | 9 +- arch/arm/mach-imx/mm-imx21.c | 12 +- arch/arm/mach-imx/mm-imx25.c | 10 +- arch/arm/mach-imx/mm-imx27.c | 12 +- arch/arm/mach-imx/mm-imx3.c | 9 +- arch/arm/mach-imx/mm-imx5.c | 8 +- arch/arm/mach-imx/mx1-camera-fiq-ksym.c | 18 - arch/arm/mach-imx/mx1-camera-fiq.S | 35 - arch/arm/{plat-mxc/include/mach => mach-imx}/mx1.h | 0 .../arm/{plat-mxc/include/mach => mach-imx}/mx21.h | 0 .../arm/{plat-mxc/include/mach => mach-imx}/mx25.h | 0 .../arm/{plat-mxc/include/mach => mach-imx}/mx27.h | 0 .../arm/{plat-mxc/include/mach => mach-imx}/mx2x.h | 0 .../arm/{plat-mxc/include/mach => mach-imx}/mx31.h | 0 arch/arm/mach-imx/mx31lilly-db.c | 9 +- arch/arm/mach-imx/mx31lite-db.c | 9 +- arch/arm/mach-imx/mx31moboard-devboard.c | 9 +- arch/arm/mach-imx/mx31moboard-marxbot.c | 9 +- arch/arm/mach-imx/mx31moboard-smartbot.c | 11 +- .../arm/{plat-mxc/include/mach => mach-imx}/mx35.h | 0 .../arm/{plat-mxc/include/mach => mach-imx}/mx3x.h | 0 .../arm/{plat-mxc/include/mach => mach-imx}/mx50.h | 0 .../arm/{plat-mxc/include/mach => mach-imx}/mx51.h | 0 .../arm/{plat-mxc/include/mach => mach-imx}/mx53.h | 0 .../arm/{plat-mxc/include/mach => mach-imx}/mx6q.h | 0 arch/arm/{plat-mxc/include/mach => mach-imx}/mxc.h | 0 arch/arm/mach-imx/pcm970-baseboard.c | 7 +- arch/arm/mach-imx/platsmp.c | 5 +- arch/arm/mach-imx/pm-imx27.c | 3 +- arch/arm/mach-imx/pm-imx3.c | 7 +- arch/arm/mach-imx/pm-imx5.c | 7 +- arch/arm/mach-imx/pm-imx6q.c | 5 +- arch/arm/{plat-mxc => mach-imx}/ssi-fiq-ksym.c | 0 arch/arm/{plat-mxc => mach-imx}/ssi-fiq.S | 0 arch/arm/{plat-mxc => mach-imx}/system.c | 5 +- arch/arm/{plat-mxc => mach-imx}/time.c | 5 +- arch/arm/{plat-mxc => mach-imx}/tzic.c | 6 +- arch/arm/{plat-mxc => mach-imx}/ulpi.c | 2 +- .../arm/{plat-mxc/include/mach => mach-imx}/ulpi.h | 0 arch/arm/plat-mxc/Kconfig | 89 -- arch/arm/plat-mxc/Makefile | 24 - arch/arm/plat-mxc/devices/platform-mx1-camera.c | 42 - arch/arm/plat-mxc/include/mach/irqs.h | 21 - arch/arm/plat-mxc/include/mach/timex.h | 22 - arch/arm/plat-mxc/include/mach/uncompress.h | 132 --- drivers/dma/imx-dma.c | 137 +-- drivers/dma/imx-sdma.c | 1 - drivers/dma/ipu/ipu_idmac.c | 3 +- drivers/dma/ipu/ipu_irq.c | 3 +- drivers/i2c/busses/i2c-imx.c | 40 +- drivers/media/video/Kconfig | 12 - drivers/media/video/Makefile | 1 - drivers/media/video/mx1_camera.c | 889 -------------------- drivers/media/video/mx2_camera.c | 240 +++--- drivers/media/video/mx3_camera.c | 2 +- drivers/mmc/host/mxcmmc.c | 31 +- drivers/mtd/nand/mxc_nand.c | 86 +- drivers/rtc/rtc-mxc.c | 34 +- drivers/usb/host/ehci-mxc.c | 1 - drivers/video/imxfb.c | 38 +- drivers/video/mx3fb.c | 3 +- drivers/watchdog/imx2_wdt.c | 1 - .../mach/ipu.h => include/linux/dma/ipu-dma.h | 6 +- include/linux/platform_data/asoc-mx27vis.h | 11 + include/linux/platform_data/camera-mx1.h | 35 - sound/soc/fsl/imx-pcm-fiq.c | 3 +- sound/soc/fsl/imx-ssi.c | 1 - sound/soc/fsl/mx27vis-aic32x4.c | 42 +- 219 files changed, 1149 insertions(+), 2170 deletions(-) rename arch/arm/{plat-mxc/include/mach/debug-macro.S => include/debug/imx.S} (59%) rename arch/arm/{plat-mxc => mach-imx}/3ds_debugboard.c (99%) rename arch/arm/{plat-mxc/include/mach => mach-imx}/3ds_debugboard.h (100%) rename arch/arm/{plat-mxc => mach-imx}/avic.c (98%) rename arch/arm/{plat-mxc/include/mach => mach-imx}/board-mx31lilly.h (100%) rename arch/arm/{plat-mxc/include/mach => mach-imx}/board-mx31lite.h (100%) rename arch/arm/{plat-mxc/include/mach => mach-imx}/board-mx31moboard.h (100%) rename arch/arm/{plat-mxc/include/mach => mach-imx}/board-pcm038.h (100%) rename arch/arm/{plat-mxc/include/mach => mach-imx}/common.h (100%) rename arch/arm/{plat-mxc => mach-imx}/cpu.c (97%) rename arch/arm/{plat-mxc => mach-imx}/cpufreq.c (99%) rename arch/arm/{plat-mxc => mach-imx}/cpuidle.c (100%) rename arch/arm/{plat-mxc/include/mach => mach-imx}/cpuidle.h (100%) rename arch/arm/{plat-mxc => mach-imx}/devices/Kconfig (96%) rename arch/arm/{plat-mxc => mach-imx}/devices/Makefile (96%) rename arch/arm/{plat-mxc/include/mach => mach-imx/devices}/devices-common.h (96%) rename arch/arm/{plat-mxc => mach-imx/devices}/devices.c (98%) rename arch/arm/{plat-mxc => mach-imx}/devices/platform-ahci-imx.c (98%) rename arch/arm/{plat-mxc => mach-imx}/devices/platform-fec.c (97%) rename arch/arm/{plat-mxc => mach-imx}/devices/platform-flexcan.c (96%) rename arch/arm/{plat-mxc => mach-imx}/devices/platform-fsl-usb2-udc.c (96%) rename arch/arm/{plat-mxc => mach-imx}/devices/platform-gpio-mxc.c (96%) rename arch/arm/{plat-mxc => mach-imx}/devices/platform-gpio_keys.c (94%) rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx-dma.c (63%) rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx-fb.c (79%) rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx-i2c.c (77%) rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx-keypad.c (97%) rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx-ssi.c (98%) rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx-uart.c (98%) rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx2-wdt.c (97%) rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx21-hcd.c (94%) rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx_udc.c (96%) rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imxdi_rtc.c (94%) rename arch/arm/{plat-mxc => mach-imx}/devices/platform-ipu-core.c (98%) rename arch/arm/{plat-mxc => mach-imx}/devices/platform-mx2-camera.c (83%) rename arch/arm/{plat-mxc => mach-imx}/devices/platform-mxc-ehci.c (97%) rename arch/arm/{plat-mxc => mach-imx}/devices/platform-mxc-mmc.c (76%) rename arch/arm/{plat-mxc => mach-imx}/devices/platform-mxc_nand.c (74%) rename arch/arm/{plat-mxc => mach-imx}/devices/platform-mxc_pwm.c (97%) rename arch/arm/{plat-mxc => mach-imx}/devices/platform-mxc_rnga.c (95%) rename arch/arm/{plat-mxc => mach-imx}/devices/platform-mxc_rtc.c (77%) rename arch/arm/{plat-mxc => mach-imx}/devices/platform-mxc_w1.c (95%) rename arch/arm/{plat-mxc => mach-imx}/devices/platform-pata_imx.c (96%) rename arch/arm/{plat-mxc => mach-imx}/devices/platform-sdhci-esdhc-imx.c (98%) rename arch/arm/{plat-mxc => mach-imx}/devices/platform-spi_imx.c (98%) rename arch/arm/{plat-mxc => mach-imx}/epit.c (99%) rename arch/arm/{plat-mxc/include/mach => mach-imx}/eukrea-baseboards.h (100%) rename arch/arm/{plat-mxc/include/mach => mach-imx}/hardware.h (94%) rename arch/arm/{plat-mxc/include/mach => mach-imx}/iim.h (100%) delete mode 100644 arch/arm/mach-imx/include/mach/dma-mx1-mx2.h rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx1.h (99%) rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx21.h (99%) rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx25.h (99%) rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx27.h (99%) rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx2x.h (100%) rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx3.h (100%) rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx35.h (99%) rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx50.h (99%) rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx51.h (99%) rename arch/arm/{plat-mxc => mach-imx}/iomux-v1.c (98%) rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-v1.h (100%) rename arch/arm/{plat-mxc => mach-imx}/iomux-v3.c (97%) rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-v3.h (100%) rename arch/arm/{plat-mxc/include/mach => mach-imx}/iram.h (100%) rename arch/arm/{plat-mxc => mach-imx}/iram_alloc.c (98%) rename arch/arm/{plat-mxc => mach-imx}/irq-common.c (100%) rename arch/arm/{plat-mxc => mach-imx}/irq-common.h (94%) delete mode 100644 arch/arm/mach-imx/mx1-camera-fiq-ksym.c delete mode 100644 arch/arm/mach-imx/mx1-camera-fiq.S rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx1.h (100%) rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx21.h (100%) rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx25.h (100%) rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx27.h (100%) rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx2x.h (100%) rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx31.h (100%) rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx35.h (100%) rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx3x.h (100%) rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx50.h (100%) rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx51.h (100%) rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx53.h (100%) rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx6q.h (100%) rename arch/arm/{plat-mxc/include/mach => mach-imx}/mxc.h (100%) rename arch/arm/{plat-mxc => mach-imx}/ssi-fiq-ksym.c (100%) rename arch/arm/{plat-mxc => mach-imx}/ssi-fiq.S (100%) rename arch/arm/{plat-mxc => mach-imx}/system.c (97%) rename arch/arm/{plat-mxc => mach-imx}/time.c (99%) rename arch/arm/{plat-mxc => mach-imx}/tzic.c (98%) rename arch/arm/{plat-mxc => mach-imx}/ulpi.c (99%) rename arch/arm/{plat-mxc/include/mach => mach-imx}/ulpi.h (100%) delete mode 100644 arch/arm/plat-mxc/Kconfig delete mode 100644 arch/arm/plat-mxc/Makefile delete mode 100644 arch/arm/plat-mxc/devices/platform-mx1-camera.c delete mode 100644 arch/arm/plat-mxc/include/mach/irqs.h delete mode 100644 arch/arm/plat-mxc/include/mach/timex.h delete mode 100644 arch/arm/plat-mxc/include/mach/uncompress.h delete mode 100644 drivers/media/video/mx1_camera.c rename arch/arm/plat-mxc/include/mach/ipu.h => include/linux/dma/ipu-dma.h (97%) create mode 100644 include/linux/platform_data/asoc-mx27vis.h delete mode 100644 include/linux/platform_data/camera-mx1.h -- 1.7.9.5

4 20

[alsa-devel] [PATCH v2 1/7] ASoC: fsl: add PPC_MPC52xx dependency to SND_POWERPC_SOC
by "Eric Millbrandt 20 Sep '12

20 Sep '12

From: Eric Millbrandt <emillbrandt(a)dekaresearch.com> mpc52xx socs need to define SND_POWERPC_SOC to build ASoC drivers. Signed-off-by: Eric Millbrandt <emillbrandt(a)dekaresearch.com> --- Changes since v1: Patch was "powerpc/52xx: define FSL_SOC" Changed from defining FSL_SOC for PPC_MPC52xx to adding PPC_MPC52xx as a dependency of SND_POWERPC_SOC as per Anatolij Gustschin's comment. sound/soc/fsl/Kconfig | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig index d701330..4563b28 100644 --- a/sound/soc/fsl/Kconfig +++ b/sound/soc/fsl/Kconfig @@ -6,7 +6,7 @@ config SND_SOC_FSL_UTILS menuconfig SND_POWERPC_SOC tristate "SoC Audio for Freescale PowerPC CPUs" - depends on FSL_SOC + depends on FSL_SOC || PPC_MPC52xx help Say Y or M if you want to add support for codecs attached to the PowerPC CPUs. -- 1.7.2.5

3 3

[alsa-devel] [RFC PATCH v2 0/5] snd-ice1712: Add Philips PSC724 Ultimate Edge
by Ondrej Zary 19 Sep '12

19 Sep '12

Hello, this is second attempt to add Philips PSC724 Ultimate Edge sound card support to snd-ice1712 driver. Unlike other snd-ice1712 subdrivers, the codec code is splitted into separate modules and thus reusable by other ice1712 subdrivers. Working: all analog outputs (front, rear, center+lfe, headphone) and inputs (front mic, rear mic, line, cd, aux), mixer, headphone jack detection, suspend/resume Currently untested: SPDIF Buggy: switching AGC mode in mixer causes alsamixer to crash - looks like it does not like notifications about control activating/deactivating

2 9

[alsa-devel] [RFC 0/7] mpc5200 ASoC and pcm030 board fixes
by Eric Millbrandt 19 Sep '12

19 Sep '12

This series is a respin of "mpc5200 ASoC fixups" The mpc5200 ASoC and pcm030 board code compiled, but did not run after the multi-codec patches. This series add the missing pieces into the mpc5200 ASoC drivers and updates the pcm030 board to the current api. Eric Millbrandt (7): powerpc/52xx: define FSL_SOC ASoC: fsl: mpc5200 combine psc_dma platform data ASoC: fsl: mpc5200 add missing information to snd_soc_dai_driver ASoC: fsl: cleanup headers in pcm030-audio-fabric ASoC: fsl: convert pcm030-audio-fabric to a platform-driver ASoC: fsl: convert pcm030-audio-fabric to use snd_soc_register_card ASoC: fsl: register the wm9712-codec arch/powerpc/platforms/52xx/Kconfig | 1 + sound/soc/fsl/mpc5200_dma.c | 24 ++------- sound/soc/fsl/mpc5200_dma.h | 3 + sound/soc/fsl/mpc5200_psc_ac97.c | 10 ++++ sound/soc/fsl/mpc5200_psc_i2s.c | 8 +++ sound/soc/fsl/pcm030-audio-fabric.c | 100 +++++++++++++++++++++++++--------- 6 files changed, 99 insertions(+), 47 deletions(-) -- 1.7.2.5

2 13

[alsa-devel] [PATCH 1/5] [v3] ASoC: fsl: use snd_soc_register_card to register the card
by Timur Tabi 19 Sep '12

19 Sep '12

Use snd_soc_register_card() instead of platform_device_alloc("soc-audio") to register the sound card from the machine drivers. The use of platform_device_alloc is deprecated. Although several other drivers still use platform_device_alloc(), the Freescale drivers were not using it to pass driver data. Instead of fixing the driver data usage, it's better to replace the deprecated code. Signed-off-by: Timur Tabi <timur(a)freescale.com> --- sound/soc/fsl/mpc8610_hpcd.c | 32 +++++++------------------------- sound/soc/fsl/p1022_ds.c | 31 ++++++------------------------- 2 files changed, 13 insertions(+), 50 deletions(-) diff --git a/sound/soc/fsl/mpc8610_hpcd.c b/sound/soc/fsl/mpc8610_hpcd.c index 60bcba1..9ff9318 100644 --- a/sound/soc/fsl/mpc8610_hpcd.c +++ b/sound/soc/fsl/mpc8610_hpcd.c @@ -192,7 +192,6 @@ static int mpc8610_hpcd_probe(struct platform_device *pdev) container_of(dev, struct platform_device, dev); struct device_node *np = ssi_pdev->dev.of_node; struct device_node *codec_np = NULL; - struct platform_device *sound_device = NULL; struct mpc8610_hpcd_data *machine_data; int ret = -ENODEV; const char *sprop; @@ -341,34 +340,22 @@ static int mpc8610_hpcd_probe(struct platform_device *pdev) machine_data->card.probe = mpc8610_hpcd_machine_probe; machine_data->card.remove = mpc8610_hpcd_machine_remove; machine_data->card.name = pdev->name; /* The platform driver name */ + machine_data->card.owner = THIS_MODULE; + machine_data->card.dev = &pdev->dev; machine_data->card.num_links = 2; machine_data->card.dai_link = machine_data->dai; - /* Allocate a new audio platform device structure */ - sound_device = platform_device_alloc("soc-audio", -1); - if (!sound_device) { - dev_err(&pdev->dev, "platform device alloc failed\n"); - ret = -ENOMEM; - goto error; - } - - /* Associate the card data with the sound device */ - platform_set_drvdata(sound_device, &machine_data->card); - /* Register with ASoC */ - ret = platform_device_add(sound_device); + ret = snd_soc_register_card(&machine_data->card); if (ret) { - dev_err(&pdev->dev, "platform device add failed\n"); - goto error_sound; + dev_err(&pdev->dev, "could not register card\n"); + goto error; } - dev_set_drvdata(&pdev->dev, sound_device); of_node_put(codec_np); return 0; -error_sound: - platform_device_put(sound_device); error: kfree(machine_data); error_alloc: @@ -383,17 +370,12 @@ error_alloc: */ static int __devexit mpc8610_hpcd_remove(struct platform_device *pdev) { - struct platform_device *sound_device = dev_get_drvdata(&pdev->dev); - struct snd_soc_card *card = platform_get_drvdata(sound_device); + struct snd_soc_card *card = platform_get_drvdata(pdev); struct mpc8610_hpcd_data *machine_data = container_of(card, struct mpc8610_hpcd_data, card); - platform_device_unregister(sound_device); - + snd_soc_unregister_card(card); kfree(machine_data); - sound_device->dev.platform_data = NULL; - - dev_set_drvdata(&pdev->dev, NULL); return 0; } diff --git a/sound/soc/fsl/p1022_ds.c b/sound/soc/fsl/p1022_ds.c index 50adf40..144d496 100644 --- a/sound/soc/fsl/p1022_ds.c +++ b/sound/soc/fsl/p1022_ds.c @@ -202,7 +202,6 @@ static int p1022_ds_probe(struct platform_device *pdev) container_of(dev, struct platform_device, dev); struct device_node *np = ssi_pdev->dev.of_node; struct device_node *codec_np = NULL; - struct platform_device *sound_device = NULL; struct machine_data *mdata; int ret = -ENODEV; const char *sprop; @@ -349,36 +348,23 @@ static int p1022_ds_probe(struct platform_device *pdev) mdata->card.probe = p1022_ds_machine_probe; mdata->card.remove = p1022_ds_machine_remove; mdata->card.name = pdev->name; /* The platform driver name */ + mdata->card.owner = THIS_MODULE; + mdata->card.dev = &pdev->dev; mdata->card.num_links = 2; mdata->card.dai_link = mdata->dai; - /* Allocate a new audio platform device structure */ - sound_device = platform_device_alloc("soc-audio", -1); - if (!sound_device) { - dev_err(&pdev->dev, "platform device alloc failed\n"); - ret = -ENOMEM; - goto error; - } - - /* Associate the card data with the sound device */ - platform_set_drvdata(sound_device, &mdata->card); - /* Register with ASoC */ - ret = platform_device_add(sound_device); + ret = snd_soc_register_card(&mdata->card); if (ret) { - dev_err(&pdev->dev, "platform device add failed\n"); + dev_err(&pdev->dev, "could not register card\n"); goto error; } - dev_set_drvdata(&pdev->dev, sound_device); of_node_put(codec_np); return 0; error: - if (sound_device) - platform_device_put(sound_device); - kfree(mdata); error_put: of_node_put(codec_np); @@ -392,17 +378,12 @@ error_put: */ static int __devexit p1022_ds_remove(struct platform_device *pdev) { - struct platform_device *sound_device = dev_get_drvdata(&pdev->dev); - struct snd_soc_card *card = platform_get_drvdata(sound_device); + struct snd_soc_card *card = platform_get_drvdata(pdev); struct machine_data *mdata = container_of(card, struct machine_data, card); - platform_device_unregister(sound_device); - + snd_soc_unregister_card(card); kfree(mdata); - sound_device->dev.platform_data = NULL; - - dev_set_drvdata(&pdev->dev, NULL); return 0; } -- 1.7.3.4

3 14

Re: [alsa-devel] [PATCH 07/22] ASoC: Ux500: Initialise PCM from MSP probe rather than as a device
by Lee Jones 19 Sep '12

19 Sep '12

Mark, > > > I'm sorry but this patch is breaking the design of ASoC. > > > The ASoC-platform is the DMA-block (in combination with the > > > MSP-block), and there should be a platform-driver for the DMA/PCM. > > > The > > > platform-driver then has a DAI which is the MSP. The ASoC > > > DAI-link-struct should have one driver for each of these, so the > > > dummy-driver for PCM should be there. > > > > Just thinking about this now. I converted it to the current format at > > the request of Mark. If this isn't the correct method I'm not quite > > sure what is. If you want it to be registered as a device, then it > > needs to go into the Device Tree, but Mark doesn't want it in there > > because it doesn't actually represent hardware. I've just taken a closer look at this with a view to finding the most suitable solution. My conclusion is that although the PCM doesn't contain any registers, or represent hardware it should be a device and therefore be present in the Device Tree. These are my findings: PCM devices already represented in DTs: fsl,mpc5200-pcm - written by Grant Likely, the author of Device Tree phytec,pcm030 - written by Grant Likely, the author of Device Tree PCM devices which register as actual devices (should be in DT): samsung - samsung-pcm sh - siu-pcm-audio omap - omap-pcm-audio pxa - pxa-pcm-audio jz4740 - jz4740-pcm-audio kirkwood - kirkwood-pcm-audio ep93xx - ep93xx-pcm-audio ... The later was basically every PCM device bar one I think. The Open Firmware used to stipulate that each device represented in the Device Tree to own registers and therefore be an actual hardware device, but that has since been lifted as it didn't make sense. I propose to represent the PCM in the Device Tree again and have it probe just like all the other PCM devices in sound/soc. If you give me the nod, I'll revert this patch, enable the PCM for DT again and resent the patch-set in full. -- Lee Jones Linaro ST-Ericsson Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog

2 8