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

[alsa-devel] snd_seq_parse_address accesses uninitialised data
by Henning Thielemann 25 Sep '12

25 Sep '12

I think I found a bug. The following small program simply parses an address: $ cat ctest/parse-address.c #include <alsa/asoundlib.h> int main () { snd_seq_t *seq; snd_seq_open(&seq, "default", SND_SEQ_OPEN_DUPLEX, 0); snd_seq_addr_t addr = {128,0}; const char *dest_name = "TiMidity"; snd_seq_parse_address(seq, &addr, dest_name); printf("found client %s: %d:%d\n", dest_name, addr.client, addr.port); snd_seq_close(seq); return 0; } $ gcc -Wall -o ctest/parse-address ctest/parse-address.c `pkg-config --libs alsa` $ valgrind ctest/parse-address ==27797== Memcheck, a memory error detector ==27797== Copyright (C) 2002-2011, and GNU GPL'd, by Julian Seward et al. ==27797== Using Valgrind-3.7.0 and LibVEX; rerun with -h for copyright info ==27797== Command: ctest/parse-address ==27797== ==27797== Syscall param ioctl(generic) points to uninitialised byte(s) ==27797== at 0x5209D27: ioctl (syscall-template.S:82) ==27797== by 0x4EC9168: snd_seq_hw_query_next_client (seq_hw.c:367) ==27797== by 0x4ECF3E2: snd_seq_parse_address (seqmid.c:416) ==27797== by 0x40069D: main (in /home/thielema/programming/haskell/alsa-seq/ctest/parse-address) ==27797== Address 0x7fefffd24 is on thread 1's stack ==27797== found client TiMidity: 129:0 ==27797== ==27797== HEAP SUMMARY: ==27797== in use at exit: 75,317 bytes in 1,409 blocks ==27797== total heap usage: 2,054 allocs, 645 frees, 278,456 bytes allocated ==27797== ==27797== LEAK SUMMARY: ==27797== definitely lost: 0 bytes in 0 blocks ==27797== indirectly lost: 0 bytes in 0 blocks ==27797== possibly lost: 42,852 bytes in 1,310 blocks ==27797== still reachable: 32,465 bytes in 99 blocks ==27797== suppressed: 0 bytes in 0 blocks ==27797== Rerun with --leak-check=full to see details of leaked memory ==27797== ==27797== For counts of detected and suppressed errors, rerun with: -v ==27797== Use --track-origins=yes to see where uninitialised values come from ==27797== ERROR SUMMARY: 1 errors from 1 contexts (suppressed: 2 from 2) $ pkg-config --modversion alsa 1.0.25

3 5

[alsa-devel] [PATCH v3 00/15] ASoC: OMAP: Convert to use dmaengine
by Peter Ujfalusi 25 Sep '12

25 Sep '12

Hello, Changes since v2: - As it has been discussed the no_wakeup parameter has been replaced with flags for the dmaengine APIs Changes since v1: - Support for pause/resume for OMAP audio via dmaengine - dmaengine: support for NO_PERIOD_WAKEUP in cyclic mode - OMAP to keep supporting NO_PERIOD_WAKEUP for audio - Other plaforms can also try to enable this mode since we have now generic interface to do so. This series will switch the OMAP audio to use dmaengine. The final patch which does the switch was based on Russell King's earlier patch. The first 10 patch is to prepare the OMAP audio drivers for a smooth change to dmaengine: - sDMA FRAME sync mode is removed and replaced with PACKET mode - dai drivers no longer need to configure sDMA sync mode - dai drivers does not need to specify the DMA word length - with the exception of the omap-hdmi driver which requires 32bit word length regardless of the audio format in use - the McPDM driver used (to my surprise) hackish way of getting the DMA channel and address - via defines from some header files After the conversion OMAP audio support should have the same features as before, no regressions expected. I have tested the series on: - BeagleBoard (audio via McBSP): - aplay/arecord. In element mode and in threshold mode with different period sizes - mplayer -ao alsa: for direct ALSA access - mplayer -ao pulse: via PulseAudio to test NO_PERIOD_WAKEUP feature - OMAP4 Blaze (audio via McPDM and DMIC) - aplay/arecord - mplayer -ao alsa: for direct ALSA access - mplayer -ao pulse: via PulseAudio to test NO_PERIOD_WAKEUP feature The patches has been generated against: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-3.7 Janusz: Can you retest this series on OMAP1 to be sure I have not broken it? Ricardo: Can you test the omap-hmdi if it is still working? Regards, Peter --- Peter Ujfalusi (15): dmaengine: omap: Support for element mode in cyclic DMA dmaengine: omap: Add support for pause/resume in cyclic dma mode dmaengine: Add flags parameter to dmaengine_prep_dma_cyclic() dmaengine: Pass flags via device_prep_dma_cyclic() callback dmaengine: omap-dma: Add support to suppress interrupts in cyclic mode ASoC: omap-mcbsp: Use sDMA packet mode instead of frame mode ASoC: omap-pcm: Select sDMA synchronization based on packet_size ASoC: OMAP: Remove sync_mode from omap_pcm_dma_data struct ASoC: omap-pcm: Prepare to configure the DMA data_type based on stream properties ARM: OMAP4: hwmod_data: Add resource names to McPDM memory ranges ASoC: omap-mcpdm: Use platform_get_resource_* to get resources ASoC: OMAP: mcbsp, mcpdm, dmic: Let omap-pcm to pick the dma_type ASoC: omap-pcm, omap-dmic: Change the use of omap_pcm_dma_data->data_type ASoC: OMAP: mcbsp, mcpdm, dmic, hdmi: Set dma_data at startup time ASoC: omap-pcm: Convert to use dmaengine arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 2 + drivers/dma/at_hdmac.c | 3 +- drivers/dma/ep93xx_dma.c | 4 +- drivers/dma/imx-dma.c | 2 +- drivers/dma/imx-sdma.c | 2 +- drivers/dma/mmp_tdma.c | 2 +- drivers/dma/mxs-dma.c | 2 +- drivers/dma/omap-dma.c | 45 ++++-- drivers/dma/pl330.c | 2 +- drivers/dma/sa11x0-dma.c | 2 +- drivers/dma/sirf-dma.c | 2 +- drivers/dma/ste_dma40.c | 3 +- drivers/dma/tegra20-apb-dma.c | 2 +- include/linux/dmaengine.h | 7 +- sound/soc/omap/Kconfig | 3 +- sound/soc/omap/omap-dmic.c | 9 +- sound/soc/omap/omap-hdmi.c | 17 ++- sound/soc/omap/omap-mcbsp.c | 60 +++----- sound/soc/omap/omap-mcpdm.c | 40 +++-- sound/soc/omap/omap-pcm.c | 236 ++++++++--------------------- sound/soc/omap/omap-pcm.h | 4 +- sound/soc/soc-dmaengine-pcm.c | 6 +- 22 files changed, 186 insertions(+), 269 deletions(-) -- 1.7.12

