platform/kernel/linux-arm64.git
12 years agoASoC: Use dai_fmt in z2 machine driver
Axel Lin [Fri, 30 Dec 2011 15:44:37 +0000 (23:44 +0800)]
ASoC: Use dai_fmt in z2 machine driver

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: Use dai_fmt in spitz machine driver
Axel Lin [Fri, 30 Dec 2011 15:42:55 +0000 (23:42 +0800)]
ASoC: Use dai_fmt in spitz machine driver

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: Use dai_fmt in saarb machine driver
Axel Lin [Fri, 30 Dec 2011 15:41:54 +0000 (23:41 +0800)]
ASoC: Use dai_fmt in saarb machine driver

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: Fix return value of wm8962_gpio_direction_out()
Axel Lin [Fri, 30 Dec 2011 15:38:03 +0000 (23:38 +0800)]
ASoC: Fix return value of wm8962_gpio_direction_out()

We can't just pass back the return value of snd_soc_update_bits() as it
will be 1 if a bit changed rather than zero.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: Fix return value of ak4641_pcm_set_dai_fmt()
Axel Lin [Fri, 30 Dec 2011 15:34:54 +0000 (23:34 +0800)]
ASoC: Fix return value of ak4641_pcm_set_dai_fmt()

We can't just pass back the return value of snd_soc_update_bits() as it
will be 1 if a bit changed rather than zero.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: ac97c.c: use devm_ functions
Julia Lawall [Thu, 29 Dec 2011 16:51:29 +0000 (17:51 +0100)]
ASoC: ac97c.c: use devm_ functions

The various devm_ functions allocate memory that is released when a driver
detaches.  This patch uses devm_kzalloc, devm_request_mem_region and
devm_ioremap for data that is allocated in the probe function of a platform
device and is only freed in the remove function.

Signed-off-by: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: dbdma2.c: use devm_ functions
Julia Lawall [Thu, 29 Dec 2011 16:51:28 +0000 (17:51 +0100)]
ASoC: dbdma2.c: use devm_ functions

The various devm_ functions allocate memory that is released when a driver
detaches.  This patch uses devm_kzalloc, devm_request_mem_region and
devm_ioremap for data that is allocated in the probe function of a platform
device and is only freed in the remove function.

Signed-off-by: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: dma.c: use devm_ functions
Julia Lawall [Thu, 29 Dec 2011 16:51:27 +0000 (17:51 +0100)]
ASoC: dma.c: use devm_ functions

The various devm_ functions allocate memory that is released when a driver
detaches.  This patch uses devm_kzalloc, devm_request_mem_region and
devm_ioremap for data that is allocated in the probe function of a platform
device and is only freed in the remove function.

Signed-off-by: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: i2sc.c: use devm_ functions
Julia Lawall [Thu, 29 Dec 2011 16:51:26 +0000 (17:51 +0100)]
ASoC: i2sc.c: use devm_ functions

The various devm_ functions allocate memory that is released when a driver
detaches.  This patch uses devm_kzalloc, devm_request_mem_region and
devm_ioremap for data that is allocated in the probe function of a platform
device and is only freed in the remove function.

Signed-off-by: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: psc-ac97.c: use devm_ functions
Julia Lawall [Thu, 29 Dec 2011 16:51:25 +0000 (17:51 +0100)]
ASoC: psc-ac97.c: use devm_ functions

The various devm_ functions allocate memory that is released when a driver
detaches.  This patch uses devm_kzalloc, devm_request_mem_region and
devm_ioremap for data that is allocated in the probe function of a platform
device and is only freed in the remove function.

Signed-off-by: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: psc-i2s.c: use devm_ functions
Julia Lawall [Thu, 29 Dec 2011 16:51:24 +0000 (17:51 +0100)]
ASoC: psc-i2s.c: use devm_ functions

The various devm_ functions allocate memory that is released when a driver
detaches.  This patch uses devm_kzalloc, devm_request_mem_region and
devm_ioremap for data that is allocated in the probe function of a platform
device and is only freed in the remove function.

