23 Nov, 2010
4 commits
-
Eliminate duplicate #include from
sound/soc/fsl/mpc5200_dma.cSigned-off-by: Jesper Juhl
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown -
They went AWOL during the multi-component merge.
Signed-off-by: Mark Brown
Acked-by: Liam Girdwood -
Signed-off-by: Mark Brown
Acked-by: Liam Girdwood -
After clk_get() mclk is checked second time instead of pllb check.
In patch v1 Jarkko Nikula noticed that PTR_ERR() is also has wrong argument.Signed-off-by: Vasiliy Kulikov
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown
22 Nov, 2010
2 commits
-
Looks like this is missing during multi-component conversion.
Signed-off-by: Axel Lin
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown -
After clk_get() mclk is checked three times instead of mout_epll
and sclk_spdif checks.Signed-off-by: Vasiliy Kulikov
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown
19 Nov, 2010
1 commit
-
After checking the code in 2.6.36,
I found this is missing during multi-component conversion.Signed-off-by: Axel Lin
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown
18 Nov, 2010
3 commits
-
This patch adds initial support for the MAX98089 CODEC.
Signed-off-by: Jesse Marroquin
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown -
Multi-component commit f0fba2ad broke a few things which this patch should
fix. Tested on the DM355 EVM. I've been as careful as I can, but it would be
good if those with access to other Davinci boards could test.--
The multi-component commit put the initialisation of
snd_soc_dai.[capture|playback]_dma_data into snd_soc_dai_ops.hw_params of the
McBSP, McASP & VCIF drivers (davinci-i2s.c, davinci-mcasp.c & davinci-vcif.c).
The initialisation had to be moved from the probe function in these drivers
because davinci_*_dai changed from snd_soc_dai to snd_soc_dai_driver.Unfortunately, the DMA params pointer is needed by davinci_pcm_open (in
davinci-pcm.c) before hw_params is called. I have moved the initialisation to
a new snd_soc_dai_ops.startup function in each of these drivers. This fix
indicates that all platforms that use davinci-pcm must have been broken and
need to test with this fix.--
The multi-component commit also changed the McBSP driver name from
"davinci-asp" to "davinci-i2s" in davinci-i2s.c without updating the board
level references to the driver name. This change is understandable, as there
is a similarly named "davinci-mcasp" driver in davinci-mcasp.c.There is probably no 'correct' name for this driver. The DM6446 datasheet
calls it the "ASP" and describes it as a "specialised McBSP". The DM355
datasheet calls it the "ASP" and describes it as a "specialised ASP". The
DM365 datasheet calls it the "McBSP". Rather than fix this problem by
reverting to "davinci-asp", I've elected to avoid future confusion with the
"davinci-mcasp" driver by changing it to "davinci-mcbsp", which is also
consistent with the names of the functions in the driver. There are other
fixes required, so it was never going to be as simple as a revert anyway.--
The DM365 only has one McBSP port (of the McBSP platforms, only the DM355 has
2 ports), so I've changed the the id of the platform_device from 0 to -1.--
In davinci-evm.c, the DM6446 EVM can no longer share a snd_soc_dai_link
structure with the DM355 EVM as they use different cpu DAI names (the DM355
has 2 ports and the EVM uses the second port, but the DM6446 only has 1 port).
This also means that the 2 boards need different snd_soc_card structures.--
The codec_name entries in davinci-evm.c didn't match the i2c ids in the board
files. I have only checked and fixed the details of the names used for the
McBSP based platforms. Someone with a McASP based platform (eg DA8xx) should
check the others.Signed-off-by: Chris Paulson-Ellis
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown -
During the multi-component conversion the WM8994 register cache init
got lost.Signed-off-by: Mark Brown
Acked-by: Liam Girdwood
15 Nov, 2010
2 commits
-
Ensure that we keep all widget powerups in DAPM sequence by making
the CODEC the last thing we compare on rather than the first thing.
Also fix the fact that we're currently comparing the widget pointers
rather than the CODEC pointers when we do the substraction so we
won't get stable results.Signed-off-by: Mark Brown
-
Unfortunatelly, I misunderstood datasheet, and on s3c244x-iis
when MPLLin source for master clock is selected, prescaler has
no effect. Remove dividor calculation for 44100 rate; remove 88200
rate at all, rx1950 can't do it.Signed-off-by: Vasily Khoruzhick
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown
11 Nov, 2010
1 commit
-
Add Kconfig dependency on AT91_PROGRAMMABLE_CLOCKS for the Atmel SoC
audio SAM9G20-EK and PlayPaq boards. Fixes link errors on missing
clk_set_parent and clk_set_rate when building without
AT91_PROGRAMMABLE_CLOCKS.Signed-off-by: Ryan Mallon
Acked-by: Geoffrey Wossum
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown
10 Nov, 2010
2 commits
-
Ensure that whatever ran before us leaves the WM835x with a sane default
audio interface configuration as we do not override the companding,
loopback or tristate settings and do not reset the chip at startup (as it
is a PMIC).Reported-by: Keiji Mitsuhisa
Signed-off-by: Mark Brown
Acked-by: Liam Girdwood -
The WM8350 driver was using some custom constants to interpret the direction
of the MCLK signal which had the opposite values to those used as standard
by the ASoC core, causing confusion in machine drivers such as the 1133-EV1
board.Reported-by: Tommy Zhu
Signed-off-by: Mark Brown
Acked-by: Liam Girdwood
09 Nov, 2010
2 commits
-
When make mini2440_defconfig compilation end with undefined
references to DMA functions. There was missing selection
for S3C2410_DMA when compile ASoC audio for S3C24xx CPU.
Tested on mini2440 board.Signed-off-by: Marek Belisko
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown -
Signed-off-by: Axel Lin
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown
06 Nov, 2010
2 commits
-
The member reg_cache is not used at all and therefore it should be
removed. This member was usually needed for older versions of ASoC
that did not handle caching automatically and had to be done in the
driver itself.Signed-off-by: Dimitris Papastamos
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown -
When doing anything with the system, especially DAPM, we need to hold the
CODEC mutex.Signed-off-by: Mark Brown
Acked-by: Liam Girdwood
05 Nov, 2010
5 commits
-
We have different codecs on the pcm038 (ac97 wm9712 and mc13783).
To make alsactl restore work correctly these should have different
names.Signed-off-by: Sascha Hauer
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown -
Signed-off-by: Sascha Hauer
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown -
We have two different transfer methods on i.MX: FIQ and DMA. Since
the merge of the ASoC multicomponent support the DMA device is lost.
Add it again. Also, imx_ssi_dai_probe has to be called for !AC97
aswell.Signed-off-by: Sascha Hauer
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown -
Signed-off-by: Sascha Hauer
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown -
Signed-off-by: Sascha Hauer
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown
04 Nov, 2010
2 commits
-
strict_strtoul() has been made __must_check so do so.
Signed-off-by: Mark Brown
Acked-by: Liam Girdwood
03 Nov, 2010
3 commits
-
Patch "ASoC: tpa6130a2: Fix unbalanced regulator disables" introduced a
compiler warning "‘ret’ may be used uninitialized in this function".
Initialize ret to zero to get rid of it and making sure that the function
does not return any random error code when the code is falling through.Signed-off-by: Jarkko Nikula
Signed-off-by: Takashi Iwai -
kzalloc for dai may fail at any iteration of the for loop,
thus properly unregister already registered DAIs before return error.The error handling code in snd_soc_register_dais() already ensure all the DAIs
are unregistered before return error, we can remove the error handling code
to unregister DAIs in snd_soc_register_codec().Signed-off-by: Axel Lin
Signed-off-by: Mark Brown -
…soc-2.6 into fix/asoc
02 Nov, 2010
3 commits
-
Signed-off-by: Mark Brown
-
Add missing newlines.
Signed-off-by: Joe Perches
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown
01 Nov, 2010
8 commits
-
Signed-off-by: Jarkko Nikula
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown -
Include jz4740.c to SND_SOC_ALL_CODECS when the dependencies are met.
Signed-off-by: Jarkko Nikula
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown -
Not all bits can be read back from POWER1 so avoid corruption when using
a read/modify/write cycle by marking it non-volatile - the only thing we
read back from it is the chip revision which has diagnostic value only.
We can re-add later but that's a more invasive change than is suitable
for a bugfix.Signed-off-by: Mark Brown
Acked-by: Liam Girdwood
Cc: stable@kernel.org -
* 'for-linus' of git://www.jni.nu/cris:
CRIS: Add paths for CRISv10 serial driver
CRIS: Fix RS485 delay handling.
Add missing "struct" to in sizeof. -
* 'next-spi' of git://git.secretlab.ca/git/linux-2.6:
spi/pl022: fix erroneous platform data in U300
spi: fixed odd static string conventions in core code
spi/bfin_spi: only request GPIO on first load
spi/bfin_spi: handle error/status changes after data interrupts
spi: enable spi_board_info to be registered after spi_master -
Signed-off-by: Jesper Nilsson
-
This fixes an erroneous use of LSB first in the U300 machine, the
PL022 used in U300 is a standard ARM core that doesn't support this
bit so it should never have been set.Cc: Kevin Wells OA
Signed-off-by: Linus Walleij
Signed-off-by: Grant Likely