8 30

[alsa-devel] [PATCH] ASoC: Add device tree binding description for pcm030-audio-fabric
by Eric Millbrandt 25 Sep '12

25 Sep '12

Signed-off-by: Eric Millbrandt <emillbrandt(a)dekaresearch.com> --- .../bindings/sound/pcm030-audio-fabric.txt | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/pcm030-audio-fabric.txt diff --git a/Documentation/devicetree/bindings/sound/pcm030-audio-fabric.txt b/Documentation/devicetree/bindings/sound/pcm030-audio-fabric.txt new file mode 100644 index 0000000..6eacf23 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/pcm030-audio-fabric.txt @@ -0,0 +1,12 @@ +Phytec pcm030 audio + +Required properties: +- compatible : "phytec,pcm030-audio-fabric" +- asoc-platform : The mpc5200 controller's phandle for the ac97 controller + +Example: + +sound { + compatible = "phytec,pcm030-audio-fabric"; + asoc-platform = <&audioplatform>; +}; -- 1.7.2.5

2 1

[alsa-devel] HD Audio with 'mute light'
by Arnout Engelen 24 Sep '12

24 Sep '12

Hi, I've got a laptop with a HD Audio onboard sound card: the CX20590. It seems like this card has a sort of 'hardware mute state': the 'mute button' has a light, and when this light is on, no sound is heard, regardless of whether or not the channel is muted in the ALSA mixer. The hardware mute button switches the 'hardware mute state', and also sends a keyboard event which I can use to also update the ALSA mixer mute. This doesn't, however, work the other way around: I haven't found any way yet to manipulate the 'hardware mute state' from software. Looking with hda_analyzer, I notice this card has a 'Vendor Defined Widget'. Might this be something that could be used to manipulate the hardware mute state? I can use hda-verb but I wouldn't know how to discover which verb to use. Anything else to try? Attached is the codec info. Kind regards, Arnout

3 3

[alsa-devel] Dynamic HDMI PCM creation
by Takashi Iwai 23 Sep '12

23 Sep '12

Hi David, as we discussed at Plumbers, I tried some hack to create/delete HDMI/DP PCM stream per hotplug/unplug. Test patches are found in sound-unstable git tree topic/hdmi-dynamic-pcm branch git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-unstable.git The patches are all small and easy, but it's still in a pretty rough cut. It won't handle some cases, e.g. unplug during suspend, or such, I'm afraid. After all, it's just a test. With these patches, the PCM device appears and disappears properly upon HDMI/DP hotplug/unplug on my system. On mine, it appears as /dev/snd/pcmC0D8 as it's an Intel on-board. So far, so good. Now the problem is that PA gets confused when this happens. It can switch to HDMI/DP, but then the analog output disappears from PA's profile. You cannot switch back to analog output after that, even after you unplug HDMI/DP cable. Or, it might be my PA version... I'll check newer one. But it'd be good if you also check in your side. thanks, Takashi

4 8

[alsa-devel] [PATCH 1/2] ASoC: wm2000: Convert to devm_regmap_init_i2c()
by Mark Brown 23 Sep '12

