Pull sound updates from Takashi Iwai: "This contains pretty many small commits covering fairly large range of files in sound/ directory. Partly because of additional API support and partly because of constantly developed ASoC and ARM stuff. Some highlights: - Introduced the helper function and documentation for exposing the channel map via control API, as discussed in Plumbers; most of PCI drivers are covered, will follow more drivers later - Most of drivers have been replaced with the new PM callbacks (if the bus is supported) - HD-audio controller got the support of runtime PM and the support of D3 clock-stop. Also changing the power_save option in sysfs kicks off immediately to enable / disable the power-save mode. - Another significant code change in HD-audio is the rewrite of firmware loading code. Other than that, most of changes in HD-audio are continued cleanups and standardization for the generic auto parser and bug fixes (HBR, device-specific fixups), in addition to the support of channel-map API. - Addition of ASoC bindings for the compressed API, used by the mid-x86 drivers. - Lots of cleanups and API refreshes for ASoC codec drivers and DaVinci. - Conversion of OMAP to dmaengine. - New machine driver for Wolfson Microelectronics Bells. - New CODEC driver for Wolfson Microelectronics WM0010. - Enhancements to the ux500 and wm2000 drivers - A new driver for DA9055 and the support for regulator bypass mode." Fix up various arm soc header file reorg conflicts. * tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (339 commits) ALSA: hda - Add new codec ALC283 ALC290 support ALSA: hda - avoid unneccesary indices on "Headphone Jack" controls ALSA: hda - fix indices on boost volume on Conexant ALSA: aloop - add locking to timer access ALSA: hda - Fix hang caused by race during suspend. sound: Remove unnecessary semicolon ALSA: hda/realtek - Fix detection of ALC271X codec ALSA: hda - Add inverted internal mic quirk for Lenovo IdeaPad U310 ALSA: hda - make Realtek/Sigmatel/Conexant use the generic unsol event ALSA: hda - make a generic unsol event handler ASoC: codecs: Add DA9055 codec driver ASoC: eukrea-tlv320: Convert it to platform driver ALSA: ASoC: add DT bindings for CS4271 ASoC: wm_hubs: Ensure volume updates are handled during class W startup ASoC: wm5110: Adding missing volume update bits ASoC: wm5110: Add OUT3R support ASoC: wm5110: Add AEC loopback support ASoC: wm5110: Rename EPOUT to HPOUT3 ASoC: arizona: Add more clock rates ASoC: arizona: Add more DSP options for mixer input muxes ...
Showing the changes to include/linux/platform_data (4 of 363 files). Show all
Unified · Split
| @@ -0,0 +1,11 @@ | ||
| 1 | +#ifndef __PLATFORM_DATA_ASOC_MX27VIS_H | |
| 2 | +#define __PLATFORM_DATA_ASOC_MX27VIS_H | |
| 3 | + | |
| 4 | +struct snd_mx27vis_platform_data { | |
| 5 | + int amp_gain0_gpio; | |
| 6 | + int amp_gain1_gpio; | |
| 7 | + int amp_mutel_gpio; | |
| 8 | + int amp_muter_gpio; | |
| 9 | +}; | |
| 10 | + | |
| 11 | +#endif /* __PLATFORM_DATA_ASOC_MX27VIS_H */ | |
| @@ -47,8 +47,6 @@ struct omap_mcbsp_platform_data { · 46 unmodified lines | ||
| 47 | 47 | bool has_wakeup; /* Wakeup capability */ |
| 48 | 48 | bool has_ccr; /* Transceiver has configuration control registers */ |
| 49 | 49 | int (*enable_st_clock)(unsigned int, bool); |
| 50 | − int (*set_clk_src)(struct device *dev, struct clk *clk, const char *src); | |
| 51 | − int (*mux_signal)(struct device *dev, const char *signal, const char *src); | |
| 52 | 50 | }; |
| 53 | 51 | |
| 54 | 52 | /** |
| @@ -0,0 +1,105 @@ | ||
| 1 | +/* | |
| 2 | + * TI DaVinci Audio Serial Port support | |
| 3 | + * | |
| 4 | + * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/ | |
| 5 | + * | |
| 6 | + * This program is free software; you can redistribute it and/or | |
| 7 | + * modify it under the terms of the GNU General Public License as | |
| 8 | + * published by the Free Software Foundation version 2. | |
| 9 | + * | |
| 10 | + * This program is distributed "as is" WITHOUT ANY WARRANTY of any | |
| 11 | + * kind, whether express or implied; without even the implied warranty | |
| 12 | + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 13 | + * GNU General Public License for more details. | |
| 14 | + */ | |
| 15 | + | |
| 16 | +#ifndef __DAVINCI_ASP_H | |
| 17 | +#define __DAVINCI_ASP_H | |
| 18 | + | |
| 19 | +struct snd_platform_data { | |
| 20 | + u32 tx_dma_offset; | |
| 21 | + u32 rx_dma_offset; | |
| 22 | + int asp_chan_q; /* event queue number for ASP channel */ | |
| 23 | + int ram_chan_q; /* event queue number for RAM channel */ | |
| 24 | + unsigned int codec_fmt; | |
| 25 | + /* | |
| 26 | + * Allowing this is more efficient and eliminates left and right swaps | |
| 27 | + * caused by underruns, but will swap the left and right channels | |
| 28 | + * when compared to previous behavior. | |
| 29 | + */ | |
| 30 | + unsigned enable_channel_combine:1; | |
| 31 | + unsigned sram_size_playback; | |
| 32 | + unsigned sram_size_capture; | |
| 33 | + | |
| 34 | + /* | |
| 35 | + * If McBSP peripheral gets the clock from an external pin, | |
| 36 | + * there are three chooses, that are MCBSP_CLKX, MCBSP_CLKR | |
| 37 | + * and MCBSP_CLKS. | |
| 38 | + * Depending on different hardware connections it is possible | |
| 39 | + * to use this setting to change the behaviour of McBSP | |
| 40 | + * driver. | |
| 41 | + */ | |
| 42 | + int clk_input_pin; | |
| 43 | + | |
| 44 | + /* | |
| 45 | + * This flag works when both clock and FS are outputs for the cpu | |
| 46 | + * and makes clock more accurate (FS is not symmetrical and the | |
| 47 | + * clock is very fast. | |
| 48 | + * The clock becoming faster is named | |
| 49 | + * i2s continuous serial clock (I2S_SCK) and it is an externally | |
| 50 | + * visible bit clock. | |
| 51 | + * | |
| 52 | + * first line : WordSelect | |
| 53 | + * second line : ContinuousSerialClock | |
| 54 | + * third line: SerialData | |
| 55 | + * | |
| 56 | + * SYMMETRICAL APPROACH: | |
| 57 | + * _______________________ LEFT | |
| 58 | + * _| RIGHT |______________________| | |
| 59 | + * _ _ _ _ _ _ _ _ | |
| 60 | + * _| |_| |_ x16 _| |_| |_| |_| |_ x16 _| |_| |_ | |
| 61 | + * _ _ _ _ _ _ _ _ | |
| 62 | + * _/ \_/ \_ ... _/ \_/ \_/ \_/ \_ ... _/ \_/ \_ | |
| 63 | + * \_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/ | |
| 64 | + * | |
| 65 | + * ACCURATE CLOCK APPROACH: | |
| 66 | + * ______________ LEFT | |
| 67 | + * _| RIGHT |_______________________________| | |
| 68 | + * _ _ _ _ _ _ _ _ _ | |
| 69 | + * _| |_ x16 _| |_| |_ x16 _| |_| |_| |_| |_| |_| | | |
| 70 | + * _ _ _ _ dummy cycles | |
| 71 | + * _/ \_ ... _/ \_/ \_ ... _/ \__________________ | |
| 72 | + * \_/ \_/ \_/ \_/ | |
| 73 | + * | |
| 74 | + */ | |
| 75 | + bool i2s_accurate_sck; | |
| 76 | + | |
| 77 | + /* McASP specific fields */ | |
| 78 | + int tdm_slots; | |
| 79 | + u8 op_mode; | |
| 80 | + u8 num_serializer; | |
| 81 | + u8 *serial_dir; | |
| 82 | + u8 version; | |
| 83 | + u8 txnumevt; | |
| 84 | + u8 rxnumevt; | |
| 85 | +}; | |
| 86 | + | |
| 87 | +enum { | |
| 88 | + MCASP_VERSION_1 = 0, /* DM646x */ | |
| 89 | + MCASP_VERSION_2, /* DA8xx/OMAPL1x */ | |
| 90 | + MCASP_VERSION_3, /* TI81xx/AM33xx */ | |
| 91 | +}; | |
| 92 | + | |
| 93 | +enum mcbsp_clk_input_pin { | |
| 94 | + MCBSP_CLKR = 0, /* as in DM365 */ | |
| 95 | + MCBSP_CLKS, | |
| 96 | +}; | |
| 97 | + | |
| 98 | +#define INACTIVE_MODE 0 | |
| 99 | +#define TX_MODE 1 | |
| 100 | +#define RX_MODE 2 | |
| 101 | + | |
| 102 | +#define DAVINCI_MCASP_IIS_MODE 0 | |
| 103 | +#define DAVINCI_MCASP_DIT_MODE 1 | |
| 104 | + | |
| 105 | +#endif | |
| @@ -0,0 +1,32 @@ | ||
| 1 | +/** | |
| 2 | + * omap-twl4030.h - ASoC machine driver for TI SoC based boards with twl4030 | |
| 3 | + * codec, header. | |
| 4 | + * | |
| 5 | + * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com | |
| 6 | + * All rights reserved. | |
| 7 | + * | |
| 8 | + * Author: Peter Ujfalusi <peter.ujfalusi@ti.com> | |
| 9 | + * | |
| 10 | + * This program is free software; you can redistribute it and/or | |
| 11 | + * modify it under the terms of the GNU General Public License | |
| 12 | + * version 2 as published by the Free Software Foundation. | |
| 13 | + * | |
| 14 | + * This program is distributed in the hope that it will be useful, but | |
| 15 | + * WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 16 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 17 | + * General Public License for more details. | |
| 18 | + * | |
| 19 | + * You should have received a copy of the GNU General Public License | |
| 20 | + * along with this program; if not, write to the Free Software | |
| 21 | + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA | |
| 22 | + * 02110-1301 USA | |
| 23 | + */ | |
| 24 | + | |
| 25 | +#ifndef _OMAP_TWL4030_H_ | |
| 26 | +#define _OMAP_TWL4030_H_ | |
| 27 | + | |
| 28 | +struct omap_tw4030_pdata { | |
| 29 | + const char *card_name; | |
| 30 | +}; | |
| 31 | + | |
| 32 | +#endif /* _OMAP_TWL4030_H_ */ | |