Signed-off-by: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: davinci-i2s.c: use devm_ functions
Julia Lawall [Thu, 29 Dec 2011 16:51:22 +0000 (17:51 +0100)]
ASoC: davinci-i2s.c: use devm_ functions

The various devm_ functions allocate memory that is released when a driver
detaches.  This patch uses devm_kzalloc, devm_request_mem_region and
devm_ioremap for data that is allocated in the probe function of a platform
device and is only freed in the remove function.

In this case, the original code did not contain a call to iounmap, nor does
one appear anywhere else in the file.  I have assumed that it is safe to
use devm_ioremap for the allocation in any case.

Signed-off-by: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: davinci-mcasp.c: use devm_ functions
Julia Lawall [Thu, 29 Dec 2011 16:51:21 +0000 (17:51 +0100)]
ASoC: davinci-mcasp.c: use devm_ functions

The various devm_ functions allocate memory that is released when a driver
detaches.  This patch uses devm_kzalloc, devm_request_mem_region and
devm_ioremap for data that is allocated in the probe function of a platform
device and is only freed in the remove function.

In this case, the original code did not contain a call to iounmap, nor does
one appear anywhere else in the file.  I have assumed that it is safe to
use devm_ioremap for the allocation in any case.

Signed-off-by: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: davinci-vcif.c: use devm_ functions
Julia Lawall [Thu, 29 Dec 2011 16:51:20 +0000 (17:51 +0100)]
ASoC: davinci-vcif.c: use devm_ functions

The various devm_ functions allocate memory that is released when a driver
detaches.  This patch uses devm_kzalloc, devm_request_mem_region and
devm_ioremap for data that is allocated in the probe function of a platform
device and is only freed in the remove function.

Signed-off-by: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: Convert tpa6130a2 to devm_kzalloc()
Axel Lin [Thu, 29 Dec 2011 04:12:29 +0000 (12:12 +0800)]
ASoC: Convert tpa6130a2 to devm_kzalloc()

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: Convert tlv320dac33 to devm_kzalloc()
Axel Lin [Thu, 29 Dec 2011 04:11:00 +0000 (12:11 +0800)]
ASoC: Convert tlv320dac33 to devm_kzalloc()

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: Convert cs4270 to devm_kzalloc()
Axel Lin [Thu, 29 Dec 2011 03:58:22 +0000 (11:58 +0800)]
ASoC: Convert cs4270 to devm_kzalloc()

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: Convert alc5623 to devm_kzalloc()
Axel Lin [Thu, 29 Dec 2011 03:56:23 +0000 (11:56 +0800)]
ASoC: Convert alc5623 to devm_kzalloc()

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: Convert tlv320aic3x to devm_kzalloc()
Axel Lin [Thu, 29 Dec 2011 04:10:04 +0000 (12:10 +0800)]
ASoC: Convert tlv320aic3x to devm_kzalloc()

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: Convert tlv320aic26 to devm_kzalloc()
Axel Lin [Thu, 29 Dec 2011 04:08:36 +0000 (12:08 +0800)]
ASoC: Convert tlv320aic26 to devm_kzalloc()

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: Convert tlv320aic23 to devm_kzalloc()
Axel Lin [Thu, 29 Dec 2011 04:07:30 +0000 (12:07 +0800)]
ASoC: Convert tlv320aic23 to devm_kzalloc()

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: Convert sta32x to devm_kzalloc()
Axel Lin [Thu, 29 Dec 2011 04:06:39 +0000 (12:06 +0800)]
ASoC: Convert sta32x to devm_kzalloc()

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: Convert ssm2602 to devm_kzalloc()
Axel Lin [Thu, 29 Dec 2011 04:05:20 +0000 (12:05 +0800)]
ASoC: Convert ssm2602 to devm_kzalloc()

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: Convert rt5631 to devm_kzalloc()
Axel Lin [Thu, 29 Dec 2011 04:04:15 +0000 (12:04 +0800)]
ASoC: Convert rt5631 to devm_kzalloc()

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: Convert max9850 to devm_kzalloc()
Axel Lin [Thu, 29 Dec 2011 04:03:16 +0000 (12:03 +0800)]
ASoC: Convert max9850 to devm_kzalloc()

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: Convert max98095 to devm_kzalloc()
Axel Lin [Thu, 29 Dec 2011 04:02:21 +0000 (12:02 +0800)]
ASoC: Convert max98095 to devm_kzalloc()

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: Convert max98088 to devm_kzalloc()
Axel Lin [Thu, 29 Dec 2011 04:01:07 +0000 (12:01 +0800)]
ASoC: Convert max98088 to devm_kzalloc()

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: Convert cs42l51 to devm_kzalloc()
Axel Lin [Thu, 29 Dec 2011 04:00:13 +0000 (12:00 +0800)]
ASoC: Convert cs42l51 to devm_kzalloc()

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: da7210: Add support for line input and mic
Ashish Chavan [Mon, 2 Jan 2012 12:05:52 +0000 (17:35 +0530)]
ASoC: da7210: Add support for line input and mic