23 Sep '12

Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm2000.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/sound/soc/codecs/wm2000.c b/sound/soc/codecs/wm2000.c index 89cd6fc..6675477 100644 --- a/sound/soc/codecs/wm2000.c +++ b/sound/soc/codecs/wm2000.c @@ -760,7 +760,7 @@ static int __devinit wm2000_i2c_probe(struct i2c_client *i2c, dev_set_drvdata(&i2c->dev, wm2000); - wm2000->regmap = regmap_init_i2c(i2c, &wm2000_regmap); + wm2000->regmap = devm_regmap_init_i2c(i2c, &wm2000_regmap); if (IS_ERR(wm2000->regmap)) { ret = PTR_ERR(wm2000->regmap); dev_err(&i2c->dev, "Failed to allocate register map: %d\n", @@ -777,7 +777,7 @@ static int __devinit wm2000_i2c_probe(struct i2c_client *i2c, if (id != 0x2000) { dev_err(&i2c->dev, "Device is not a WM2000 - ID %x\n", id); ret = -ENODEV; - goto out_regmap_exit; + goto out; } reg = wm2000_read(i2c, WM2000_REG_REVISON); @@ -796,7 +796,7 @@ static int __devinit wm2000_i2c_probe(struct i2c_client *i2c, ret = request_firmware(&fw, filename, &i2c->dev); if (ret != 0) { dev_err(&i2c->dev, "Failed to acquire ANC data: %d\n", ret); - goto out_regmap_exit; + goto out; } /* Pre-cook the concatenation of the register address onto the image */ @@ -807,7 +807,7 @@ static int __devinit wm2000_i2c_probe(struct i2c_client *i2c, if (wm2000->anc_download == NULL) { dev_err(&i2c->dev, "Out of memory\n"); ret = -ENOMEM; - goto out_regmap_exit; + goto out; } wm2000->anc_download[0] = 0x80; @@ -825,8 +825,6 @@ static int __devinit wm2000_i2c_probe(struct i2c_client *i2c, if (!ret) goto out; -out_regmap_exit: - regmap_exit(wm2000->regmap); out: release_firmware(fw); return ret; @@ -834,10 +832,7 @@ out: static __devexit int wm2000_i2c_remove(struct i2c_client *i2c) { - struct wm2000_priv *wm2000 = dev_get_drvdata(&i2c->dev); - snd_soc_unregister_codec(&i2c->dev); - regmap_exit(wm2000->regmap); return 0; } -- 1.7.10.4

1 1

[alsa-devel] ASoC updates for 3.7
by Mark Brown 22 Sep '12

22 Sep '12

The following changes since commit 5698bd757d55b1bb87edd1a9744ab09c142abfc2: Linux 3.6-rc6 (2012-09-16 14:58:51 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-3.7 for you to fetch changes up to ddfb43f3881edb47aa0083651ad31983cdc42c33: Merge tag 'v3.6-rc6' into for-3.7 (2012-09-22 11:26:27 -0400) ---------------------------------------------------------------- ASoC: Updates for v3.7 Lots and lots of driver specific cleanups and enhancements but the only substantial framework feature this time round is the compressed API binding: - Addition of ASoC bindings for the compressed API, used by the mid-x86 drivers. - Lots of cleanups and API refreshes for CODEC drivers and DaVinci. - Conversion of OMAP to dmaengine. - New machine driver for Wolfson Microelectronics Bells. - New CODEC driver for Wolfson Microelectronics WM0010. ---------------------------------------------------------------- Alexander Shiyan (1): ASoC: Rename ep93xx soc directory to cirrus Bo Shen (1): ASoC: wm8904: remove redundant code Chris Rattray (1): ASoC: wm8994: enable mic and short detect debounce. Dan Carpenter (1): ASoC: wm0010: unlock on error path Daniel Mack (2): ASoC: add DT bindings for cs4270 ASoC: Add reset-gpio DT property to cs4270 driver Dimitris Papastamos (1): ASoC: wm0010: Add initial wm0010 DSP driver Emil Goode (1): ASoC: wm0010: Fix warning, use format %zu for type size_t Eric Millbrandt (6): 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: add PPC_MPC52xx dependency to SND_POWERPC_SOC ASoC: fsl: pcm030-audio-fabric use snd_soc_register_card ASoC: fsl: register the wm9712-codec Fabio Estevam (5): ASoC: imx-ssi: Use devm functions ASoC: mxs-saif: Use devm_clk_get() ASoC: Revert "ASoC: mc13783: Provide codec->control_data" ASoC: Revert "ASoC: ab8500: Inform SoC Core that we have our own I/O arrangements" Revert "ASoC: AC97 doesn't use regmap by default" Fengguang Wu (1): ASoC: wm0010: Add missing IRQF_ONESHOT Gaëtan Carlier (1): ASoC: imx-mc13783: use defines instead of numerical address of register Hebbar, Gururaja (9): ASoC: Davinci: McASP: remove unused header include ASoC: McASP: Convert driver to use Runtime PM API ASoC: tlv320aic3x: Add device tree bindings ASoC: davinci: davinci-pcm does not need to be a plaform_driver ARM: Davinci: Remove references to davinci pcm ASoC/ARM: Davinci: McASP: split asp header into platform and audio specific ASoC: Davinci: McASP: add device tree support for McASP ASoC: Davinci: evm: Fix typo in cpu dai name ASoC: Davinci: McASP: add support new McASP IP Variant Javier Martin (1): ASoC: Revert 'ASoC: imx-ssi: Remove mono support' Jerry Snitselaar (1): ASoC: core: remove unused variable in soc_probe() in linux-next Kuninori Morimoto (3): ASoC: fsi: fixup pm_runtime_disable() timing on fsi_probe() ASoC: fsi: tidyup: remove un-necessary operation from fsi_probe() ASoC: fsi: convert to devm_xxx() Lars-Peter Clausen (4): ASoC: Remove unused 'saved_value' field from snd_soc_dapm_widget struct ASoC: ad193x: Use managed regmap init ASoC: ad1836: Convert to direct regmap usage. ASoC: Avoid recalculating the bitmask for SOC_ENUM controls Lee Jones (1): ASoC: ux500: Strengthen error checking after memory allocation Mark Brown (79): ASoC: wm8994: Implement support for self-oscillation mode in the FLL ASoC: jack: Always update jack state even for noop changes ASoC: wm_hubs: Move CODEC stored in private data into wm_hubs ASoC: wm8994: Ensure we get a notification on startup for jackdet ASoC: wm_hubs: Factor out DC servo readback code ASoC: wm_hubs: Rename calibrate_dc_servo() ASoC: wm8994: Fix some indentation issues ASoC: ab8500: Remove pointless cast ASoC: wm9712: Fix funky indentation ASoC: wm9712: Fix name of Capture Switch ASoC: sta529: Staticise non-exported codec driver struct ASoC: imx-ssi: Say if we fail to register a second AC'97 bus ASoC: core: Remove pointless error on card registration failure ASoC: arizona: Implement OPCLK support ASoC: wm5102: Enable output clocks ASoC: wm5110: Enable output clocks ASoC: bells: Add machine driver for Wolfson Bells boards Merge remote-tracking branch 'asoc/topic/omap' into for-3.7 ASoC: wm5102: Add AEC routing control ASoC: wm8994: Add bytes controls for DRC Merge remote-tracking branch 'asoc/topic/blackfin' into for-3.7 ASoC: wm9712: Provide TLV information for capture boost controls ASoC: wm_hubs: Use explicit casts for converting to signed ASoC: wm_hubs: Add trace showing semantics of the DCS update ASoC: wm_hubs: Allow configuration of MICBIAS power up delay via pdata Merge branch 'asoc-omap' into for-3.7 Merge branch 'asoc-omap' into for-3.7 ASoC: wm8994: Update for new WM1811 variants ASoC: wm0010: Fix passthrough routing ASoC: samsung: Add hookup of WM0010 on Speyside ASoC: wm0010: Enable 44.1kHz support ASoC: wm0010: Add dummy widget for CLKIN ASoC: wm0010: Set idle_bias_off ASoC: wm0010: Don't double free reset GPIO ASoC: wm0010: Tweak diagnostic output ASoC: wm0010: Move resource acquisition to device probe Merge branch 'asoc-omap' into for-3.7 Merge tag 'v3.6-rc4' into asoc-omap Merge branch 'asoc-omap' into for-3.7 ASoC: dapm: Ensure bypass paths are suspended and resumed ASoC: dapm: Add flags to regulator supplies ASoC: wm8983: Convert to devm_kzalloc() ASoC: wm8983: Convert to direct regmap API usage ASoC: wm8523: Convert to devm_kzalloc() ASoC: wm8523: Move regulator acquisition to I2C probe() ASoC: wm8523: Convert to direct regmap API usage ASoC: wm8523: Move device ID verification and reset to I2C probe ASoC: sta32x: Move regulator acquisition to I2C probe ASoC: sta32x: Convert to regmap ASoC: wm8741: Move regulator acquisition to I2C/SPI probe() ASoC: wm8741: Convert to direct regmap API usage ASoC: wm8960: Convert to direct regmap API usage ASoC: cs4270: Conver to data based control init ASoC: cs4270: Move regulator acquisition to I2C probe() ASoC: cs4270: Convert to direct regmap API usage ASoC: wm8900: Convert to devm_kzalloc() ASoC: wm8900: Convert to direct regmap API usage ASoC: wm8900: Fix typo of name to wm9700 ASoC: wm8510: Convert to devm_kzalloc() ASoC: wm8580: Convert to devm_kzalloc() ASoC: wm8711: Convert to devm_kzalloc() ASoC: wm8728: Convert to devm_kzalloc() ASoC: wm8737: Convert to devm_kzalloc() ASoC: wm8990: Convert to devm_kzalloc() ASoC: wm8991: Convert to devm_kzalloc() ASoC: wm8510: Convert to direct regmap API usage ASoC: wm8580: Convert to direct regmap API usage ASoC: wm8580: Move regulator acquisition to I2C probe ASoC: wm8711: Convert to direct regmap API usage ASoC: wm8728: Convert to direct regmap API usage ASoC: wm8737: Move regulator acquisition to device registration ASoC: wm8737: Convert to direct regmap API usage ASoC: arizona: Clarify logging for FLL lock status interrupt ASoC: core: Mark regmap CODEC register maps as dirty when suspending ASoC: wm8776: Convert to direct regmap API usage ASoC: wm8960: Support shared LRCLK ASoC: wm8961: Convert to direct regmap API usage ASoC: wm8961: Move device identification and reset to I2C probe Merge tag 'v3.6-rc6' into for-3.7 Namarta Kohli (1): ASoC: add compress stream support Peter Senna Tschudin (1): ASoC: core: Remove useless kfree Peter Ujfalusi (54): ASoC: omap-mcpdm: Convert to use devm_* ASoC: omap-abe-twl6040: Add device tree support ASoC: core: Set dapm->idle_bias_off for DAIs not mapped with a codec ASoC: omap-twl4030: Simple machine driver for TI SoC with twl4030 codec ARM: OMAP: twl-common: Add helper function to register the omap-twl4030 audio driver ARM: OMAP3: Switch to use the unified audio driver (omap-twl4030) for selected boards ASoC: Remove obsolete OMAP3 machine drivers ARM/ASoC: omap-mcbsp: Move OMAP2+ clock parenting code to ASoC driver ARM: OMAP: mcbsp: Enable FIFO use for OMAP2430 ARM: OMAP: board-am3517evm: Configure McBSP1 CLKR/FSR signal source ASoC: am3517evm: Do not configure McBSP1 CLKR/FSR signal muxing ARM/ASoC: omap-mcbsp: Remove CLKR/FSR mux configuration code ASoC: omap-mcbsp: Remove unused defines ASoC: omap-mcbsp: Remove cpu_is_omap* checks from the code ARM: OMAP2+: McBSP: Do not create legacy devices when booting with DT data ASoC: omap-mcbsp: Add device tree bindings ASoC: omap-mcbsp: Device tree binding documentation update ARM: OMAP2+: twl-common: Fix compile time error when omap-twl4030 audio is not enabled ASoC: omap-mcbsp: Check mcbsp->id instead of cpu_dai->id when adding ST controls ASoC: omap-mcbsp: Only print warning if the st_data is missing for the port ASoC: omap-mcbsp: Use macro to create the McBSP2/3 ST controls ASoC: omap-mcbsp: Single macro for st channel volume set/get ASoC: omap-mcbsp: Fix compilation error due to leftover code ASoC: am3517evm: Remove unused cpu_dai from hw_params ASoC: twl4030: Convert to use DAI DAPM widgets ASoC: twl6040: Convert to use DAI DAPM widgets dmaengine: omap: Support for element mode in cyclic DMA dmaengine: omap: Add support for pause/resume in cyclic dma mode dmaengine: Pass flags via device_prep_dma_cyclic() callback dmaengine: omap-dma: Add support to suppress interrupts in cyclic mode ASoC: omap-mcbsp: Use sDMA packet mode instead of frame mode ASoC: omap-pcm: Select sDMA synchronization based on packet_size ASoC: OMAP: Remove sync_mode from omap_pcm_dma_data struct ASoC: omap-pcm: Prepare to configure the DMA data_type based on stream properties ARM: OMAP4: hwmod_data: Add resource names to McPDM memory ranges ASoC: omap-mcpdm: Use platform_get_resource_* to get resources ASoC: OMAP: mcbsp, mcpdm, dmic: Let omap-pcm to pick the dma_type ASoC: omap-pcm, omap-dmic: Change the use of omap_pcm_dma_data->data_type ASoC: OMAP: mcbsp, mcpdm, dmic, hdmi: Set dma_data at startup time ASoC: omap-pcm: Convert to use dmaengine mfd: twl4030-audio: Clean up MODULE_* and platform_driver part mfd: twl4030-audio: Convert to use devm_kzalloc mfd: twl4030-audio: Rearange and clean-up the probe function mfd: twl-core: Add API to query the HFCLK rate mfd: twl4030-audio: Get audio MCLK via twl-core API instead of pdata dt: Add empty of_find_node_by_name() function mfd: twl4030-audio: Add DT support Input: twl4030-vibra: Support for DT booted kernel ASoC: twl4030: Move hs_extmute GPIO handling to driver ARM: OMAP/ASoC: Zoom2: Let the codec to handle the hs_extmute GPIO ASoC/mfd: twl4030: Remove set_hs_extmute callback from platform data ASoC: twl4030: Convert to use devm_kzalloc ASoC: twl4030: Add pointer to pdata within the private data ASoC: twl4030: Support for DT booted kernel Richard Zhao (3): ASoC: imx-pcm-dma: check kzalloc return value in function snd_imx_open ASoC: imx-pcm-dma: open function failed when snd_dmaengine_pcm_open fail ASoC: imx-audmux: remove null check of audmux_base in audmux_read_file Sachin Kamat (33): ASoC: isabelle: Remove version.h header file inclusion ASoC: tlv320aic32x4: Use module_i2c_driver ASoC: max9877: Use module_i2c_driver ASoC: wm9090: Use module_i2c_driver ASoC: wm8991: Use module_i2c_driver ASoC: cs4270: Use module_i2c_driver ASoC: tlv320aic3x: Use module_i2c_driver ASoC: sta32x: Use module_i2c_driver ASoC: tlv320dac33: Use module_i2c_driver ASoC: adau1701: Use module_i2c_driver ASoC: max9850: Use module_i2c_driver ASoC: wm8971: Use module_i2c_driver ASoC: ak4671: Use module_i2c_driver ASoC: lm4857: Use module_i2c_driver ASoC: wm8978: Use module_i2c_driver ASoC: max98088: Use module_i2c_driver ASoC: wm8955: Use module_i2c_driver ASoC: wm2200: Use module_i2c_driver ASoC: wm2000: Use module_i2c_driver ASoC: wm8940: Use module_i2c_driver ASoC: wm8961: Use module_i2c_driver ASoC: wm8903: Use module_i2c_driver ASoC: adau1373: Use module_i2c_driver ASoC: wm8960: Use module_i2c_driver ASoC: wm8974: Use module_i2c_driver ASoC: max98095: Use module_i2c_driver ASoC: cs42l51: Use module_i2c_driver ASoC: tpa6130a2: Use module_i2c_driver ASoC: cs42l52: Remove duplicate inclusion of slab.h header file ASoC: soc-compress: Remove unused variable ASoC: tlv320aic26: Use module_spi_driver ASoC: wm8770: Use module_spi_driver ASoC: ad1836: Use module_spi_driver Sangsu Park (1): ASoC: SAMSUNG: Change Kconfig to support all SAMSUNG ASoC Scott Jiang (2): ASoC: bf5xx-ad1836: convert to use snd_soc_register_card blackfin: add platform device for ad1836 machine driver Shawn Guo (1): ASoC: mx27vis: retrieve gpio numbers from platform_data Stephen Warren (1): ASoC: tegra: move platform data header Timur Tabi (4): ASoC: fsl: use snd_soc_register_card to register the card ASoC: fsl: remove unnecessary call to dma_unmap_single ASoC: wm8960: add support for big-endian audio samples ASoC: wm8960: remove 'dres' field from platform data structure Vinod Koul (3): ASoC: add definations for compressed operations ASoC: mid-x86 - add support for compressed streams ASoC: compress - fix code alignment .../devicetree/bindings/mfd/twl4030-audio.txt | 46 + Documentation/devicetree/bindings/sound/cs4270.txt | 21 + .../bindings/sound/davinci-mcasp-audio.txt | 45 + .../devicetree/bindings/sound/omap-abe-twl6040.txt | 91 ++ .../devicetree/bindings/sound/omap-mcbsp.txt | 37 + .../devicetree/bindings/sound/omap-twl4030.txt | 17 + .../devicetree/bindings/sound/tlv320aic3x.txt | 20 + arch/arm/mach-davinci/asp.h | 49 + arch/arm/mach-davinci/davinci.h | 3 +- arch/arm/mach-davinci/devices-da8xx.c | 8 +- arch/arm/mach-davinci/devices.c | 11 - arch/arm/mach-davinci/dm355.c | 2 +- arch/arm/mach-davinci/dm365.c | 2 +- arch/arm/mach-davinci/dm644x.c | 2 +- arch/arm/mach-davinci/dm646x.c | 2 +- arch/arm/mach-davinci/include/mach/da8xx.h | 2 +- arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 42 +- arch/arm/mach-omap2/board-am3517evm.c | 13 + arch/arm/mach-omap2/board-cm-t35.c | 1 + arch/arm/mach-omap2/board-devkit8000.c | 1 + arch/arm/mach-omap2/board-igep0020.c | 1 + arch/arm/mach-omap2/board-omap3beagle.c | 1 + arch/arm/mach-omap2/board-omap3evm.c | 1 + arch/arm/mach-omap2/board-overo.c | 1 + arch/arm/mach-omap2/board-zoom-peripherals.c | 9 +- arch/arm/mach-omap2/include/mach/board-zoom.h | 2 - arch/arm/mach-omap2/mcbsp.c | 126 +-- arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 2 + arch/arm/mach-omap2/twl-common.c | 27 + arch/arm/mach-omap2/twl-common.h | 2 + arch/arm/plat-omap/include/plat/mcbsp.h | 2 - arch/blackfin/mach-bf527/boards/ezkit.c | 20 + arch/blackfin/mach-bf533/boards/stamp.c | 20 + arch/blackfin/mach-bf537/boards/stamp.c | 20 + arch/blackfin/mach-bf561/boards/ezkit.c | 20 + arch/blackfin/mach-bf609/boards/ezkit.c | 19 + drivers/dma/at_hdmac.c | 3 +- drivers/dma/ep93xx_dma.c | 4 +- drivers/dma/imx-dma.c | 2 +- drivers/dma/imx-sdma.c | 2 +- drivers/dma/mmp_tdma.c | 2 +- drivers/dma/mxs-dma.c | 2 +- drivers/dma/omap-dma.c | 45 +- drivers/dma/pl330.c | 2 +- drivers/dma/sa11x0-dma.c | 2 +- drivers/dma/sirf-dma.c | 2 +- drivers/dma/ste_dma40.c | 3 +- drivers/dma/tegra20-apb-dma.c | 2 +- drivers/input/misc/twl4030-vibra.c | 18 +- drivers/mfd/twl-core.c | 32 + drivers/mfd/twl4030-audio.c | 105 ++- include/linux/dmaengine.h | 4 +- include/linux/i2c/twl.h | 3 +- include/linux/mfd/wm8994/pdata.h | 4 + include/linux/of.h | 6 + include/linux/platform_data/asoc-mx27vis.h | 11 + .../linux/platform_data/davinci_asp.h | 74 +- include/linux/platform_data/omap-twl4030.h | 32 + include/sound/compress_driver.h | 1 + include/sound/soc-dai.h | 3 + include/sound/soc-dapm.h | 7 +- include/sound/soc.h | 20 +- .../sound/tegra_wm8903.h | 7 +- include/sound/wm0010.h | 27 + include/sound/wm8960.h | 2 +- include/sound/wm8993.h | 4 + sound/soc/Kconfig | 3 +- sound/soc/Makefile | 4 +- sound/soc/blackfin/bf5xx-ad1836.c | 73 +- sound/soc/{ep93xx => cirrus}/Kconfig | 0 sound/soc/{ep93xx => cirrus}/Makefile | 0 sound/soc/{ep93xx => cirrus}/edb93xx.c | 0 sound/soc/{ep93xx => cirrus}/ep93xx-ac97.c | 0 sound/soc/{ep93xx => cirrus}/ep93xx-i2s.c | 0 sound/soc/{ep93xx => cirrus}/ep93xx-pcm.c | 0 sound/soc/{ep93xx => cirrus}/ep93xx-pcm.h | 0 sound/soc/{ep93xx => cirrus}/simone.c | 0 sound/soc/{ep93xx => cirrus}/snappercl15.c | 0 sound/soc/codecs/Kconfig | 4 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/ab8500-codec.c | 13 +- sound/soc/codecs/ad1836.c | 88 +- sound/soc/codecs/ad193x.c | 50 +- sound/soc/codecs/ad1980.c | 1 - sound/soc/codecs/adau1373.c | 12 +- sound/soc/codecs/adau1701.c | 12 +- sound/soc/codecs/ak4671.c | 12 +- sound/soc/codecs/arizona.c | 68 +- sound/soc/codecs/arizona.h | 6 +- sound/soc/codecs/cs4270.c | 152 ++-- sound/soc/codecs/cs42l51.c | 19 +- sound/soc/codecs/cs42l52.c | 1 - sound/soc/codecs/isabelle.c | 1 - sound/soc/codecs/lm4857.c | 12 +- sound/soc/codecs/max98088.c | 18 +- sound/soc/codecs/max98095.c | 18 +- sound/soc/codecs/max9850.c | 12 +- sound/soc/codecs/max9877.c | 12 +- sound/soc/codecs/mc13783.c | 60 +- sound/soc/codecs/sta32x.c | 151 ++-- sound/soc/codecs/sta529.c | 2 +- sound/soc/codecs/stac9766.c | 1 - sound/soc/codecs/tlv320aic26.c | 12 +- sound/soc/codecs/tlv320aic32x4.c | 19 +- sound/soc/codecs/tlv320aic3x.c | 49 +- sound/soc/codecs/tlv320dac33.c | 19 +- sound/soc/codecs/tpa6130a2.c | 13 +- sound/soc/codecs/twl4030.c | 157 +++- sound/soc/codecs/twl6040.c | 43 +- sound/soc/codecs/wm0010.c | 944 ++++++++++++++++++++ sound/soc/codecs/wm2000.c | 12 +- sound/soc/codecs/wm2200.c | 16 +- sound/soc/codecs/wm5100.c | 6 +- sound/soc/codecs/wm5102.c | 52 +- sound/soc/codecs/wm5110.c | 18 +- sound/soc/codecs/wm8510.c | 129 ++- sound/soc/codecs/wm8523.c | 184 ++-- sound/soc/codecs/wm8580.c | 149 ++- sound/soc/codecs/wm8711.c | 65 +- sound/soc/codecs/wm8728.c | 60 +- sound/soc/codecs/wm8737.c | 132 +-- sound/soc/codecs/wm8741.c | 115 ++- sound/soc/codecs/wm8770.c | 19 +- sound/soc/codecs/wm8776.c | 75 +- sound/soc/codecs/wm8900.c | 166 ++-- sound/soc/codecs/wm8903.c | 18 +- sound/soc/codecs/wm8904.c | 2 - sound/soc/codecs/wm8940.c | 18 +- sound/soc/codecs/wm8955.c | 18 +- sound/soc/codecs/wm8958-dsp2.c | 28 +- sound/soc/codecs/wm8960.c | 150 +++- sound/soc/codecs/wm8961.c | 492 ++++------ sound/soc/codecs/wm8971.c | 18 +- sound/soc/codecs/wm8974.c | 18 +- sound/soc/codecs/wm8978.c | 18 +- sound/soc/codecs/wm8983.c | 162 ++-- sound/soc/codecs/wm8990.c | 8 +- sound/soc/codecs/wm8991.c | 25 +- sound/soc/codecs/wm8993.c | 2 + sound/soc/codecs/wm8994.c | 132 ++- sound/soc/codecs/wm8994.h | 12 +- sound/soc/codecs/wm8996.c | 2 +- sound/soc/codecs/wm9090.c | 12 +- sound/soc/codecs/wm9712.c | 12 +- sound/soc/codecs/wm9713.c | 1 - sound/soc/codecs/wm_hubs.c | 114 ++- sound/soc/codecs/wm_hubs.h | 6 + sound/soc/davinci/davinci-evm.c | 19 +- sound/soc/davinci/davinci-i2s.c | 13 +- sound/soc/davinci/davinci-mcasp.c | 260 +++++- sound/soc/davinci/davinci-mcasp.h | 6 +- sound/soc/davinci/davinci-pcm.c | 24 +- sound/soc/davinci/davinci-pcm.h | 6 +- sound/soc/davinci/davinci-sffsdr.c | 2 +- sound/soc/davinci/davinci-vcif.c | 8 + sound/soc/fsl/Kconfig | 2 +- sound/soc/fsl/fsl_dma.c | 6 - sound/soc/fsl/imx-audmux.c | 3 - sound/soc/fsl/imx-pcm-dma.c | 5 +- sound/soc/fsl/imx-ssi.c | 30 +- 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/mpc8610_hpcd.c | 32 +- sound/soc/fsl/mx27vis-aic32x4.c | 42 +- sound/soc/fsl/p1022_ds.c | 31 +- sound/soc/fsl/pcm030-audio-fabric.c | 100 ++- sound/soc/mid-x86/mfld_machine.c | 9 + sound/soc/mid-x86/sst_dsp.h | 134 +++ sound/soc/mid-x86/sst_platform.c | 204 ++++- sound/soc/mid-x86/sst_platform.h | 26 +- sound/soc/mxs/mxs-saif.c | 20 +- sound/soc/omap/Kconfig | 51 +- sound/soc/omap/Makefile | 10 +- sound/soc/omap/am3517evm.c | 21 +- sound/soc/omap/igep0020.c | 120 --- sound/soc/omap/mcbsp.c | 54 +- sound/soc/omap/mcbsp.h | 3 - sound/soc/omap/omap-abe-twl6040.c | 145 ++- sound/soc/omap/omap-dmic.c | 9 +- sound/soc/omap/omap-hdmi.c | 17 +- sound/soc/omap/omap-mcbsp.c | 230 ++--- sound/soc/omap/omap-mcbsp.h | 20 - sound/soc/omap/omap-mcpdm.c | 92 +- sound/soc/omap/omap-pcm.c | 236 ++--- sound/soc/omap/omap-pcm.h | 4 +- sound/soc/omap/omap-twl4030.c | 188 ++++ sound/soc/omap/omap3beagle.c | 150 ---- sound/soc/omap/omap3evm.c | 118 --- sound/soc/omap/overo.c | 122 --- sound/soc/omap/zoom2.c | 4 - sound/soc/samsung/Kconfig | 11 +- sound/soc/samsung/Makefile | 2 + sound/soc/samsung/bells.c | 346 +++++++ sound/soc/samsung/speyside.c | 42 +- sound/soc/sh/fsi.c | 28 +- sound/soc/soc-compress.c | 294 ++++++ sound/soc/soc-core.c | 100 ++- sound/soc/soc-dapm.c | 44 +- sound/soc/soc-jack.c | 6 - sound/soc/tegra/tegra_wm8903.c | 3 +- sound/soc/ux500/ux500_msp_dai.c | 3 + sound/soc/ux500/ux500_msp_i2s.c | 2 + 204 files changed, 5905 insertions(+), 3245 deletions(-) create mode 100644 Documentation/devicetree/bindings/mfd/twl4030-audio.txt create mode 100644 Documentation/devicetree/bindings/sound/cs4270.txt create mode 100644 Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt create mode 100644 Documentation/devicetree/bindings/sound/omap-abe-twl6040.txt create mode 100644 Documentation/devicetree/bindings/sound/omap-mcbsp.txt create mode 100644 Documentation/devicetree/bindings/sound/omap-twl4030.txt create mode 100644 Documentation/devicetree/bindings/sound/tlv320aic3x.txt create mode 100644 arch/arm/mach-davinci/asp.h create mode 100644 include/linux/platform_data/asoc-mx27vis.h rename arch/arm/mach-davinci/include/mach/asp.h => include/linux/platform_data/davinci_asp.h (56%) create mode 100644 include/linux/platform_data/omap-twl4030.h rename arch/arm/mach-tegra/include/mach/tegra_wm8903_pdata.h => include/sound/tegra_wm8903.h (89%) create mode 100644 include/sound/wm0010.h rename sound/soc/{ep93xx => cirrus}/Kconfig (100%) rename sound/soc/{ep93xx => cirrus}/Makefile (100%) rename sound/soc/{ep93xx => cirrus}/edb93xx.c (100%) rename sound/soc/{ep93xx => cirrus}/ep93xx-ac97.c (100%) rename sound/soc/{ep93xx => cirrus}/ep93xx-i2s.c (100%) rename sound/soc/{ep93xx => cirrus}/ep93xx-pcm.c (100%) rename sound/soc/{ep93xx => cirrus}/ep93xx-pcm.h (100%) rename sound/soc/{ep93xx => cirrus}/simone.c (100%) rename sound/soc/{ep93xx => cirrus}/snappercl15.c (100%) create mode 100644 sound/soc/codecs/wm0010.c create mode 100644 sound/soc/mid-x86/sst_dsp.h delete mode 100644 sound/soc/omap/igep0020.c create mode 100644 sound/soc/omap/omap-twl4030.c delete mode 100644 sound/soc/omap/omap3beagle.c delete mode 100644 sound/soc/omap/omap3evm.c delete mode 100644 sound/soc/omap/overo.c create mode 100644 sound/soc/samsung/bells.c create mode 100644 sound/soc/soc-compress.c

2 1

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

22 Sep '12

Here is the second post, which should have addressed the comments that reviewers put on v1. It's available on branch below. git://git.linaro.org/people/shawnguo/linux-2.6.git imx/multi-platform-v2 And it's based on the following branches. calxeda/multi-plat arm-soc/multiplatform/platform-data arm-soc/multiplatform/smp_ops arm-soc/imx/cleanup arm-soc/imx/dt sound/for-3.7 Subsystem maintainers, I plan to send the whole series for 3.7 via arm-soc tree. Please let me know if you have problem with that. Thanks. Shawn --- Shawn Guo (34): ARM: imx: include board headers in the same folder 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 cpu_is_xxx by using platform_device_id mtd: mxc_nand: remove cpu_is_xxx by using platform_device_id rtc: mxc_rtc: remove cpu_is_xxx by using platform_device_id dma: imx-dma: use devm_kzalloc and devm_request_irq dma: imx-dma: retrieve MEM and IRQ from resources dma: imx-dma: remove cpu_is_xxx by using platform_device_id 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 cpu_is_xxx by using platform_device_id mmc: mxcmmc: remove cpu_is_xxx by using platform_device_id video: imxfb: remove cpu_is_xxx by using platform_device_id 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: call mxc_device_init() in soc specific function ARM: imx: enable multi-platform build .../devicetree/bindings/i2c/fsl-imx-i2c.txt | 4 +- MAINTAINERS | 1 - 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 +- arch/arm/configs/imx_v4_v5_defconfig | 5 +- arch/arm/configs/imx_v6_v7_defconfig | 3 +- .../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 | 89 +- 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 | 18 +- arch/arm/mach-imx/clk-imx21.c | 18 +- arch/arm/mach-imx/clk-imx25.c | 26 +- arch/arm/mach-imx/clk-imx27.c | 40 +- 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 | 1 + 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 | 4 +- .../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 | 32 +- .../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 | 6 +- 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 | 14 +- arch/arm/mach-imx/mm-imx25.c | 12 +- arch/arm/mach-imx/mm-imx27.c | 14 +- arch/arm/mach-imx/mm-imx3.c | 13 +- arch/arm/mach-imx/mm-imx5.c | 12 +- 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 | 246 +++--- 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-imx-ssi.h | 2 + include/linux/platform_data/camera-mx1.h | 35 - include/linux/platform_data/dma-imx.h | 4 +- sound/soc/fsl/imx-pcm-fiq.c | 1 - sound/soc/fsl/imx-ssi.c | 1 - 222 files changed, 1115 insertions(+), 2161 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 (99%) 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 (92%) 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 (76%) 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%) delete mode 100644 include/linux/platform_data/camera-mx1.h -- 1.7.9.5

4 17

[alsa-devel] [PATCH] ASoC: eukrea-tlv320: Convert it to platform driver
by Fabio Estevam 22 Sep '12

22 Sep '12

From: Fabio Estevam <fabio.estevam(a)freescale.com> Convert eukrea-tlv320 to platform driver. Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- arch/arm/mach-imx/eukrea_mbimx27-baseboard.c | 1 + arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c | 1 + arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c | 1 + arch/arm/mach-imx/eukrea_mbimxsd51-baseboard.c | 1 + sound/soc/fsl/eukrea-tlv320.c | 37 ++++++++++++------------ 5 files changed, 23 insertions(+), 18 deletions(-) diff --git a/arch/arm/mach-imx/eukrea_mbimx27-baseboard.c b/arch/arm/mach-imx/eukrea_mbimx27-baseboard.c index fd3177f..98aef57 100644 --- a/arch/arm/mach-imx/eukrea_mbimx27-baseboard.c +++ b/arch/arm/mach-imx/eukrea_mbimx27-baseboard.c @@ -348,4 +348,5 @@ void __init eukrea_mbimx27_baseboard_init(void) imx27_add_imx_keypad(&eukrea_mbimx27_keymap_data); gpio_led_register_device(-1, &eukrea_mbimx27_gpio_led_info); + imx_add_platform_device("eukrea_tlv320", 0, NULL, 0, NULL, 0); } diff --git a/arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c b/arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c index dfd2da8..0b84666 100644 --- a/arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c +++ b/arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c @@ -306,4 +306,5 @@ void __init eukrea_mbimxsd25_baseboard_init(void) platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices)); gpio_led_register_device(-1, &eukrea_mbimxsd_led_info); imx_add_gpio_keys(&eukrea_mbimxsd_button_data); + imx_add_platform_device("eukrea_tlv320", 0, NULL, 0, NULL, 0); } diff --git a/arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c b/arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c index 6e9dd12..c6532a0 100644 --- a/arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c +++ b/arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c @@ -315,4 +315,5 @@ void __init eukrea_mbimxsd35_baseboard_init(void) platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices)); gpio_led_register_device(-1, &eukrea_mbimxsd_led_info); imx_add_gpio_keys(&eukrea_mbimxsd_button_data); + imx_add_platform_device("eukrea_tlv320", 0, NULL, 0, NULL, 0); } diff --git a/arch/arm/mach-imx/eukrea_mbimxsd51-baseboard.c b/arch/arm/mach-imx/eukrea_mbimxsd51-baseboard.c index 96a24b7..8b0de30 100644 --- a/arch/arm/mach-imx/eukrea_mbimxsd51-baseboard.c +++ b/arch/arm/mach-imx/eukrea_mbimxsd51-baseboard.c @@ -228,4 +228,5 @@ void __init eukrea_mbimxsd51_baseboard_init(void) gpio_led_register_device(-1, &eukrea_mbimxsd51_led_info); imx_add_gpio_keys(&eukrea_mbimxsd51_button_data); + imx_add_platform_device("eukrea_tlv320", 0, NULL, 0, NULL, 0); } diff --git a/sound/soc/fsl/eukrea-tlv320.c b/sound/soc/fsl/eukrea-tlv320.c index efb9ede..267d5b4 100644 --- a/sound/soc/fsl/eukrea-tlv320.c +++ b/sound/soc/fsl/eukrea-tlv320.c @@ -93,9 +93,7 @@ static struct snd_soc_card eukrea_tlv320 = { .num_links = 1, }; -static struct platform_device *eukrea_tlv320_snd_device; - -static int __init eukrea_tlv320_init(void) +static int __devinit eukrea_tlv320_probe(struct platform_device *pdev) { int ret; int int_port = 0, ext_port; @@ -136,29 +134,32 @@ static int __init eukrea_tlv320_init(void) return 0; } - eukrea_tlv320_snd_device = platform_device_alloc("soc-audio", -1); - if (!eukrea_tlv320_snd_device) - return -ENOMEM; - - platform_set_drvdata(eukrea_tlv320_snd_device, &eukrea_tlv320); - ret = platform_device_add(eukrea_tlv320_snd_device); - - if (ret) { - printk(KERN_ERR "ASoC: Platform device allocation failed\n"); - platform_device_put(eukrea_tlv320_snd_device); - } + eukrea_tlv320.dev = &pdev->dev; + ret = snd_soc_register_card(&eukrea_tlv320); + if (ret) + dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n", ret); return ret; } -static void __exit eukrea_tlv320_exit(void) +static int __devexit eukrea_tlv320_remove(struct platform_device *pdev) { - platform_device_unregister(eukrea_tlv320_snd_device); + snd_soc_unregister_card(&eukrea_tlv320); + + return 0; } -module_init(eukrea_tlv320_init); -module_exit(eukrea_tlv320_exit); +static struct platform_driver eukrea_tlv320_driver = { + .driver = { + .name = "eukrea_tlv320", + .owner = THIS_MODULE, + }, + .probe = eukrea_tlv320_probe, + .remove = __devexit_p(eukrea_tlv320_remove),}; + +module_platform_driver(eukrea_tlv320_driver); MODULE_AUTHOR("Eric Bénard <eric(a)eukrea.com>"); MODULE_DESCRIPTION("CPUIMX ALSA SoC driver"); MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:eukrea_tlv320"); -- 1.7.9.5

