openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
336,243 Commits 18 Branches 27 Tags 3.4 GiB
Commit Graph

336243 Commits

Author SHA1 Message Date
Mark Brown 86a942773d Merge remote-tracking branch 'asoc/topic/wm8962' into asoc-next 2012-12-10 00:22:32 +09:00
Mark Brown e7d28c8ca4 Merge remote-tracking branch 'asoc/topic/wm8960' into asoc-next 2012-12-10 00:22:32 +09:00
Mark Brown 7a7f9875d9 Merge remote-tracking branch 'asoc/topic/wm8955' into asoc-next 2012-12-10 00:22:31 +09:00
Mark Brown f443a29db9 Merge remote-tracking branch 'asoc/topic/wm8804' into asoc-next 2012-12-10 00:22:31 +09:00
Mark Brown 048742991b Merge remote-tracking branch 'asoc/topic/wm8770' into asoc-next 2012-12-10 00:22:30 +09:00
Mark Brown 95dd6d9066 Merge remote-tracking branch 'asoc/topic/wm8753' into asoc-next 2012-12-10 00:22:29 +09:00
Mark Brown 1310062888 Merge remote-tracking branch 'asoc/topic/wm8750' into asoc-next 2012-12-10 00:22:28 +09:00
Mark Brown 59b4cd42f2 Merge remote-tracking branch 'asoc/topic/wm8741' into asoc-next 2012-12-10 00:22:28 +09:00
Mark Brown 753ad46e86 Merge remote-tracking branch 'asoc/topic/wm8510' into asoc-next 2012-12-10 00:22:27 +09:00
Mark Brown 65c62837a7 Merge remote-tracking branch 'asoc/topic/wm8400' into asoc-next 2012-12-10 00:22:26 +09:00
Mark Brown 47f07b77f2 Merge remote-tracking branch 'asoc/topic/wm8350' into asoc-next 2012-12-10 00:22:26 +09:00
Mark Brown 719454d213 Merge remote-tracking branch 'asoc/topic/wm2200' into asoc-next 2012-12-10 00:22:24 +09:00
Mark Brown ac92f11294 Merge remote-tracking branch 'asoc/topic/wm2000' into asoc-next 2012-12-10 00:22:23 +09:00
Mark Brown 0b0ddfa57c Merge remote-tracking branch 'asoc/topic/wm0010' into asoc-next 2012-12-10 00:22:22 +09:00
Mark Brown 0c0936eb6c Merge remote-tracking branch 'asoc/topic/ux500' into asoc-next 2012-12-10 00:22:21 +09:00
Mark Brown c0324fb3a1 Merge remote-tracking branch 'asoc/topic/tlv320aic32x4' into asoc-next 2012-12-10 00:22:20 +09:00
Mark Brown 2ca5e86c4c Merge remote-tracking branch 'asoc/topic/si476x' into asoc-next 2012-12-10 00:22:19 +09:00
Mark Brown ceb8ef5e6d Merge remote-tracking branch 'asoc/topic/samsung' into asoc-next 2012-12-10 00:22:17 +09:00
Mark Brown a50345152e Merge remote-tracking branch 'asoc/topic/rt5631' into asoc-next 2012-12-10 00:22:17 +09:00
Mark Brown d576741839 Merge remote-tracking branch 'asoc/topic/omap' into asoc-next 2012-12-10 00:22:16 +09:00
Mark Brown 473e8b323c Merge remote-tracking branch 'asoc/topic/max98090' into asoc-next 2012-12-10 00:22:15 +09:00
Mark Brown 29998eb618 Merge remote-tracking branch 'asoc/topic/max9768' into asoc-next 2012-12-10 00:22:15 +09:00
Mark Brown 4301aecbdf Merge remote-tracking branch 'asoc/topic/log' into asoc-next 2012-12-10 00:22:14 +09:00
Mark Brown edbe08adea Merge remote-tracking branch 'asoc/topic/lm49453' into asoc-next 2012-12-10 00:22:13 +09:00
Mark Brown 9a6806c0a7 Merge remote-tracking branch 'asoc/topic/kirkwood' into asoc-next 2012-12-10 00:22:12 +09:00
Mark Brown 18620cc586 Merge remote-tracking branch 'asoc/topic/jz4740' into asoc-next 2012-12-10 00:22:12 +09:00
Mark Brown 2766ee82b2 Merge remote-tracking branch 'asoc/topic/jack' into asoc-next 2012-12-10 00:22:11 +09:00
Mark Brown 8df6bf1c58 Merge remote-tracking branch 'asoc/topic/hotplug' into asoc-next 2012-12-10 00:22:10 +09:00
Mark Brown aaa3bb267c Merge remote-tracking branch 'asoc/topic/fsl' into asoc-next 2012-12-10 00:22:09 +09:00
Mark Brown 954f497f71 Merge remote-tracking branch 'asoc/topic/fsi' into asoc-next 2012-12-10 00:22:08 +09:00
Mark Brown 1870975f5d Merge remote-tracking branch 'asoc/topic/dmaengine' into asoc-next 2012-12-10 00:22:08 +09:00
Mark Brown 1bd202e4c7 Merge remote-tracking branch 'asoc/topic/davinci' into asoc-next 2012-12-10 00:22:07 +09:00
Mark Brown 57769541b4 Merge remote-tracking branch 'asoc/topic/da9055' into asoc-next 2012-12-10 00:22:06 +09:00
Mark Brown ac0d9c9001 Merge remote-tracking branch 'asoc/topic/da7210' into asoc-next 2012-12-10 00:22:05 +09:00
Mark Brown f20eca1c06 Merge remote-tracking branch 'asoc/topic/cs4271' into asoc-next 2012-12-10 00:22:04 +09:00
Mark Brown 93ac820df5 Merge remote-tracking branch 'asoc/topic/atmel' into asoc-next 2012-12-10 00:22:02 +09:00
Mark Brown daa5ab9e0d Merge remote-tracking branch 'asoc/topic/arizona' into asoc-next 2012-12-10 00:22:00 +09:00
Mark Brown c006062652 Merge remote-tracking branch 'asoc/topic/ak4642' into asoc-next 2012-12-10 00:21:58 +09:00
Mark Brown 67fc455cc0 Merge remote-tracking branch 'asoc/topic/ak4535' into asoc-next 2012-12-10 00:21:58 +09:00
Mark Brown c3b07b0773 Merge remote-tracking branch 'asoc/topic/ak4104' into asoc-next 2012-12-10 00:21:56 +09:00
Mark Brown 4e5a4b128a Merge remote-tracking branch 'asoc/topic/adsp' into asoc-next 2012-12-10 00:21:45 +09:00
Mark Brown deb6779fc5 Merge remote-tracking branch 'asoc/topic/ab8500' into asoc-next 2012-12-10 00:21:42 +09:00
Mark Brown 339425f47d Merge remote-tracking branch 'asoc/fix/omap' into asoc-next 2012-12-10 00:21:41 +09:00
Mark Brown a1abfa86d0 ASoC: wm5110: Enable volume ramp control 
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
 2012-12-09 12:50:05 +09:00