DA7210 has three line inputs (AUX1 Left, AUX1 Right and AUX2) and
a stereo MIC. This patch adds gain controls for MIC, AUX1, AUX2 as
well as INPGA.

Signed-off-by: Ashish Chavan <ashish.chavan@kpitcummins.com>
Signed-off-by: David Dajun Chen <dchen@diasemi.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: Convert corgi to table based DAPM and control init
Axel Lin [Fri, 30 Dec 2011 03:16:32 +0000 (11:16 +0800)]
ASoC: Convert corgi to table based DAPM and control init

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: Use dai_fmt in corgi machine driver
Axel Lin [Fri, 30 Dec 2011 03:13:24 +0000 (11:13 +0800)]
ASoC: Use dai_fmt in corgi machine driver

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: Use dai_fmt in poodle machine driver
Axel Lin [Fri, 30 Dec 2011 01:20:40 +0000 (09:20 +0800)]
ASoC: Use dai_fmt in poodle machine driver

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: Convert poodle to table based DAPM and control init
Axel Lin [Fri, 30 Dec 2011 01:19:32 +0000 (09:19 +0800)]
ASoC: Convert poodle to table based DAPM and control init

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: pxa: Convert poodle to use snd_soc_register_card()
Axel Lin [Fri, 30 Dec 2011 01:16:11 +0000 (09:16 +0800)]
ASoC: pxa: Convert poodle to use snd_soc_register_card()

Use snd_soc_register_card() instead of creating a "soc-audio" platform device.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: Enable ASoC register map dump for some regmap CODECs
Mark Brown [Thu, 29 Dec 2011 12:18:53 +0000 (12:18 +0000)]
ASoC: Enable ASoC register map dump for some regmap CODECs

It's still useful to be able to poke around in the register map at
runtime.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: Remove unused label from wm8994 probe()
Mark Brown [Thu, 29 Dec 2011 11:08:34 +0000 (11:08 +0000)]
ASoC: Remove unused label from wm8994 probe()

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: Convert tlv320aic32x4 to devm_kzalloc()
Axel Lin [Mon, 26 Dec 2011 12:57:24 +0000 (20:57 +0800)]
ASoC: Convert tlv320aic32x4 to devm_kzalloc()

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: Convert jz4740 to devm_kzalloc()
Axel Lin [Mon, 26 Dec 2011 12:55:01 +0000 (20:55 +0800)]
ASoC: Convert jz4740 to devm_kzalloc()

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: Convert adau1701 to devm_kzalloc()
Axel Lin [Mon, 26 Dec 2011 12:53:09 +0000 (20:53 +0800)]
ASoC: Convert adau1701 to devm_kzalloc()

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: Convert ad1836 to devm_kzalloc()
Axel Lin [Mon, 26 Dec 2011 12:50:02 +0000 (20:50 +0800)]
ASoC: Convert ad1836 to devm_kzalloc()

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: Convert adau1373 to devm_kzalloc()
Axel Lin [Mon, 26 Dec 2011 12:52:13 +0000 (20:52 +0800)]
ASoC: Convert adau1373 to devm_kzalloc()

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: Convert ad193x to devm_kzalloc()
Axel Lin [Mon, 26 Dec 2011 12:51:16 +0000 (20:51 +0800)]
ASoC: Convert ad193x to devm_kzalloc()

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: mxs: Add .owner to struct snd_soc_card
Lothar Waßmann [Wed, 28 Dec 2011 12:06:21 +0000 (20:06 +0800)]
ASoC: mxs: Add .owner to struct snd_soc_card