2 1

[alsa-devel] [PATCH v4 00/14] MFD/ASoC/Input: twl4030-audio submodule DT support
by Peter Ujfalusi 22 Sep '12

22 Sep '12

Hello, Generated on top of: git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git topic/omap Changes since v3: - Added Acked-by from Tony and Dmitry - Removed #ifdef around of_find_node_by_name() in the drivers Changed since v2: - Added commit message to patch 2 (as Tero requested it) - Fixed patch 6 (dt: Add empty...) since the previous patch caused x86_64 build to fail due to missing struct before device_node. Changes since v1: - Get the MCLK frequencey from twl-core driver (via new API) - hs_extmute_disable_level parameter has been removed - empty of_find_node_by_name() in of.h for !CONFIG_OF builds Mark: the extmute GPIO handling (when it is used) remained in the codec driver for now. I can think more on how to add support for this type of mute control. If you can point me to other codec needing this it would help on designing something which is common enough for other users. As for now I have a separate series to add GPIO controlled output amps (hp/spk). I will send that to review soon. Currently this piece of code does not work when booted with device tree since I have done it on n900 which has the GPIO numbers as defines. I need to revisit the aproach on how to do it in a dynamic way. Introl mail from v1: The following series adds DT support for the twl4030 audio submodule which provides audio codec and vibra functionality. The MFD core driver is probed via DT, it will create the needed child devices based on the provided information in the DT blob. Child drivers (vibra, ASoC codec) will parse the core's node if needed to get the needed parameters for their configuration. In the ASoC codec driver the hs_extmute callback (which was used to toggle a GPIO line) has been removed. The codec driver will receive the GPIO number (if it is needed on the platform). If the series is OK (and no objections from the maintainers), it would be good if this can go via audio. Changed files are well contained within the twl4030-audio stack so I do not expect merge issues later. The series has been tested on BeagleBoard (with the McBSP DT series, and with the upcoming DT audio support for BeagleBoard). Regards, Peter --- Peter Ujfalusi (14): MFD: twl4030-audio: Clean up MODULE_* and platform_driver part MFD: twl4030-audio: Convert to use devm_kzalloc MFD: twl4030-audio: Rearange and clean-up the probe function MFD: twl-core: Add API to query the HFCLK rate MFD: twl4030-audio: Get audio MCLK via twl-core API instead of pdata dt: Add empty of_find_node_by_name() function MFD: twl4030-audio: Add DT support Input: twl4030-vibra: Support for DT booted kernel ASoC: twl4030: Move hs_extmute GPIO handling to driver ARM: OMAP/ASoC: Zoom2: Let the codec to handle the hs_extmute GPIO ASoC/MFD: twl4030: Remove set_hs_extmute callback from platform data ASoC: twl4030: Convert to use devm_kzalloc ASoC: twl4030: Add pointer to pdata within the private data ASoC: twl4030: Support for DT booted kernel .../devicetree/bindings/mfd/twl4030-audio.txt | 46 +++++++++ arch/arm/mach-omap2/board-zoom-peripherals.c | 9 +- arch/arm/mach-omap2/include/mach/board-zoom.h | 2 - drivers/input/misc/twl4030-vibra.c | 18 +++- drivers/mfd/twl-core.c | 32 +++++++ drivers/mfd/twl4030-audio.c | 105 ++++++++++++++------- include/linux/i2c/twl.h | 3 +- include/linux/of.h | 6 ++ sound/soc/codecs/twl4030.c | 101 ++++++++++++++++---- sound/soc/omap/zoom2.c | 4 - 10 files changed, 255 insertions(+), 71 deletions(-) create mode 100644 Documentation/devicetree/bindings/mfd/twl4030-audio.txt -- 1.7.12

2 15