Mark Brown
70a9f8797c
Merge remote-tracking branch 'asoc/fix/wm8962' into asoc-linus
2013-07-04 18:30:03 +01:00
Mark Brown
58be9a9311
Merge remote-tracking branch 'asoc/fix/samsung' into asoc-linus
2013-07-04 18:30:02 +01:00
Mark Brown
1b36881105
Merge remote-tracking branch 'asoc/fix/mxs' into asoc-linus
2013-07-04 18:30:02 +01:00
Shawn Guo
4642aabd21
ASoC: wm8962: fix NULL pdata pointer
...
There is an error in merge commit 384b834
on conflict resolution which
causes the following NULL pdata pointer bug.
wm8962 0-001a: customer id 0 revision D
Unable to handle kernel NULL pointer dereference at virtual address 00000004
pgd = 80004000
[00000004] *pgd=00000000
Internal error: Oops: 5 [#1 ] SMP ARM
Modules linked in:
CPU: 0 PID: 1 Comm: swapper/0 Not tainted 3.10.0+ #1
task: bf870000 ti: bf874000 task.ti: bf874000
PC is at wm8962_probe+0x134/0x6c8
LR is at regmap_unlock_mutex+0x10/0x14
pc : [<80452100>] lr : [<80304cf4>] psr: a0000113
sp : bf875c98 ip : 00000000 fp : bf875cd4
r10: 00000000 r9 : bfb1830c r8 : 80779bc4
r7 : 00000000 r6 : 00000001 r5 : bfbac010 r4 : bfb33e00
r3 : 80304ce4 r2 : 00000000 r1 : 00000001 r0 : fffffffb
Flags: NzCv IRQs on FIQs on Mode SVC_32 ISA ARM Segment kernel
Control: 10c53c7d Table: 1000404a DAC: 00000017
Process swapper/0 (pid: 1, stack limit = 0xbf874238)
Stack: (0xbf875c98 to 0xbf876000)
...
Fix the error by assigning pdata a correct pointer.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
2013-07-04 16:49:51 +01:00
Arnaud Patard (Rtp)
28e5ca73ef
ASoC: imx-sgtl5000: return E_PROBE_DEFER if ssi/codec not found
...
If the ssi or codec drivers are not loaded (for instance, because spi or i2c
bus drivers are not loaded), returning -EINVAL will for people to unload and
then reload the module to get sound working. Returning E_PROBE_DEFER will
mitigate this.
Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
2013-07-04 15:58:47 +01:00
Sachin Kamat
b3ff04668c
ASoC: Samsung: Remove redundant comment
...
There is a typo in the filename (i2c mentioned instead of i2s).
However, this is a redundant piece of information. Delete it
altogether.
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
2013-07-04 13:51:14 +01:00
Mark Brown
0429ffeff4
ASoC: samsung: Remove obsolete GPIO based DT pinmuxing
...
Since the Samsung platforms have moved to pinctrl for pin muxing and that
is handled in the core the old GPIO based muxing code can just be removed.
Something similar had been submitted by Thomas Abraham back in March but
a resubmission following review never happened.
Signed-off-by: Mark Brown <broonie@linaro.org>
2013-07-02 13:14:05 +01:00
Shawn Guo
7c9e6150f2
ASoC: mxs: register saif mclk to clock framework
...
Mostly the mxs system design uses saif0 mclk output as the clock source
of codec. Since the mclk is implemented as a general divider with the
saif clk as the parent clock, let's register the mclk as a basic
clk-divider to common clock framework. Then with it being a clock
provdier, clk_get() call in codec driver probe function will just work.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
2013-07-01 11:12:20 +01:00
Mark Brown
84bbc4aa2d
Merge remote-tracking branch 'asoc/topic/x86' into asoc-next
2013-06-17 17:20:33 +01:00
Mark Brown
5464389755
Merge remote-tracking branch 'asoc/topic/wm8994' into asoc-next
2013-06-17 17:20:32 +01:00
Mark Brown
f57019aa0a
Merge remote-tracking branch 'asoc/topic/wm8962' into asoc-next
2013-06-17 17:20:32 +01:00
Mark Brown
7daf390b8b
Merge remote-tracking branch 'asoc/topic/wm0010' into asoc-next
2013-06-17 17:20:31 +01:00
Mark Brown
458bcee95d
Merge remote-tracking branch 'asoc/topic/ux500' into asoc-next
2013-06-17 17:20:30 +01:00
Mark Brown
93d4c1e04f
Merge remote-tracking branch 'asoc/topic/tegra' into asoc-next
2013-06-17 17:20:30 +01:00
Mark Brown
bfe617d33d
Merge remote-tracking branch 'asoc/topic/ssm2518' into asoc-next
2013-06-17 17:20:29 +01:00
Mark Brown
5f5eb4efe5
Merge remote-tracking branch 'asoc/topic/spear' into asoc-next
2013-06-17 17:20:28 +01:00
Mark Brown
d238ffabc5
Merge remote-tracking branch 'asoc/topic/spdif' into asoc-next
2013-06-17 17:20:28 +01:00
Mark Brown
0c5f45065c
Merge remote-tracking branch 'asoc/topic/sn95031' into asoc-next
2013-06-17 17:20:27 +01:00
Mark Brown
14345a5898
Merge remote-tracking branch 'asoc/topic/sgtl5000' into asoc-next
2013-06-17 17:20:27 +01:00
Mark Brown
1ee9271d67
Merge remote-tracking branch 'asoc/topic/samsung' into asoc-next
2013-06-17 17:20:26 +01:00
Mark Brown
60790c5735
Merge remote-tracking branch 'asoc/topic/rt5640' into asoc-next
2013-06-17 17:20:25 +01:00
Mark Brown
3843e87ebd
Merge remote-tracking branch 'asoc/topic/pxa' into asoc-next
2013-06-17 17:20:25 +01:00
Mark Brown
b2d34a822b
Merge remote-tracking branch 'asoc/topic/omap' into asoc-next
2013-06-17 17:20:24 +01:00
Mark Brown
c76a507bfe
Merge remote-tracking branch 'asoc/topic/mxs' into asoc-next
2013-06-17 17:20:23 +01:00
Mark Brown
ff868b2296
Merge remote-tracking branch 'asoc/topic/max98090' into asoc-next
2013-06-17 17:20:23 +01:00
Mark Brown
6502737276
Merge remote-tracking branch 'asoc/topic/kirkwood' into asoc-next
2013-06-17 17:20:22 +01:00
Mark Brown
46dd30a893
Merge remote-tracking branch 'asoc/topic/jz4740' into asoc-next
2013-06-17 17:20:22 +01:00
Mark Brown
18923d7ec7
Merge remote-tracking branch 'asoc/topic/hdmi' into asoc-next
2013-06-17 17:20:21 +01:00
Mark Brown
0d664db622
Merge remote-tracking branch 'asoc/topic/fsl' into asoc-next
2013-06-17 17:20:20 +01:00
Mark Brown
5ec393bcda
Merge remote-tracking branch 'asoc/topic/fsi' into asoc-next
2013-06-17 17:20:20 +01:00
Mark Brown
59338599d8
Merge remote-tracking branch 'asoc/topic/ep93xx' into asoc-next
2013-06-17 17:20:19 +01:00
Mark Brown
e95e939d15
Merge remote-tracking branch 'asoc/topic/dwc' into asoc-next
2013-06-17 17:20:19 +01:00
Mark Brown
c44ddeb837
Merge remote-tracking branch 'asoc/topic/dfmbcs320' into asoc-next
2013-06-17 17:20:18 +01:00
Mark Brown
684d8c515c
Merge remote-tracking branch 'asoc/topic/davinci' into asoc-next
2013-06-17 17:20:18 +01:00
Mark Brown
9805fe391d
Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next
2013-06-17 17:20:17 +01:00
Mark Brown
70fe99d8db
Merge remote-tracking branch 'asoc/topic/core' into asoc-next
2013-06-17 17:20:16 +01:00
Mark Brown
87fd83fd3c
Merge remote-tracking branch 'asoc/topic/blackfin' into asoc-next
2013-06-17 17:20:16 +01:00
Mark Brown
06b753d6fd
Merge remote-tracking branch 'asoc/topic/atmel' into asoc-next
2013-06-17 17:20:15 +01:00
Mark Brown
9912b30f95
Merge remote-tracking branch 'asoc/topic/arizona' into asoc-next
2013-06-17 17:20:14 +01:00
Mark Brown
e768f4e12f
Merge remote-tracking branch 'asoc/topic/adsp' into asoc-next
2013-06-17 17:20:14 +01:00
Mark Brown
0ee6f75016
Merge remote-tracking branch 'asoc/topic/adau1701' into asoc-next
2013-06-17 17:20:13 +01:00
Mark Brown
b27729344d
Merge remote-tracking branch 'asoc/topic/88pm860x' into asoc-next
2013-06-17 17:20:13 +01:00
Mark Brown
c38a881ebb
Merge remote-tracking branch 'asoc/fix/wm8962' into asoc-linus
2013-06-17 17:20:12 +01:00
Mark Brown
a87c863c7b
Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus
2013-06-17 17:20:11 +01:00
Mark Brown
d48fb4232d
Merge remote-tracking branch 'asoc/fix/adsp' into asoc-linus
2013-06-17 17:20:11 +01:00
Mark Brown
27e9a69759
Merge remote-tracking branch 'asoc/fix/adav80x' into asoc-linus
2013-06-17 17:20:10 +01:00
Tushar Behera
fc09cfbe3e
ASoC: spear: Convert to use devm_ioremap_resource
...
Commit 75096579c3
("lib: devres: Introduce devm_ioremap_resource()")
introduced devm_ioremap_resource() and deprecated the use of
devm_request_and_ioremap().
devm_request_mem_region is called in devm_ioremap_resource(). Hence that
part can also be removed.
Since devm_ioremap_resource prints error message on failure, there is
no need to print an explicit warning message.
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
CC: alsa-devel@alsa-project.org
CC: Liam Girdwood <lgirdwood@gmail.com>
CC: Mark Brown <broonie@kernel.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
2013-06-17 17:19:58 +01:00
Mark Brown
1d26f752ac
ASoC: spear: Normalise module names
...
Signed-off-by: Mark Brown <broonie@linaro.org>
2013-06-17 11:18:24 +01:00
Sekhar Nori
4867e99d21
ASoC: davinci: remove sffsdr machine support
...
sffsdr machine support does not build since at least v2.6.36
(~3 years). There is little hope of it being fixed, so remove
the support.
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
2013-06-17 09:59:31 +01:00
Mark Brown
fc7fe01518
ASoC: spear: Remove nonexistant EVM options
...
The source wasn't added.
Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Mark Brown <broonie@linaro.org>
2013-06-17 09:04:12 +01:00