Add missing .owner of struct snd_soc_card. This prevents the module from being
removed from underneath its users.

Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: Convert sgtl5000 to use devm_kzalloc()
Fabio Estevam [Wed, 28 Dec 2011 13:30:11 +0000 (11:30 -0200)]
ASoC: Convert sgtl5000 to use devm_kzalloc()

Convert sgtl5000 codec driver to use devm_kzalloc().

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: sgtl5000: Fix voltage units in dev_err message
Fabio Estevam [Wed, 28 Dec 2011 11:55:15 +0000 (09:55 -0200)]
ASoC: sgtl5000: Fix voltage units in dev_err message

vdda, vddio and vddd are voltages expressed in milivolts (mV), so use the
proper annotation.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: Convert kirkwood-t5325 to table based DAPM init
Axel Lin [Wed, 28 Dec 2011 11:03:23 +0000 (19:03 +0800)]
ASoC: Convert kirkwood-t5325 to table based DAPM init

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: Use dai_fmt in kirkwood-t5325 machine driver
Axel Lin [Wed, 28 Dec 2011 10:59:30 +0000 (18:59 +0800)]
ASoC: Use dai_fmt in kirkwood-t5325 machine driver

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: Use dai_fmt in kirkwood-openrd machine driver
Axel Lin [Wed, 28 Dec 2011 10:58:17 +0000 (18:58 +0800)]
ASoC: Use dai_fmt in kirkwood-openrd machine driver

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: Fix build error in sound/soc/kirkwood/kirkwood-i2s.c
Axel Lin [Wed, 28 Dec 2011 08:05:22 +0000 (16:05 +0800)]
ASoC: Fix build error in sound/soc/kirkwood/kirkwood-i2s.c

Since commit db33f4de "ARM: Orion: Remove address map info from all platform data structures",
the dram is removed from struct kirkwood_asoc_platform_data.

This patch fixes below build error:
  CC      sound/soc/kirkwood/kirkwood-i2s.o
sound/soc/kirkwood/kirkwood-i2s.c: In function 'kirkwood_i2s_dev_probe':
sound/soc/kirkwood/kirkwood-i2s.c:444: error: 'struct kirkwood_asoc_platform_data' has no member named 'dram'
sound/soc/kirkwood/kirkwood-i2s.c:450: error: 'struct kirkwood_asoc_platform_data' has no member named 'dram'
make[3]: *** [sound/soc/kirkwood/kirkwood-i2s.o] Error 1
make[2]: *** [sound/soc/kirkwood] Error 2
make[1]: *** [sound/soc] Error 2
make: *** [sound] Error 2

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Nicolas Pitre <nico@fluxnic.net>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: Convert 88pm860x-codec to devm_kzalloc()
Axel Lin [Mon, 26 Dec 2011 12:48:48 +0000 (20:48 +0800)]
ASoC: Convert 88pm860x-codec to devm_kzalloc()

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: Convert uda1380 to devm_kzalloc()
Axel Lin [Mon, 26 Dec 2011 12:58:14 +0000 (20:58 +0800)]
ASoC: Convert uda1380 to devm_kzalloc()

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: Convert lm4857 to devm_kzalloc()
Axel Lin [Mon, 26 Dec 2011 12:56:25 +0000 (20:56 +0800)]
ASoC: Convert lm4857 to devm_kzalloc()

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: Convert da7210 to devm_kzalloc()
Axel Lin [Mon, 26 Dec 2011 12:54:04 +0000 (20:54 +0800)]
ASoC: Convert da7210 to devm_kzalloc()

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoMerge branch 'for-3.2' into for-3.3
Mark Brown [Fri, 23 Dec 2011 18:08:02 +0000 (18:08 +0000)]
Merge branch 'for-3.2' into for-3.3

