Commit Graph

362559 Commits

Author SHA1 Message Date
Michal Bachraty
d486fea6ba ASoC: davinci-mcasp: Add Support BCLK-to-LRCLK ratio for TDM modes
For TDM mode, BCLK-to-LCLK ratio is computed as (tdm_slots) x (word_length).
I2S mode is only subset of TDM mode with specific tdm_slots = 2 channels.
Also bclk_lrclk_ratio can be greater than 255, therefore u16 need to be used.

Signed-off-by: Michal Bachraty <michal.bachraty@streamunlimited.com>
Acked-by: Daniel Mack <zonque@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2013-04-23 14:50:30 +01:00
Michal Bachraty
7c21a78104 ASoC: davinci-pcm, davinci-mcasp: Clean up active_serializers
As pointed of by Vaibhav, commit message: "ASoC: davinci-mcasp: Add support for multichannel playback"
number of active serializers can be hidden into fifo_level variable, which is set in davimci-mcasp.

Signed-off-by: Michal Bachraty <michal.bachraty@streamunlimited.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2013-04-23 14:50:21 +01:00
Mark Brown
5cbad7d39a Merge remote-tracking branch 'asoc/topic/wm8994' into asoc-next 2013-04-12 13:57:31 +01:00
Mark Brown
3c30782625 Merge remote-tracking branch 'asoc/topic/wm8960' into asoc-next 2013-04-12 13:57:29 +01:00
Mark Brown
ca0c5685ff Merge remote-tracking branch 'asoc/topic/wm8903' into asoc-next 2013-04-12 13:57:28 +01:00
Mark Brown
4277c2a2a7 Merge remote-tracking branch 'asoc/topic/wm2000' into asoc-next 2013-04-12 13:57:27 +01:00
Mark Brown
106c386ad5 Merge remote-tracking branch 'asoc/topic/wm0010' into asoc-next 2013-04-12 13:57:26 +01:00
Mark Brown
6d21c5d64b Merge remote-tracking branch 'asoc/topic/wm-hubs' into asoc-next 2013-04-12 13:57:25 +01:00
Mark Brown
0dd9e6bd6f Merge remote-tracking branch 'asoc/topic/ux500' into asoc-next 2013-04-12 13:57:22 +01:00
Mark Brown
d14bc151a4 Merge remote-tracking branch 'asoc/topic/tegra' into asoc-next 2013-04-12 13:57:21 +01:00
Mark Brown
5b9fd76972 Merge remote-tracking branch 'asoc/topic/tas5086' into asoc-next 2013-04-12 13:57:19 +01:00
Mark Brown
eeb7f91e35 Merge remote-tracking branch 'asoc/topic/spear' into asoc-next 2013-04-12 13:57:17 +01:00
Mark Brown
4b6142ae93 Merge remote-tracking branch 'asoc/topic/si476x' into asoc-next 2013-04-12 13:57:15 +01:00
Mark Brown
df00b71fbd Merge remote-tracking branch 'asoc/topic/samsung' into asoc-next 2013-04-12 13:57:13 +01:00
Mark Brown
8c7df02167 Merge remote-tracking branch 'asoc/topic/max98090' into asoc-next 2013-04-12 13:57:12 +01:00
Mark Brown
406554fe8d Merge remote-tracking branch 'asoc/topic/max98088' into asoc-next 2013-04-12 13:57:10 +01:00
Mark Brown
c964f28dbf Merge remote-tracking branch 'asoc/topic/maintainers' into asoc-next 2013-04-12 13:57:08 +01:00
Mark Brown
5dccf54e2b Merge remote-tracking branch 'asoc/topic/fsl' into asoc-next 2013-04-12 13:57:07 +01:00
Mark Brown
48539f73cb Merge remote-tracking branch 'asoc/topic/fsi' into asoc-next 2013-04-12 13:57:05 +01:00
Mark Brown
38e8c895d3 Merge remote-tracking branch 'asoc/topic/dma' into asoc-next 2013-04-12 13:57:04 +01:00
Mark Brown
d66e065c5b Merge remote-tracking branch 'asoc/topic/davinci' into asoc-next 2013-04-12 13:57:03 +01:00
Mark Brown
7b451962c7 Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next 2013-04-12 13:57:02 +01:00
Mark Brown
69976189c3 Merge remote-tracking branch 'asoc/topic/cs42l73' into asoc-next 2013-04-12 13:57:00 +01:00
Mark Brown
e8704770b4 Merge remote-tracking branch 'asoc/topic/cs4271' into asoc-next 2013-04-12 13:56:59 +01:00
Mark Brown
56c32c751c Merge remote-tracking branch 'asoc/topic/core' into asoc-next 2013-04-12 13:56:58 +01:00
Mark Brown
54b019cbd9 Merge remote-tracking branch 'asoc/topic/compress' into asoc-next 2013-04-12 13:56:57 +01:00
Mark Brown
1341962577 Merge remote-tracking branch 'asoc/topic/component' into asoc-next 2013-04-12 13:56:56 +01:00
Mark Brown
604c724ba3 Merge remote-tracking branch 'asoc/topic/atmel' into asoc-next 2013-04-12 13:56:54 +01:00
Mark Brown
a18d5151aa Merge remote-tracking branch 'asoc/topic/arizona' into asoc-next 2013-04-12 13:56:53 +01:00
Mark Brown
0680fa6c25 Merge remote-tracking branch 'asoc/topic/ak5386' into asoc-next 2013-04-12 13:56:52 +01:00
Mark Brown
f1cc981b02 Merge remote-tracking branch 'asoc/topic/ak4104' into asoc-next 2013-04-12 13:56:51 +01:00
Mark Brown
7d9ca53bcf Merge remote-tracking branch 'asoc/topic/adsp' into asoc-next 2013-04-12 13:56:49 +01:00
Mark Brown
280200d63b Merge remote-tracking branch 'asoc/topic/adau1373' into asoc-next 2013-04-12 13:56:48 +01:00
Mark Brown
1f21be1e69 Merge remote-tracking branch 'asoc/fix/wm8903' into asoc-next 2013-04-12 13:56:46 +01:00
Mark Brown
fdce39bd05 Merge remote-tracking branch 'asoc/fix/tegra' into asoc-next 2013-04-12 13:56:46 +01:00
Mark Brown
e162520d8c Merge remote-tracking branch 'asoc/fix/samsung' into asoc-next 2013-04-12 13:56:45 +01:00
Mark Brown
75c3475daa Merge remote-tracking branch 'asoc/fix/core' into asoc-next 2013-04-12 13:56:44 +01:00
Mark Brown
6ab7c227ba Merge remote-tracking branch 'asoc/fix/compress' into asoc-next 2013-04-12 13:56:41 +01:00
Heiko Stübner
32873b5953 ASoC: samsung: fix neo1973-wm8753 compilation
Commit b2ca78717c (ARM: S3C24XX: make gta02.h local) already replaced
the GTA02_GPIO_* constants in neo1973-wm8753.c but forgot to remove the
inclusion of mach/gta02.h before moving the file out of mach/.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2013-04-12 12:37:16 +01:00
Mark Brown
b02e48f2f8 MAINTAINERS: Update e-mail address
Update the e-mail address I use for subsystems.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2013-04-12 11:53:41 +01:00
Arnd Bergmann
5d229ce569 ASoC: samsung: move plat/ headers to local directory
The plat/regs-iis.h and plat/regs-ac97.h files in the samsung platform
are only needed by the ASoC drivers, so they can be moved into the same
directory, as one more step towards a multiplatform build.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2013-04-11 18:17:38 +01:00
Mark Brown
ac50009f64 ASoC: wm_adsp: Add support for firmware wide coefficient blocks
Firmwares may provide some firmware wide configuration regions which can
be configured by the coefficient files using the firmware ID as the
algorithm ID, include these in the algorithm list.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2013-04-11 18:14:47 +01:00
Arnd Bergmann
0930c33ad0 ASoC: samsung: export idma_reg_addr_init
The idma_reg_addr_init function is used by the samsung i2s driver,
which can be a loadable module, so we have to export this function.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2013-04-11 17:51:31 +01:00
Arnd Bergmann
2af1955848 ASoC: samsung: fix module_device_table
The second argument to the module_device_table macro must be the
name of the device id array. In the samsung i2s driver, there
was a small typo, resulting in a build error when building it
as a loadable module.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2013-04-11 17:51:30 +01:00
Arnd Bergmann
cb00e3a16d ASoC: samsung: use irq resource for idma
With multiplatform kernels, we cannot use hardwired IRQ
numbers in device drivers. This changes the idma driver
to use a proper resource, like all other drivers do.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2013-04-11 17:51:30 +01:00
Mark Brown
f6f629f833 ASoC: wm5102: Correct lookup of arizona struct in SYSCLK event
Reported-by: Ryo Tsutsui <Ryo.Tsutsui@wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: stable@vger.kernel.org
2013-04-09 17:50:55 +01:00
Alban Bedel
f1ca493b0b ASoC: wm8903: Fix the bypass to HP/LINEOUT when no DAC or ADC is running
The Charge Pump needs the DSP clock to work properly, without it the
bypass to HP/LINEOUT is not working properly. This requirement is not
mentioned in the datasheet but has been confirmed by Mark Brown from
Wolfson.

Signed-off-by: Alban Bedel <alban.bedel@avionic-design.de>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: stable@vger.kernel.org
2013-04-09 17:43:48 +01:00
Mark Brown
da445afe35 ASoC: wm8994: Remove duplicate revision cache
There's already a device revision stored in the core data structure,
don't duplicate it in the CODEC driver.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2013-04-09 12:15:35 +01:00
Paul Bolle
4f88eff834 ASoC: Ux500: remove test for undefined Kconfig macro
A test for CONFIG_SND_SOC_UX500_AB5500 was added in v3.5. But there
never was a corresponding Kconfig symbol so this test has always
evaluated to true. And since AB5500 support was removed in v3.5 it
appears safe to remove this test and a few lines of code.

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2013-04-08 13:44:32 +01:00
Linus Torvalds
31880c37c1 Linux 3.9-rc6 2013-04-07 20:49:54 -07:00