Mark Brown dfc075cb66 ASoC: wm5102: Enable volume ramp control 
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
 2012-12-09 12:35:01 +09:00
Mark Brown e853a00f5f ASoC: arizona: Add volume ramp controls 
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
 2012-12-09 12:34:53 +09:00
Padmavathi Venna a08485d8fd ASoC: Samsung: Do not register samsung audio dma device as pdev 
Previously, the ASoC 'platform' (PCM/DMA) object was instantiated via a
platform_device. This didn't represent the hardware well, since there
was no separate hardware associated with this platform_device; it was a
virtual device with sole purpose to call snd_soc_register_platform().

This change removes the platform_device completely. Each Samsung DAI now
registers the ASoC 'platform' itself. Machine drivers are adjusted for
the new 'platform' name.

Signed-off-by: Padmavathi Venna <padma.v@samsung.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
 2012-12-07 19:36:07 +09:00
Daniel Mack 1b3bc060fb ASoC: McASP: implement a way to force BCLK/LRCLK ratios 
Depending on the Codec, the the BCLK/LRCLK ratio might not be freely
chosen by the CPU DAI.

For example, some Codec might want to be supplied with 32-bit samples
for both its channels regardless of the actual audio word size the CPU
sends. In such cases, the rest of the bits on the data lines must be
padded with zeros:

          _______________________________
LRCLK    /                               \
      --'                                 `---------- .....

BCLK  ||||||||||||||||||||||||||||||||||||||||||||||| .....

DATA  ____||||||||||||||||_________________|||||||||| .....

          |<--  data  -->|<--   pads  --> |

This patch adds a new clock divider to configure the BCLK/LRCLK ratio.
If the machine code uses that divider, the driver uses the specified
value, instead of deriving that information from the audio word size.

Otherwise, the original behaviour is retained.

Signed-off-by: Daniel Mack <zonque@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
 2012-12-07 14:47:10 +09:00
Daniel Mack ba764b3def ASoC: McASP: calculate values for channel size 
Change davinci_config_channel_size() to derive the values for XSSZ and
XROT in DAVINCI_MCASP_[RT]XFMT_REG from the configured word length
rather than hard-coding them in a switch/case block.

Also, by directly passing the word length to
davinci_config_channel_size(), we can get rid of the
DAVINCI_AUDIO_WORD_* enum.

Signed-off-by: Daniel Mack <zonque@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
 2012-12-07 14:47:01 +09:00
Daniel Mack d0c6c482f6 ASoC: McASP: remove unused variables 
codec_fmt and sample_rate variables are unused in both snd_platform_data
and davinci_audio_dev, so drop them.

Signed-off-by: Daniel Mack <zonque@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
 2012-12-07 14:46:56 +09:00