12 years agoASoC: wm8776: add missing break in sample size switch
Joachim Eastwood [Fri, 23 Dec 2011 16:32:25 +0000 (17:32 +0100)]
ASoC: wm8776: add missing break in sample size switch

Broken in commit d1dc698a54259cb454284456483b45f67c865cf8

Signed-off-by: Joachim Eastwood <joachim.eastwood@jotron.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: Add trivial pm_runtime usage to Samsung DAI drivers
Mark Brown [Thu, 8 Dec 2011 08:45:03 +0000 (16:45 +0800)]
ASoC: Add trivial pm_runtime usage to Samsung DAI drivers

Currently this won't actually do anything but using this will help the
core SoC code track when the system is idle.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: mid-x86: Add .owner to struct snd_soc_card
Axel Lin [Fri, 23 Dec 2011 06:50:17 +0000 (14:50 +0800)]
ASoC: mid-x86: Add .owner to struct snd_soc_card

Add missing .owner of struct snd_soc_card. This prevents the module from being
removed from underneath its users.

Reported-by: Lothar Waßmann <LW@KARO-electronics.de>
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: kirkwood: Add .owner to struct snd_soc_card
Axel Lin [Fri, 23 Dec 2011 06:49:28 +0000 (14:49 +0800)]
ASoC: kirkwood: Add .owner to struct snd_soc_card

Add missing .owner of struct snd_soc_card. This prevents the module from being
removed from underneath its users.

Reported-by: Lothar Waßmann <LW@KARO-electronics.de>
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: txx9: Add .owner to struct snd_soc_card
Axel Lin [Fri, 23 Dec 2011 06:54:30 +0000 (14:54 +0800)]
ASoC: txx9: Add .owner to struct snd_soc_card

Add missing .owner of struct snd_soc_card. This prevents the module from being
removed from underneath its users.

Reported-by: Lothar Waßmann <LW@KARO-electronics.de>
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: sh: Add .owner to struct snd_soc_card
Axel Lin [Fri, 23 Dec 2011 06:53:32 +0000 (14:53 +0800)]
ASoC: sh: Add .owner to struct snd_soc_card

Add missing .owner of struct snd_soc_card. This prevents the module from being
removed from underneath its users.

Reported-by: Lothar Waßmann <LW@KARO-electronics.de>
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: s6000: Add .owner to struct snd_soc_card
Axel Lin [Fri, 23 Dec 2011 06:52:22 +0000 (14:52 +0800)]
ASoC: s6000: Add .owner to struct snd_soc_card

Add missing .owner of struct snd_soc_card. This prevents the module from being
removed from underneath its users.

Reported-by: Lothar Waßmann <LW@KARO-electronics.de>
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Daniel Glöckner <dg@emlix.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: nuc900: Add .owner to struct snd_soc_card
Axel Lin [Fri, 23 Dec 2011 06:51:17 +0000 (14:51 +0800)]
ASoC: nuc900: Add .owner to struct snd_soc_card

Add missing .owner of struct snd_soc_card. This prevents the module from being
removed from underneath its users.

Reported-by: Lothar Waßmann <LW@KARO-electronics.de>
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: jz4740: Add .owner to struct snd_soc_card
Axel Lin [Fri, 23 Dec 2011 06:48:19 +0000 (14:48 +0800)]
ASoC: jz4740: Add .owner to struct snd_soc_card

Add missing .owner of struct snd_soc_card. This prevents the module from being
removed from underneath its users.

Reported-by: Lothar Waßmann <LW@KARO-electronics.de>
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: imx: Add .owner to struct snd_soc_card
Axel Lin [Fri, 23 Dec 2011 06:47:08 +0000 (14:47 +0800)]
ASoC: imx: Add .owner to struct snd_soc_card

Add missing .owner of struct snd_soc_card. This prevents the module from being
removed from underneath its users.

Reported-by: Lothar Waßmann <LW@KARO-electronics.de>
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: au1x: Add .owner to struct snd_soc_card
Axel Lin [Fri, 23 Dec 2011 01:53:55 +0000 (09:53 +0800)]
ASoC: au1x: Add .owner to struct snd_soc_card

Add missing .owner of struct snd_soc_card. This prevents the module from being
removed from underneath its users.

Reported-by: Lothar Waßmann <LW@KARO-electronics.de>
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: tegra: Add .owner to struct snd_soc_card
Axel Lin [Thu, 22 Dec 2011 13:23:01 +0000 (21:23 +0800)]
ASoC: tegra: Add .owner to struct snd_soc_card

Missed .owner of struct snd_soc_card will prevent the module from being
removed from underneath its users.

Reported-by: Lothar Waßmann <LW@KARO-electronics.de>
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: ep93xx: Add .owner to struct snd_soc_card
Axel Lin [Thu, 22 Dec 2011 13:21:37 +0000 (21:21 +0800)]
ASoC: ep93xx: Add .owner to struct snd_soc_card

Missed .owner of struct snd_soc_card will prevent the module from being
removed from underneath its users.

Reported-by: Lothar Waßmann <LW@KARO-electronics.de>
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: davinci: Add .owner to struct snd_soc_card
Axel Lin [Thu, 22 Dec 2011 13:19:42 +0000 (21:19 +0800)]
ASoC: davinci: Add .owner to struct snd_soc_card

Missed .owner of struct snd_soc_card will prevent the module from being
removed from underneath its users.

Reported-by: Lothar Waßmann <LW@KARO-electronics.de>
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: blackfin: Add .owner to struct snd_soc_card
Axel Lin [Thu, 22 Dec 2011 13:17:22 +0000 (21:17 +0800)]
ASoC: blackfin: Add .owner to struct snd_soc_card

Missed .owner of struct snd_soc_card will prevent the module from being
removed from underneath its users.

Reported-by: Lothar Waßmann <LW@KARO-electronics.de>
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: atmel: Add .owner to struct snd_soc_card
Axel Lin [Thu, 22 Dec 2011 13:14:58 +0000 (21:14 +0800)]
ASoC: atmel: Add .owner to struct snd_soc_card

Missed .owner of struct snd_soc_card will prevent the module from being
removed from underneath its users.

Reported-by: Lothar Waßmann <LW@KARO-electronics.de>
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: fsl: Add .owner to struct snd_soc_card
Axel Lin [Thu, 22 Dec 2011 13:04:54 +0000 (21:04 +0800)]
ASoC: fsl: Add .owner to struct snd_soc_card

Missed .owner of struct snd_soc_card will prevent the module from being
removed from underneath its users.

Reported-by: Lothar Waßmann <LW@KARO-electronics.de>
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: Declare soc_new_pcm() properly
Mark Brown [Thu, 22 Dec 2011 12:16:39 +0000 (12:16 +0000)]
ASoC: Declare soc_new_pcm() properly

Ensure that everything is seeing the same declaration by moving it to
a header file rather than putting the declaration in soc-core.c

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>
12 years agoMerge branch 'for-3.2' into for-3.3
Mark Brown [Thu, 22 Dec 2011 12:02:29 +0000 (12:02 +0000)]
Merge branch 'for-3.2' into for-3.3

12 years agoRevert "ASoC: mxs: correct 'direction' of device_prep_dma_cyclic"
Mark Brown [Thu, 22 Dec 2011 11:37:03 +0000 (11:37 +0000)]
Revert "ASoC: mxs: correct 'direction' of device_prep_dma_cyclic"

This reverts commit dbec3b30a601791717bc5bb827e210c3b5d6e067 as it
should never have been applied to the ASoC tree at all, let alone 3.2.

12 years agoASoC: samsung: Add .owner to struct snd_soc_card
Axel Lin [Thu, 22 Dec 2011 02:53:15 +0000 (10:53 +0800)]
ASoC: samsung: Add .owner to struct snd_soc_card

Missed .owner of struct snd_soc_card will prevent the module from being
removed from underneath its users.

Reported-by: Lothar Waßmann <LW@KARO-electronics.de>
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: pxa: Add .owner to struct snd_soc_card
Axel Lin [Thu, 22 Dec 2011 01:44:43 +0000 (09:44 +0800)]
ASoC: pxa: Add .owner to struct snd_soc_card

Missed .owner of struct snd_soc_card will prevent the module from being
removed from underneath its users.

Reported-by: Lothar Waßmann <LW@KARO-electronics.de>
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: Allow DAI links to be specified using device tree nodes
Stephen Warren [Wed, 21 Dec 2011 17:40:59 +0000 (10:40 -0700)]
ASoC: Allow DAI links to be specified using device tree nodes

DAI link endpoints and platform (DMA) devices are currently specified
by name. When instantiating sound cards from device tree, it may be more
convenient to refer to these devices by phandle in the device tree, and
for code to describe DAI links using the "struct device_node *"
("of_node") those phandles map to.

This change adds new fields to snd_soc_dai_link which can "name" devices
using of_node, enhances soc_bind_dai_link() to allow binding based on
of_node, and enhances snd_soc_register_card() to ensure that illegal
combinations of name and of_node are not used.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: Remove ifdefs for GPIO_SYSFS
Mark Brown [Tue, 20 Dec 2011 23:59:41 +0000 (23:59 +0000)]
ASoC: Remove ifdefs for GPIO_SYSFS

It is part of the GPIO API so should be stubbed appropriately.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: Convert cs42l51 to table based DAPM and control init
Axel Lin [Tue, 20 Dec 2011 02:19:54 +0000 (10:19 +0800)]
ASoC: Convert cs42l51 to table based DAPM and control init

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: Convert 88pm860x-codec to table based DAPM and control init
Axel Lin [Tue, 20 Dec 2011 02:14:25 +0000 (10:14 +0800)]
ASoC: Convert 88pm860x-codec to table based DAPM and control init

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: Use dai_fmt in imote2 machine driver
Axel Lin [Tue, 20 Dec 2011 08:27:28 +0000 (16:27 +0800)]
ASoC: Use dai_fmt in imote2 machine driver

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: Use dai_fmt in hx4700 machine driver
Axel Lin [Tue, 20 Dec 2011 08:13:26 +0000 (16:13 +0800)]
ASoC: Use dai_fmt in hx4700 machine driver

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: Convert ak4671 to devm_kzalloc()
Axel Lin [Tue, 20 Dec 2011 06:41:19 +0000 (14:41 +0800)]
ASoC: Convert ak4671 to devm_kzalloc()

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: Convert ak4642 to devm_kzalloc()
Axel Lin [Tue, 20 Dec 2011 06:40:12 +0000 (14:40 +0800)]
ASoC: Convert ak4642 to devm_kzalloc()

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: Convert ak4641 to devm_kzalloc()
Axel Lin [Tue, 20 Dec 2011 06:39:20 +0000 (14:39 +0800)]
ASoC: Convert ak4641 to devm_kzalloc()

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: Convert ak4535 to devm_kzalloc()
Axel Lin [Tue, 20 Dec 2011 06:38:09 +0000 (14:38 +0800)]
ASoC: Convert ak4535 to devm_kzalloc()

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: Convert ak4104 to devm_kzalloc()
Axel Lin [Tue, 20 Dec 2011 06:37:12 +0000 (14:37 +0800)]
ASoC: Convert ak4104 to devm_kzalloc()

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: Tegra+WM8903 machine: Add device tree binding
Stephen Warren [Mon, 12 Dec 2011 22:55:36 +0000 (15:55 -0700)]
ASoC: Tegra+WM8903 machine: Add device tree binding

This driver is parameterized in two ways:

a) Platform data, which supplies the set of GPIOs used by the driver.
   These GPIOs can now be parsed out of device tree.

b) Machine-specific DAPM route arrays embedded into the ASoC machine
   driver itself. Historically, the driver picks the appropriate array
   to use using machine_is_*(). The driver now requires this array to
   be parsed from device tree when instantiated through device tree,
   using the core ASoC support for this parsing.

Based on work by John Bonesio, but significantly reworked since then.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: Add utility to parse DAPM routes from device tree
Stephen Warren [Mon, 12 Dec 2011 22:55:35 +0000 (15:55 -0700)]
ASoC: Add utility to parse DAPM routes from device tree

Implement snd_soc_of_parse_audio_routing(), a utility function that can
parses a simple DAPM route table from device tree.The machine driver
specifies the DT property to use, since this is binding-specific.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: Add utility to set a card's name from device tree
Stephen Warren [Mon, 12 Dec 2011 22:55:34 +0000 (15:55 -0700)]
ASoC: Add utility to set a card's name from device tree

Implement snd_soc_of_parse_card_name(), a utility function that sets a
card's name from device tree. The machine driver specifies the DT
property to use, since this is binding-specific.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: Rename rt562[1|2]_vol_snd_controls to alc562[1|2]_vol_snd_controls
Axel Lin [Thu, 15 Dec 2011 03:57:57 +0000 (11:57 +0800)]
ASoC: Rename rt562[1|2]_vol_snd_controls to alc562[1|2]_vol_snd_controls

The module desciption says this is ASoC alc5621/2/3 driver.
Make the naming consistent with the reset of the code.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoMerge branch 'for-3.2' into for-3.3
Mark Brown [Tue, 20 Dec 2011 00:53:23 +0000 (00:53 +0000)]
Merge branch 'for-3.2' into for-3.3

12 years agoASoC: Use dai_fmt in snappercl15 machine driver
Axel Lin [Sat, 17 Dec 2011 07:41:11 +0000 (15:41 +0800)]
ASoC: Use dai_fmt in snappercl15 machine driver

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Reviewed-by: Mika Westerberg <mika.westerberg@iki.fi>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: Use dai_fmt in edb93xx machine driver
Axel Lin [Sat, 17 Dec 2011 07:36:52 +0000 (15:36 +0800)]
ASoC: Use dai_fmt in edb93xx machine driver

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Alexander Sverdlin <subaparts@yandex.ru>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: mxs: correct 'direction' of device_prep_dma_cyclic
Shawn Guo [Wed, 14 Dec 2011 07:47:46 +0000 (15:47 +0800)]
ASoC: mxs: correct 'direction' of device_prep_dma_cyclic

The commit 49920bc (dmaengine: add new enum dma_transfer_direction)
changes the type of parameter 'direction' of device_prep_dma_cyclic
from dma_data_direction to dma_transfer_direction.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Acked-by: Dong Aisheng <dong.aisheng@linaro.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: Remove export of s3c_pcm_dai
Axel Lin [Wed, 14 Dec 2011 11:13:26 +0000 (19:13 +0800)]
ASoC: Remove export of s3c_pcm_dai

We don't need to export s3c_pcm_dai after multi-component patch.
Thus remove export of s3c_pcm_dai and make it static.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: Tegra machine ASoC driver for boards using ALC5332 codec
Leon Romanovsky [Mon, 19 Dec 2011 19:51:52 +0000 (21:51 +0200)]
ASoC: Tegra machine ASoC driver for boards using ALC5332 codec

At this stage only Toshiba AC100/Dynabook supported.

Signed-off-by: Leon Romanovsky <leon@leon.nu>
Signed-off-by: Andrey Danin <danindrey@mail.ru>
Acked-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: Convert uda1380 to table based DAPM and control init
Axel Lin [Mon, 19 Dec 2011 05:54:38 +0000 (13:54 +0800)]
ASoC: Convert uda1380 to table based DAPM and control init

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: Convert max9850 to table based DAPM and control init
Axel Lin [Mon, 19 Dec 2011 05:13:31 +0000 (13:13 +0800)]
ASoC: Convert max9850 to table based DAPM and control init

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
12 years agoASoC: Use standard cache sync code in wm8961
Mark Brown [Fri, 16 Dec 2011 06:57:11 +0000 (07:57 +0100)]
ASoC: Use standard cache sync code in wm8961

We write the reset register with the default value so it should not be
mistakenly written.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>