Takashi Iwai [Mon, 15 Dec 2014 12:47:25 +0000 (13:47 +0100)]
ALSA: hda - Add quirk for Packard Bell EasyNote MX65
Packard Bell EasyNote MX65 with
AD1986A codec needs a few fixups,
namely, the pin config overrides to set only the known I/O pins and
the EAPD has to be turned on. In addition, add stereo mix input
forcibly for avoiding the weird KDE behavior by this update.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=88251
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Jurgen Kramer [Wed, 17 Dec 2014 16:45:20 +0000 (17:45 +0100)]
ALSA: usb-audio: add native DSD support for Matrix Audio DACs
This patch adds native DSD support for two XMOS based DACs from Matrix Audio:
- X-Sabre
- Mini-i Pro
Signed-off-by: Jurgen Kramer <gtmkramer@xs4all.nl>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Kailang Yang [Wed, 17 Dec 2014 09:39:05 +0000 (17:39 +0800)]
ALSA: hda/realtek - New codec support for ALC256
Add new support for ALC256 codec.
Signed-off-by: Kailang Yang <kailang@realtek.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Kailang Yang [Wed, 17 Dec 2014 09:08:59 +0000 (17:08 +0800)]
ALSA: hda/realtek - Add new Dell desktop for ALC3234 headset mode
New Dell desktop needs to support headset mode for ALC3234.
Signed-off-by: Kailang Yang <kailang@realtek.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai [Tue, 16 Dec 2014 20:40:02 +0000 (21:40 +0100)]
Merge tag 'asoc-v3.19-2' of git://git./linux/kernel/git/broonie/sound into for-linus
ASoC: Merge window fixes for v3.19
A smattering of driver specific fixes here, some more cleanup of the
Exynos7 and Intel ACPI support plus a fix for register cache sync on the
pcm512x driver which has been lurking for a while.
Mark Brown [Tue, 16 Dec 2014 11:52:34 +0000 (11:52 +0000)]
Merge remote-tracking branches 'asoc/fix/atmel', 'asoc/fix/intel', 'asoc/fix/rt5645', 'asoc/fix/rt5677' and 'asoc/fix/samsung' into asoc-linus
Kevin Strasser [Tue, 16 Dec 2014 00:15:04 +0000 (16:15 -0800)]
ASoC: Intel: fix possible acpi enumeration panic
A crash can occur on some platforms where adsp is enumerated but codec is not
matched. Define codec_id as a pointer intead of an array so that it gets
initialized to NULL for the terminating element of sst_acpi_bytcr[] and
sst_acpi_chv[].
Signed-off-by: Kevin Strasser <kevin.strasser@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Libin Yang [Tue, 16 Dec 2014 05:17:34 +0000 (13:17 +0800)]
ALSA: hda/hdmi - apply Haswell fix-ups to Skylake display codec
Skylake and Haswell have the same behavior on display audio. So this patch
applys Haswell fix-ups to Skylake.
Signed-off-by: Libin Yang <libin.yang@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Wei Yongjun [Tue, 9 Dec 2014 13:14:37 +0000 (21:14 +0800)]
ASoC: Intel: fix return value check in sst_acpi_probe()
In case of error, the function platform_device_register_data()
returns ERR_PTR() and never returns NULL. The NULL test in the
return value check should be replaced with IS_ERR().
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Mark Brown <broonie@kernel.org>
Takashi Iwai [Mon, 15 Dec 2014 12:43:59 +0000 (13:43 +0100)]
ALSA: hda - Make add_stereo_mix_input flag tristate
... for distinguishing whether it's explicitly enabled via a user hint
or enabled by a driver as a fallback. Now the former case corresponds
to HDA_HINT_STEREO_MIX_ENABLE while the latter to
HDA_HINT_STEREO_MIX_AUTO.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai [Mon, 15 Dec 2014 12:40:42 +0000 (13:40 +0100)]
ALSA: hda - Create capture source ctls when stereo mix input is added
When the stereo mix input is explicitly enabled via a user hint, the
driver should create always a capture source enum ctl and disable the
auto-mic switch. Otherwise the behavior gets confused. For doing it,
this patch just sets spec->suppress_auto_mic flag appropriately.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai [Mon, 15 Dec 2014 12:39:10 +0000 (13:39 +0100)]
ALSA: hda - Fix typos in snd_hda_get_int_hint() kerneldoc comments
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Libin Yang [Mon, 15 Dec 2014 04:49:42 +0000 (12:49 +0800)]
ALSA: hda - add codec ID for Skylake display audio codec
This patch adds codec ID (0x80862809) and module alias for Skylake
display codec.
Signed-off-by: Libin Yang <libin.yang@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Dan Carpenter [Fri, 12 Dec 2014 19:27:03 +0000 (22:27 +0300)]
ALSA: oxfw: some signedness bugs
This code tends to use unsigned variables by default and it causes
signedness bugs when we use negative variables for error handling.
The "i" and "j" variables are used to iterated over small positive
values and so they should be type "int". The "len" variable doesn't
*need* to be signed but it should be signed to make the code easier to
read and audit.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Dan Carpenter [Fri, 12 Dec 2014 19:28:10 +0000 (22:28 +0300)]
ALSA: oxfw: fix detect_loud_models() return value
This code causes a static checker warning:
sound/firewire/oxfw/oxfw.c:46 detect_loud_models()
warn: signedness bug returning '(-2)'
The detect_loud_models() function should return false on falure, so that
we don't try to set up the loud code for hardware that doesn't support
it.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Ben Zhang [Thu, 11 Dec 2014 04:15:25 +0000 (20:15 -0800)]
ASoC: rt5677: add REGMAP_I2C and REGMAP_IRQ dependency
The codec driver uses regmap to do i2c read/write.
The codec driver started to use REGMAP_IRQ since:
5e3363ad1b7b2e1f197a3f56b01e21cb155ad454
ASoC: rt5677: add GPIO IRQ support
Signed-off-by: Ben Zhang <benzh@chromium.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
Dan Carpenter [Wed, 10 Dec 2014 13:26:21 +0000 (16:26 +0300)]
ALSA: pcxhr: NULL dereference on probe failure
"card" is NULL if snd_card_new() fails.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Dan Carpenter [Wed, 10 Dec 2014 13:06:46 +0000 (16:06 +0300)]
ALSA: lola: NULL dereference on probe failure
"card" is NULL if snd_card_new() fails.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai [Wed, 10 Dec 2014 12:58:37 +0000 (13:58 +0100)]
ALSA: hda - Add "eapd" model string for
AD1986A codec
Also update the documentation to the latest state.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai [Tue, 9 Dec 2014 18:58:53 +0000 (19:58 +0100)]
ALSA: hda - Add EAPD fixup for ASUS Z99He laptop
The same fixup to enable EAPD is needed for ASUS Z99He with
AD1986A
codec like another ASUS machine.
Reported-and-tested-by: Dmitry V. Zimin <pfzim@mail.ru>
Cc: <stable@vger.kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Sakamoto [Mon, 8 Dec 2014 15:10:49 +0000 (00:10 +0900)]
ALSA: oxfw: Add hwdep interface
This interface is designed for mixer/control application. By using this
interface, an application can get information about firewire node, can
lock/unlock kernel streaming and can get notification at starting/stopping
kernel streaming.
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Acked-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Sakamoto [Mon, 8 Dec 2014 15:10:48 +0000 (00:10 +0900)]
ALSA: oxfw: Add support for capture/playback MIDI messages
This commit adds MIDI functionality with an assumption of 'if the device
has MIDI comformant data channels in its stream formation, the device has
one MIDI port'.
When no streams have already started, MIDI functionality starts stream
with current sampling rate.
When MIDI functionality has already starts some streams and PCM
functionality is going to start streams at different sampling rate,
this driver stops streams once and changes sampling rate, then restarts
streams for both PCM/MIDI substreams.
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Acked-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Sakamoto [Mon, 8 Dec 2014 15:10:47 +0000 (00:10 +0900)]
ALSA: oxfw: add support for capturing PCM samples
In previous commit, a support for transmitted packets is added. This commit
add a support for capturing PCM samples.
When any streams are already started, this driver should not change sampling
rate of the device, thus this commit also adds a restriction of sampling rate
in this situation.
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Acked-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Sakamoto [Mon, 8 Dec 2014 15:10:46 +0000 (00:10 +0900)]
ALSA: oxfw: Add support AMDTP in-stream
Previous commit adds support for some devices which can capture PCM samples.
These devices transmit AMDTP stream in non-blocking mode. This commit adds
functionality to handle AMDTP incoming stream.
OXFW seems to have two quirks:
- Transmits packets with non-zero dbc in its beginning
- Transmits packets with wrong values in syt field
For the first quirk, this commit adds CIP_SKIP_INIT_DBC_CHECK flag for
incoming stream to skip first check of dbc.
For the second quirk, this commit doesn't add duplex stream which
Fireworks/BeBoB drivers use. So OXFW driver generates syt value for outgoing
stream.
Here are examples of a sequence of packets transmitted by Behringer F-Control
Audio 202. There are differences between sequences of syt value when OXFW
driver transfers outgoing stream or not.
When driver gives no outgoing stream:
Index Payload CIP_Header_0 CIP_Header_1
38 14
00020092 900103D1
39 12
00020098 900102FF
40 12
0002009D 9001027F
41 14
000200A2 90010396
42 14
000200A8 900102E8
43 12
000200AE 90010219
44 14
000200B3 90010331
45 12
000200B9 9001025F
46 14
000200BE 90010376
47 12
000200C4 900102A1
00 12
000200C9 9001023E
01 14
000200CE 90010358
02 12
000200D4 90010289
03 16
000200D9 900103A3
04 12
000200E0 900102DD
05 14
000200E5 900103F1
06 12
000200EB 90010335
07 12
000200F0 90010263
08 14
000200F5 9001037C
09 12
000200FB 900102AE
When driver gives outgoing stream:
Index Payload CIP_Header_0 CIP_Header_1
38 12
000200BD 900104A8
39 14
000200C2 900104A8
40 12
000200C8 900104AC
41 14
000200CD 900104A9
42 12
000200D3 900104B1
43 14
000200D8 900104A8
44 12
000200DE 900104AA
45 14
000200E3 900104A9
46 14
000200E9 900104AE
47 12
000200EF 900104A8
00 14
000200F4 900104AD
01 12
000200FA 900104A7
02 14
000200FF 900104A9
03 12
00020005 900104A9
04 14
0002000A 900104B1
05 12
00020010 900104AA
06 14
00020015 900104AD
07 12
0002001B 900104A7
08 14
00020020 900104AC
09 12
00020026 900104A7
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Acked-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Sakamoto [Mon, 8 Dec 2014 15:10:45 +0000 (00:10 +0900)]
ALSA: oxfw: Add support for Behringer/Mackie devices
Some devices produced by Behringer/Mackie are based on OXFW970/971. This
commit adds support for them. Additionally, this commit changes the way to
name card with some information in config rom.
Ids of some Mackie(Loud) models are not identified, therefore this commit
applies name detection for these models.
The devices support capture/playback of PCM-samples and some of them
supports capture/playback of MIDI messages. These functionalities are
implemented by followed commits.
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Acked-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Sakamoto [Mon, 8 Dec 2014 15:10:44 +0000 (00:10 +0900)]
ALSA: oxfw: Change the way to start stream
In past commit, this driver can keep stream formations for each sampling
rate. So its stream functionality can decide stream formations with given
some parameters.
This commit moves related codes from PCM functionality to stream
functionality. Furthermore, to set stream format correctly, this commit
uses AV/C Stream Format Information command instead of AV/C Input/Output
Plug Signal Format command.
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Acked-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Sakamoto [Mon, 8 Dec 2014 15:10:43 +0000 (00:10 +0900)]
ALSA: oxfw: Add proc interface for debugging purpose
This commit adds proc interface to get information about stream
formation. This commit also adds snd_oxfw_stream_get_current_formation()
to get current stream formation.
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Acked-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Sakamoto [Mon, 8 Dec 2014 15:10:42 +0000 (00:10 +0900)]
ALSA: oxfw: Change the way to make PCM rules/constraints
In previous commit, this driver can get to know stream formations at
each supported sampling rates. This commit uses it to make PCM
rules/constraints and obsoletes hard-coded rules/constraints.
For this purpose, this commit adds 'struct snd_oxfw_stream_formation' and
snd_oxfw_stream_parse_format() to parse data channel formation of data
block.
According to datasheet of OXFW970/971, they support 32.0kHz to 196.0kHz.
As long as developers investigate, some devices are confirmed to have
several formats for the same sampling rate.
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Acked-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Sakamoto [Mon, 8 Dec 2014 15:10:41 +0000 (00:10 +0900)]
ALSA: oxfw: Add support for AV/C stream format command to get/set supported stream formation
OXFW970/971 may supports AV/C Stream Format Information Specification 1.1
Working Draft (Apr 2005, 1394TA). By using this command, drivers can get to know
stream formations which device supports.
This commit adds 'EXTENDED STREAM FORMAT INFORMATION' command. This command
has two subfunctions, 'SINGLE' and 'LIST'. Drivers can use 'SINGLE' subfunction
to know/set current formation of AMDTP stream, Drivers can use 'LIST'
subfunction to know an available formation of AMDTP stream in a certain sampling
rate.
But some devices don't implement the 'LIST' subfunction. So this commit uses
an assumption that 'if they don't implement it, they don't change stream
formation depending on current each sampling rate'. With this assumption, this
driver generates formations for such devices by:
1.getting current formation by SINGLE subfunction
2.getting supported sampling rates
3.applying current formation for all of supported sampling rates
Followed commit implements a parser of this format information.
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Acked-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Sakamoto [Mon, 8 Dec 2014 15:10:40 +0000 (00:10 +0900)]
ALSA: oxfw: Change the way to name card
This is a preparation for more models. In following commit, members
of 'struct snd_card' related to name becomes to consists of vendor and
model strings in device's config-rom.
Current supported devices also has strings in their config rom, but the
strings are too long to name sound card, thus this driver still keep
hard-coded vendor and model names for them.
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Acked-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Sakamoto [Mon, 8 Dec 2014 15:10:39 +0000 (00:10 +0900)]
ALSA: dice: Add support for MIDI capture/playback
This commit adds a support for MIDI capture/playback
When MIDI substrams already start streaming and PCM substreams are going to
join at different sampling rate, streams are stopped once. Then sampling rate
is changed and streams are restarted.
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Acked-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Sakamoto [Mon, 8 Dec 2014 15:10:38 +0000 (00:10 +0900)]
ALSA: dice: Add support for capturing PCM samples
This commit adds a support for capturing PCM samples.
When opposite PCM substream is already running, available sampling rate is
limited at current one.
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Acked-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Sakamoto [Mon, 8 Dec 2014 15:10:37 +0000 (00:10 +0900)]
ALSA: dice: Support for non SYT-Match sampling clock source mode
This commit allows this driver to handle devices with non SYT-Match
sampling clock source.
When sampling clock source is SYT-Match mode, devices handle
'presentation timestamp' in received packets and generates sampling clock
according to the information. In this case, driver is synchronization master
and must transfer correct value in SYT field of each packets in outgoing
stream, then the outgoing stream is a master stream.
On the other hand, non SYT-Match mode, devices do this. So drivers must pick
up the value in SYT field of incoming packets and use the value for outgoing
stream. Currently firewire-lib module achieve this work.
Furthermore, without SYT-Match and internal clock source, the sampling rate
should be fixed for the other devices connected to the handled device. This
commit add a restriction of sampling rate at this situation.
With these implementations, this driver has no need to set clock source.
This commit remove set function.
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Acked-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Sakamoto [Mon, 8 Dec 2014 15:10:36 +0000 (00:10 +0900)]
ALSA: dice: Add support for duplex streams with synchronization
This commit adds support for AMDTP in-stream. As a result, Dice driver
supports full duplex streams with synchronization.
AMDTP can transfer timestamps in its packets. By handling the timestamp,
devices can synchronize to the other devices or drivers on the same bus.
When Dice chipset is 'enabled', it starts streams with correct settings.
This 'enable' register is global, thus, when a stream is started to run,
an opposite stream can't start unless turning off 'enable'. Therefore
a pair of streams must be running. This causes a loss of CPU usage when
single stream is needed for neither playbacking or capturing.
This commit assumes that playback-only models also have a functionality
to transmit stream for delivering timestamps.
Currently, sampling clock source is restricted to SYT-Match mode. This is
improved in followed commit. I note that at SYT-Match mode, Dice can select
from 4 streams for synchronization but this driver uses the 1st stream only
for simplicity.
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Acked-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Sakamoto [Mon, 8 Dec 2014 15:10:35 +0000 (00:10 +0900)]
ALSA: dice: Change the way to start stream
Streaming functionality can start streams when rate is given but currently
some codes are in PCM functionality.
This commit changes the way to start stream and add some arrangement
to make it easy to understand the way.
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Acked-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Bard Liao [Tue, 9 Dec 2014 02:14:45 +0000 (10:14 +0800)]
ASoC: rt5645: Fix potential crash in jd function
If no one defined the rt5645->pdata.hp_det_gpio in coreboot/bios.
It will cause kernel to reboot because rt5645->pdata.hp_det_gpio
is 0. So it is worth to add a check in rt5645_jack_detect.
Signed-off-by: Bard Liao <bardliao@realtek.com>
Signed-off-by: Fang, Yang A <yang.a.fang@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Sylwester Nawrocki [Mon, 8 Dec 2014 17:45:54 +0000 (18:45 +0100)]
ASoC: samsung: i2s: Add missing assignment of variant_regs
Add assignment of the variant_regs field which is missing in commit
a5a56871f804edac93a53b5e871c0e9818fb9033 ("ASoC: samsung: add support
for exynos7 I2S controller"). Without this attempting to probe the
secondary DAI fails with an error like:
[ 1.763026] Unable to handle kernel NULL pointer dereference at virtual address
0000000c
[ 1.780895] pgd =
c0004000
[ 1.783606] [
0000000c] *pgd=
00000000
[ 1.838255] Internal error: Oops: 5 [#1] PREEMPT SMP ARM
[ 1.843514] Modules linked in:
[ 1.846558] CPU: 0 PID: 1 Comm: swapper/0 Not tainted
3.18.0-rc1-00009-g5dcb01e-dirty #1521
[ 1.854887] task:
ee00a800 ti:
ee088000 task.ti:
ee088000
[ 1.860284] PC is at i2s_txctrl+0x40/0x2d4
[ 1.864350] LR is at i2s_txctrl+0x28/0x2d4
[ 1.868428] pc : [<
c036ffd4>] lr : [<
c036ffbc>] psr:
60000153
[ 1.868428] sp :
ee089dc0 ip :
00000000 fp :
ee21f000
[ 1.879883] r10:
00000000 r9 :
ee21fb00 r8 :
c06406c4
[ 1.885091] r7 :
ee21fb00 r6 :
00000000 r5 :
f00f6000 r4 :
ed943410
[ 1.891601] r3 :
0000016c r2 :
c0464550 r1 :
c055cef8 r0 :
ed943610
[ 1.898113] Flags: nZCv IRQs on FIQs off Mode SVC_32 ISA ARM Segment kernel
[ 1.905490] Control:
10c5387d Table:
4000404a DAC:
00000015
[ 1.911218] Process swapper/0 (pid: 1, stack limit = 0xee088240)
[ 1.917208] Stack: (0xee089dc0 to 0xee08a000)
...
[ 2.068431] [<
c036ffd4>] (i2s_txctrl) from [<
c03719fc>] (samsung_i2s_dai_probe+0xb8/0x450)
[ 2.076676] [<
c03719fc>] (samsung_i2s_dai_probe) from [<
c03607e0>] (snd_soc_register_card+0xd98/0x1348)
[ 2.086044] [<
c03607e0>] (snd_soc_register_card) from [<
c03726e4>] (odroidx2_audio_probe+0xa8/0x11c)
[ 2.095160] [<
c03726e4>] (odroidx2_audio_probe) from [<
c0249dd0>] (platform_drv_probe+0x48/0xa4)
[ 2.103922] [<
c0249dd0>] (platform_drv_probe) from [<
c0248988>] (driver_probe_device+0x10c/0x22c)
[ 2.112773] [<
c0248988>] (driver_probe_device) from [<
c0248b34>] (__driver_attach+0x8c/0x90)
[ 2.121192] [<
c0248b34>] (__driver_attach) from [<
c02471c8>] (bus_for_each_dev+0x54/0x88)
[ 2.129352] [<
c02471c8>] (bus_for_each_dev) from [<
c0248188>] (bus_add_driver+0xd4/0x1d0)
[ 2.137510] [<
c0248188>] (bus_add_driver) from [<
c024915c>] (driver_register+0x78/0xf4)
[ 2.145499] [<
c024915c>] (driver_register) from [<
c0008924>] (do_one_initcall+0x80/0x1b8)
[ 2.153670] [<
c0008924>] (do_one_initcall) from [<
c05b7d40>] (kernel_init_freeable+0xfc/0x1c8)
[ 2.162260] [<
c05b7d40>] (kernel_init_freeable) from [<
c04146c0>] (kernel_init+0x8/0xec)
[ 2.170330] [<
c04146c0>] (kernel_init) from [<
c000e7f8>] (ret_from_fork+0x14/0x3c)
[ 2.177873] Code:
e5940000 e59f128c e59f228c e2800010 (
e59c700c)
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Peter Rosin [Mon, 8 Dec 2014 15:33:11 +0000 (16:33 +0100)]
ASoC: pcm512x: Trigger auto-increment of register addresses on i2c
When the codec is connected using i2c, it will only auto-increment
register addresses if msb (0x80) of the register address byte is set.
[Fixes cache sync if multiple adjacent registers are updated -- broonie]
Signed-off-by: Peter Rosin <peda@axentia.se>
Signed-off-by: Mark Brown <broonie@kernel.org>
Cc: stable@vger.kernel.org
Takashi Iwai [Mon, 8 Dec 2014 14:44:47 +0000 (15:44 +0100)]
ALSA: jack: Add dummy snd_jack_set_key() definition
For fixing a build error with CONFIG_SND_JACK=n
sound/soc/codecs/ts3a227e.c:223:2: error: implicit declaration of function ‘snd_jack_set_key’ [-Werror=implicit-function-declaration]
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai [Mon, 8 Dec 2014 14:04:02 +0000 (15:04 +0100)]
Merge tag 'asoc-v3.19' of git://git./linux/kernel/git/broonie/sound into for-linus
ASoC: Updates for v3.19
Lots and lots of changes this time around, the usual set of driver
updates and a huge bulk of cleanups from Lars-Peter. Probably the most
interesting thing for most users is the Intel driver updates which will
(with some more machine integration work) enable support for newer x86
laptops.
- Conversion of AC'97 drivers to use regmap, bringing us closer to the
removal of the ASoC level I/O code.
- Clean up a lot of old drivers that were open coding things that have
subsequently been implemented in the core.
- Some DAPM performance improvements.
- Removal of the now seldom used CODEC mutex.
- Lots of updates for the newer Intel SoC support, including support
for the DSP and some Cherrytrail and Braswell machine drivers.
- Support for Samsung boards using rt5631 as the CODEC.
- Removal of the obsolete
AFEB9260 machine driver.
- Driver support for the TI TS3A227E headset driver used in some
Chrombeooks.
Mark Brown [Mon, 8 Dec 2014 13:12:36 +0000 (13:12 +0000)]
Merge remote-tracking branches 'asoc/topic/wm9090', 'asoc/topic/wm9712' and 'asoc/topic/wm9713' into asoc-next
Mark Brown [Mon, 8 Dec 2014 13:12:34 +0000 (13:12 +0000)]
Merge remote-tracking branches 'asoc/topic/wm8991', 'asoc/topic/wm8993', 'asoc/topic/wm8994', 'asoc/topic/wm8995' and 'asoc/topic/wm9081' into asoc-next
Mark Brown [Mon, 8 Dec 2014 13:12:32 +0000 (13:12 +0000)]
Merge remote-tracking branches 'asoc/topic/wm8978', 'asoc/topic/wm8983', 'asoc/topic/wm8985', 'asoc/topic/wm8988' and 'asoc/topic/wm8990' into asoc-next
Mark Brown [Mon, 8 Dec 2014 13:12:30 +0000 (13:12 +0000)]
Merge remote-tracking branches 'asoc/topic/wm8955', 'asoc/topic/wm8960', 'asoc/topic/wm8961', 'asoc/topic/wm8962' and 'asoc/topic/wm8974' into asoc-next
Mark Brown [Mon, 8 Dec 2014 13:12:28 +0000 (13:12 +0000)]
Merge remote-tracking branches 'asoc/topic/wm8776', 'asoc/topic/wm8804', 'asoc/topic/wm8900', 'asoc/topic/wm8903' and 'asoc/topic/wm8940' into asoc-next
Mark Brown [Mon, 8 Dec 2014 13:12:25 +0000 (13:12 +0000)]
Merge remote-tracking branches 'asoc/topic/wm8711', 'asoc/topic/wm8728', 'asoc/topic/wm8731', 'asoc/topic/wm8737' and 'asoc/topic/wm8750' into asoc-next
Mark Brown [Mon, 8 Dec 2014 13:12:23 +0000 (13:12 +0000)]
Merge remote-tracking branches 'asoc/topic/wm8350', 'asoc/topic/wm8400', 'asoc/topic/wm8510', 'asoc/topic/wm8523' and 'asoc/topic/wm8580' into asoc-next
Mark Brown [Mon, 8 Dec 2014 13:12:21 +0000 (13:12 +0000)]
Merge remote-tracking branches 'asoc/topic/twl6040', 'asoc/topic/uda134x', 'asoc/topic/uda1380' and 'asoc/topic/wl1273' into asoc-next
Mark Brown [Mon, 8 Dec 2014 13:12:19 +0000 (13:12 +0000)]
Merge remote-tracking branches 'asoc/topic/tlv320aic32x4', 'asoc/topic/tlv320aic3x', 'asoc/topic/tlv320dac33', 'asoc/topic/ts3a227e' and 'asoc/topic/twl4030' into asoc-next
Mark Brown [Mon, 8 Dec 2014 13:12:16 +0000 (13:12 +0000)]
Merge remote-tracking branches 'asoc/topic/tas2552', 'asoc/topic/tegra', 'asoc/topic/tfa9879', 'asoc/topic/tlv320aic23' and 'asoc/topic/tlv320aic31xx' into asoc-next
Mark Brown [Mon, 8 Dec 2014 13:12:14 +0000 (13:12 +0000)]
Merge remote-tracking branches 'asoc/topic/ssm4567', 'asoc/topic/sta32x', 'asoc/topic/sta350', 'asoc/topic/sta529' and 'asoc/topic/stac9766' into asoc-next
Mark Brown [Mon, 8 Dec 2014 13:12:12 +0000 (13:12 +0000)]
Merge remote-tracking branches 'asoc/topic/sh', 'asoc/topic/sigmadsp', 'asoc/topic/simple', 'asoc/topic/sirf' and 'asoc/topic/sn95031' into asoc-next
Mark Brown [Mon, 8 Dec 2014 13:12:09 +0000 (13:12 +0000)]
Merge remote-tracking branches 'asoc/topic/rt5645', 'asoc/topic/rt5670', 'asoc/topic/rt5677', 'asoc/topic/samsung' and 'asoc/topic/sgtl5000' into asoc-next
Mark Brown [Mon, 8 Dec 2014 13:12:07 +0000 (13:12 +0000)]
Merge remote-tracking branches 'asoc/topic/rcar', 'asoc/topic/rockchip', 'asoc/topic/rt286' and 'asoc/topic/rt5631' into asoc-next
Mark Brown [Mon, 8 Dec 2014 13:12:05 +0000 (13:12 +0000)]
Merge remote-tracking branches 'asoc/topic/multi-codec', 'asoc/topic/mxs-saif', 'asoc/topic/mxs-sgtl5000', 'asoc/topic/omap' and 'asoc/topic/pxa' into asoc-next
Mark Brown [Mon, 8 Dec 2014 13:12:02 +0000 (13:12 +0000)]
Merge remote-tracking branches 'asoc/topic/max98088', 'asoc/topic/max98090', 'asoc/topic/max98095', 'asoc/topic/max9850' and 'asoc/topic/mop500' into asoc-next
Mark Brown [Mon, 8 Dec 2014 13:12:00 +0000 (13:12 +0000)]
Merge remote-tracking branches 'asoc/topic/hdmi', 'asoc/topic/intel', 'asoc/topic/jack', 'asoc/topic/jz4740' and 'asoc/topic/lm49453' into asoc-next
Mark Brown [Mon, 8 Dec 2014 13:11:58 +0000 (13:11 +0000)]
Merge remote-tracking branches 'asoc/topic/fsl', 'asoc/topic/fsl-card', 'asoc/topic/fsl-dt' and 'asoc/topic/fsl-ssi' into asoc-next
Mark Brown [Mon, 8 Dec 2014 13:11:56 +0000 (13:11 +0000)]
Merge remote-tracking branches 'asoc/topic/davinci', 'asoc/topic/doc', 'asoc/topic/dpcm', 'asoc/topic/dwc' and 'asoc/topic/fsi' into asoc-next
Mark Brown [Mon, 8 Dec 2014 13:11:54 +0000 (13:11 +0000)]
Merge remote-tracking branches 'asoc/topic/cs4265', 'asoc/topic/cs4271', 'asoc/topic/cs42l51' and 'asoc/topic/cs42l73' into asoc-next
Mark Brown [Mon, 8 Dec 2014 13:11:52 +0000 (13:11 +0000)]
Merge remote-tracking branches 'asoc/topic/codec-mutex', 'asoc/topic/compress' and 'asoc/topic/cq93vc' into asoc-next
Mark Brown [Mon, 8 Dec 2014 13:11:50 +0000 (13:11 +0000)]
Merge remote-tracking branches 'asoc/topic/ak4671', 'asoc/topic/alc5623', 'asoc/topic/alc5632', 'asoc/topic/arizona' and 'asoc/topic/atmel' into asoc-next
Mark Brown [Mon, 8 Dec 2014 13:11:48 +0000 (13:11 +0000)]
Merge remote-tracking branches 'asoc/topic/adav80x', 'asoc/topic/adsp', 'asoc/topic/ak4535', 'asoc/topic/ak4641' and 'asoc/topic/ak4642' into asoc-next
Mark Brown [Mon, 8 Dec 2014 13:11:45 +0000 (13:11 +0000)]
Merge remote-tracking branches 'asoc/topic/ac97', 'asoc/topic/ad193x', 'asoc/topic/adau1373' and 'asoc/topic/adau17x1' into asoc-next
Mark Brown [Mon, 8 Dec 2014 13:11:45 +0000 (13:11 +0000)]
Merge remote-tracking branch 'asoc/topic/fsl-esai' into asoc-next
Mark Brown [Mon, 8 Dec 2014 13:11:45 +0000 (13:11 +0000)]
Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next
Mark Brown [Mon, 8 Dec 2014 13:11:44 +0000 (13:11 +0000)]
Merge remote-tracking branch 'asoc/topic/core' into asoc-next
Mark Brown [Mon, 8 Dec 2014 13:11:44 +0000 (13:11 +0000)]
Merge remote-tracking branch 'asoc/topic/cache' into asoc-next
Mark Brown [Mon, 8 Dec 2014 13:11:40 +0000 (13:11 +0000)]
Merge remote-tracking branches 'asoc/fix/adsp', 'asoc/fix/davinci', 'asoc/fix/max98090', 'asoc/fix/sigmadsp' and 'asoc/fix/tlv320aic31xx' into asoc-linus
Mark Brown [Mon, 8 Dec 2014 13:11:39 +0000 (13:11 +0000)]
Merge remote-tracking branch 'asoc/fix/pcm' into asoc-linus
Mark Brown [Fri, 5 Dec 2014 20:06:31 +0000 (20:06 +0000)]
ASoC: wm5102: Initialize dac_comp_lock mutex
Commit
d74bcaaeb6682 (ASoC: wm5102: Move ultrasonic response settings
lock to the driver level) created a driver local mutex for protecting
the ultrasonic response settings but neglected to initialize that mutex,
causing loud complaints from lockep and potential runtime failures. Fix
this by initializing the mutex.
Signed-off-by: Mark Brown <broonie@kernel.org>
Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Mark Brown [Fri, 5 Dec 2014 19:56:17 +0000 (19:56 +0000)]
ASoC: samsung: Fix non-DT use of I2S controller
The changes in commit
a5a56871f804e (ASoC: samsung: add support for exynos7
I2S controller) introduce a new variant_regs structure in the driver data
which is now mandatory for accessing registers. Unfortunately this is only
hooked up for DT platforms so non-DT platforms like my primary development
platform for audio are broken by this change and crash on boot.
Since the only non-DT user of these device is s3c64xx fix this by making
the standard samsung-i2s device be of type I2Sv3 and add a new I2Sv4 name
to the platform data section, currently using the I2Sv5 information which
should be about right.
Signed-off-by: Mark Brown <broonie@kernel.org>
Matthieu Crapet [Mon, 8 Dec 2014 10:58:29 +0000 (11:58 +0100)]
ASoC: atmel_ssc_dai/trivial: typo fix
Signed-off-by: Matthieu Crapet <mcrapet@gmail.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Takashi Iwai [Mon, 8 Dec 2014 10:33:24 +0000 (11:33 +0100)]
Merge branch 'for-next' into for-linus
Linus Torvalds [Sun, 7 Dec 2014 22:21:05 +0000 (14:21 -0800)]
Linux 3.18
Linus Torvalds [Sun, 7 Dec 2014 20:00:14 +0000 (12:00 -0800)]
Merge branch 'for-3.18-fixes' of git://git./linux/kernel/git/tj/libata
Pull libata fixes from Tejun Heo:
"Three libata fixes for v3.18. Nothing too interesting. PCI ID ID and
quirk additions to ahci and an error handling path fix in sata_fsl"
* 'for-3.18-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
ahci: disable MSI on SAMSUNG 0xa800 SSD
sata_fsl: fix error handling of irq_of_parse_and_map
AHCI: Add DeviceIDs for Sunrise Point-LP SATA controller
Kuninori Morimoto [Thu, 27 Nov 2014 08:08:10 +0000 (08:08 +0000)]
ASoC: rsnd: rename SSI function name of PIO
Current R-Car sound SSI PIO/DMA mode are using interrupt.
it is no longer "xxx_pio_xxx", rename it.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Kuninori Morimoto [Thu, 27 Nov 2014 08:07:47 +0000 (08:07 +0000)]
ASoC: rsnd: add salvage support for under/over flow error on SSI
L/R channel will be switched if under/over flow error happen on
Renesas R-Car sound device by the HW bugs. Then, HW restart is required
for salvage. This patch add salvage support for SSI.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Takashi Iwai [Sat, 6 Dec 2014 17:02:55 +0000 (18:02 +0100)]
ALSA: usb-audio: Don't resubmit pending URBs at MIDI error recovery
In snd_usbmidi_error_timer(), the driver tries to resubmit MIDI input
URBs to reactivate the MIDI stream, but this causes the error when
some of URBs are still pending like:
WARNING: CPU: 0 PID: 0 at ../drivers/usb/core/urb.c:339 usb_submit_urb+0x5f/0x70()
URB
ef705c40 submitted while active
CPU: 0 PID: 0 Comm: swapper/0 Not tainted 3.16.6-2-desktop #1
Hardware name: FOXCONN TPS01/TPS01, BIOS 080015 03/23/2010
c0984bfa f4009ed4 c078deaf f4009ee4 c024c884 c09a135c f4009f00 00000000
c0984bfa 00000153 c061ac4f c061ac4f 00000009 00000001 ef705c40 e854d1c0
f4009eec c024c8d3 00000009 f4009ee4 c09a135c f4009f00 f4009f04 c061ac4f
Call Trace:
[<
c0205df6>] try_stack_unwind+0x156/0x170
[<
c020482a>] dump_trace+0x5a/0x1b0
[<
c0205e56>] show_trace_log_lvl+0x46/0x50
[<
c02049d1>] show_stack_log_lvl+0x51/0xe0
[<
c0205eb7>] show_stack+0x27/0x50
[<
c078deaf>] dump_stack+0x45/0x65
[<
c024c884>] warn_slowpath_common+0x84/0xa0
[<
c024c8d3>] warn_slowpath_fmt+0x33/0x40
[<
c061ac4f>] usb_submit_urb+0x5f/0x70
[<
f7974104>] snd_usbmidi_submit_urb+0x14/0x60 [snd_usbmidi_lib]
[<
f797483a>] snd_usbmidi_error_timer+0x6a/0xa0 [snd_usbmidi_lib]
[<
c02570c0>] call_timer_fn+0x30/0x130
[<
c0257442>] run_timer_softirq+0x1c2/0x260
[<
c0251493>] __do_softirq+0xc3/0x270
[<
c0204732>] do_softirq_own_stack+0x22/0x30
[<
c025186d>] irq_exit+0x8d/0xa0
[<
c0795228>] smp_apic_timer_interrupt+0x38/0x50
[<
c0794a3c>] apic_timer_interrupt+0x34/0x3c
[<
c0673d9e>] cpuidle_enter_state+0x3e/0xd0
[<
c028bb8d>] cpu_idle_loop+0x29d/0x3e0
[<
c028bd23>] cpu_startup_entry+0x53/0x60
[<
c0bfac1e>] start_kernel+0x415/0x41a
For avoiding these errors, check the pending URBs and skip
resubmitting such ones.
Reported-and-tested-by: Stefan Seyfried <stefan.seyfried@googlemail.com>
Acked-by: Clemens Ladisch <clemens@ladisch.de>
Cc: <stable@vger.kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Linus Torvalds [Sat, 6 Dec 2014 19:27:25 +0000 (11:27 -0800)]
Merge git://www.linux-watchdog.org/linux-watchdog
Pull watchdog fix from Wim Van Sebroeck:
"Fix the watchdog mask bit offset for Exynos7"
* git://www.linux-watchdog.org/linux-watchdog:
watchdog: s3c2410_wdt: Fix the mask bit offset for Exynos7
Linus Torvalds [Sat, 6 Dec 2014 19:26:01 +0000 (11:26 -0800)]
Merge branch 'i2c/for-current' of git://git./linux/kernel/git/wsa/linux
Pull i2c fixes from Wolfram Sang:
"Here are two more driver bugfixes for I2C which would be good to have"
* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
i2c: cadence: Set the hardware time-out register to maximum value
i2c: davinci: generate STP always when NACK is received
Mark Brown [Fri, 5 Dec 2014 19:58:32 +0000 (19:58 +0000)]
ASoC: samsung: Fix error handling for clock lookup
Return the error code we got from clk_get() and check to make sure that
clk_prepare_enable() worked.
Signed-off-by: Mark Brown <broonie@kernel.org>
Alexander Stein [Fri, 5 Dec 2014 19:10:07 +0000 (20:10 +0100)]
ALSA: atmel_abdac: Add missing clock prepare
Clocks must be prepared before enabling them. Do this in one step.
Replace clk_enable with clk_prepare_enable and clk_disable with
clk_disable_unprepare.
Signed-off-by: Alexander Stein <alexanders83@web.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Alexander Stein [Fri, 5 Dec 2014 19:10:06 +0000 (20:10 +0100)]
ALSA: sound/atmel/ac97c.c: Add missing clock prepare
Clocks must be prepared before enabling them. Do this in one step.
Replace clk_enable with clk_prepare_enable and clk_disable with
clk_disable_unprepare. This fixes the following warning:
------------[ cut here ]------------
WARNING: CPU: 0 PID: 1 at drivers/clk/clk.c:895 __clk_enable+0x24/0x9c()
Modules linked in:
CPU: 0 PID: 1 Comm: swapper Tainted: G W 3.18.0-rc7+ #245
[<
c000dce8>] (unwind_backtrace) from [<
c000bcf0>] (show_stack+0x10/0x14)
[<
c000bcf0>] (show_stack) from [<
c001664c>] (warn_slowpath_common+0x60/0x80)
[<
c001664c>] (warn_slowpath_common) from [<
c00166fc>] (warn_slowpath_null+0x18/0x20)
[<
c00166fc>] (warn_slowpath_null) from [<
c02fd7ac>] (__clk_enable+0x24/0x9c)
[<
c02fd7ac>] (__clk_enable) from [<
c02fdbb4>] (clk_enable+0x18/0x2c)
[<
c02fdbb4>] (clk_enable) from [<
c0322688>] (atmel_ac97c_probe+0x154/0x694)
[<
c0322688>] (atmel_ac97c_probe) from [<
c0235e08>] (platform_drv_probe+0x48/0x94)
[<
c0235e08>] (platform_drv_probe) from [<
c02345f8>] (driver_probe_device+0x138/0x350)
[<
c02345f8>] (driver_probe_device) from [<
c02348bc>] (__driver_attach+0x68/0x8c)
[<
c02348bc>] (__driver_attach) from [<
c0232bd0>] (bus_for_each_dev+0x70/0x84)
[<
c0232bd0>] (bus_for_each_dev) from [<
c0233cd8>] (bus_add_driver+0xfc/0x1f8)
[<
c0233cd8>] (bus_add_driver) from [<
c0234f0c>] (driver_register+0x9c/0xe0)
[<
c0234f0c>] (driver_register) from [<
c0008ac4>] (do_one_initcall+0x110/0x1c8)
[<
c0008ac4>] (do_one_initcall) from [<
c053cd58>] (kernel_init_freeable+0xf8/0x1b8)
[<
c053cd58>] (kernel_init_freeable) from [<
c03c0414>] (kernel_init+0x8/0xe4)
[<
c03c0414>] (kernel_init) from [<
c00096d0>] (ret_from_fork+0x14/0x24)
---[ end trace
cb88537fdc8fa201 ]---
atmel_ac97c
fffa0000.sound: AC'97 0 does not respond - RESET
atmel_ac97c
fffa0000.sound: AC'97 0 access is not valid [0xffffffff], removing mixer.
------------[ cut here ]------------
Signed-off-by: Alexander Stein <alexanders83@web.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Abhilash Kesavan [Fri, 17 Oct 2014 16:12:53 +0000 (21:42 +0530)]
watchdog: s3c2410_wdt: Fix the mask bit offset for Exynos7
The watchdog mask bit offset listed for Exynos7 is incorrect.
Fix this.
Signed-off-by: Abhilash Kesavan <a.kesavan@samsung.com>
Acked-by: Naveen Krishna Chatradhi <naveenkrishna.ch@gmail.com
Reviewd-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Linus Torvalds [Fri, 5 Dec 2014 18:47:19 +0000 (10:47 -0800)]
Merge branch 'x86-urgent-for-linus' of git://git./linux/kernel/git/tip/tip
Pull x86 fixes from Thomas Gleixner:
"Two final fixlets for 3.18:
- Prevent microcode reload wreckage on 32bit
- Unbreak cross compilation"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86, microcode: Limit the microcode reloading to 64-bit for now
x86: Use $(OBJDUMP) instead of plain objdump
Linus Torvalds [Fri, 5 Dec 2014 18:39:49 +0000 (10:39 -0800)]
Merge tag 'sound-3.18' of git://git./linux/kernel/git/tiwai/sound
Pull sound fixlet from Takashi Iwai:
"Just one commit for adding a copule of HD-audio quirk entries"
* tag 'sound-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
ALSA: hda/realtek - Add headset Mic support for new Dell machine
Takashi Iwai [Thu, 13 Nov 2014 06:11:38 +0000 (07:11 +0100)]
ALSA: hda - Fix built-in mic at resume on Lenovo Ideapad S210
The built-in mic boost volume gets almost muted after suspend/resume
on Lenovo Ideapad S210.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=88121
Reported-and-tested-by: Roman Kagan <rkagan@mail.ru>
Cc: <stable@vger.kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Alexander Stein [Fri, 5 Dec 2014 14:42:54 +0000 (15:42 +0100)]
ALSA: sound/atmel/ac97c.c: Fix device index for pcm
chip->pdev->id is -1 by default. This is an invalid index resulting in
device file names like /dev/snd/pcmC0D-1p.
Signed-off-by: Alexander Stein <alexanders83@web.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Dylan Reid [Fri, 5 Dec 2014 01:00:13 +0000 (17:00 -0800)]
ASoC: rt5677: make volume TLV closer to reality
The volume blocks have an step of 0.375dB, but TLV uses 0.01dB for
units. Only use the resolution supported, ignoring the LSB of the
volume register. This results in half the steps and 0.75dB per step,
but reports accurate levels through TLV. Update the masks to reflect
that these are registers have the LSB ignored.
Signed-off-by: Dylan Reid <dgreid@chromium.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
Linus Torvalds [Fri, 5 Dec 2014 06:39:37 +0000 (22:39 -0800)]
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull drm intel fixes from Dave Airlie:
"Two intel stable fixes, that should be it from me for this round"
* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
drm/i915: Unlock panel even when LVDS is disabled
drm/i915: More cautious with pch fifo underruns
Linus Torvalds [Fri, 5 Dec 2014 01:48:13 +0000 (17:48 -0800)]
Merge tag 'pm+acpi-3.18-rc8' of git://git./linux/kernel/git/rafael/linux-pm
Pull ACPI backlight fix from Rafael Wysocki:
"This is a simple fix for an ACPI backlight regression introduced by a
recent commit that overlooked a corner case which should have been
taken into account"
* tag 'pm+acpi-3.18-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
ACPI / video: update condition to check if device is in _DOD list
Dave Airlie [Fri, 5 Dec 2014 01:12:29 +0000 (11:12 +1000)]
Merge tag 'drm-intel-fixes-2014-12-04' of git://anongit.freedesktop.org/drm-intel into drm-fixes
Silence some pch fifo underrun reports and panel locking backtraces,
both cc: stable.
* tag 'drm-intel-fixes-2014-12-04' of git://anongit.freedesktop.org/drm-intel:
drm/i915: Unlock panel even when LVDS is disabled
drm/i915: More cautious with pch fifo underruns
Linus Torvalds [Fri, 5 Dec 2014 00:06:02 +0000 (16:06 -0800)]
Merge tag 'media/v3.18-rc8' of git://git./linux/kernel/git/mchehab/linux-media
Pull media fixes from Mauro Carvalho Chehab:
"A core fix and some driver fixes:
- regression fix in Remote Controller core affecting RC6 protocol
handling
- fix video buffer handling in cx23885
- race fix in solo6x10
- fix image selection in smiapp
- fix reported payload size on s2255drv
- two updates for MAINTAINERS file"
* tag 'media/v3.18-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
[media] rc-core: fix toggle handling in the rc6 decoder
MAINTAINERS: Update mchehab's addresses
[media] cx23885: use sg = sg_next(sg) instead of sg++
[media] s2255drv: fix payload size for JPG, MJPEG
[media] Update MAINTAINERS for solo6x10
[media] solo6x10: fix a race in IRQ handler
[media] smiapp: Only some selection targets are settable
Masahiro Yamada [Thu, 4 Dec 2014 22:42:25 +0000 (14:42 -0800)]
uapi: fix to export linux/vm_sockets.h
A typo "header=y" was introduced by commit
7071cf7fc435 ("uapi: add
missing network related headers to kbuild").
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Stephen Hemminger <stephen@networkplumber.org>
Cc: David Miller <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Jiada Wang [Tue, 2 Dec 2014 05:55:06 +0000 (14:55 +0900)]
ASoC: fsl_ssi: fix error path in probe
SSI component isn't unregistered if fsl_ssi_debugfs_create() fails
in probe phase.
To fix it, this commit replaces label error_asoc_register with
error_irq.
Signed-off-by: Jiada Wang <jiada_wang@mentor.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Fabio Estevam [Mon, 1 Dec 2014 21:57:14 +0000 (19:57 -0200)]
ASoC: fsl_ssi: Fix module unbound
Trying to remove the snd-soc-fsl-ssi module leads to the following warning:
[ 31.515336] ------------[ cut here ]------------
[ 31.520091] WARNING: CPU: 2 PID: 434 at fs/proc/generic.c:521 remove_proc_entry+0x14c/0x16c()
[ 31.528708] remove_proc_entry: removing non-empty directory 'irq/79', leaking at least '
202c000.ss'
[ 31.537911] Modules linked in: snd_soc_wm8962 snd_soc_imx_wm8962 snd_soc_fsl_ssi(-) evbug
[ 31.546249] CPU: 2 PID: 434 Comm: rmmod Not tainted
3.18.0-rc6-00028-g3314bf6-dirty #1
[ 31.554235] Backtrace:
[ 31.556816] [<
80011ea8>] (dump_backtrace) from [<
80012044>] (show_stack+0x18/0x1c)
[ 31.564416] r6:
80142c88 r5:
00000000 r4:
00000000 r3:
00000000
[ 31.570267] [<
8001202c>] (show_stack) from [<
806980ec>] (dump_stack+0x88/0xa4)
[ 31.577588] [<
80698064>] (dump_stack) from [<
80029d78>] (warn_slowpath_common+0x70/0x94)
[ 31.585711] r5:
00000009 r4:
bb61fd90
[ 31.589423] [<
80029d08>] (warn_slowpath_common) from [<
80029e40>] (warn_slowpath_fmt+0x38/0x40)
[ 31.598187] r8:
bb61fdfe r7:
be05d76d r6:
be05d9a8 r5:
00000002 r4:
be05d700
[ 31.605054] [<
80029e0c>] (warn_slowpath_fmt) from [<
80142c88>] (remove_proc_entry+0x14c/0x16c)
[ 31.613709] r3:
806a79c0 r2:
808229a0
[ 31.617371] [<
80142b3c>] (remove_proc_entry) from [<
80070380>] (unregister_irq_proc+0x94/0xb8)
[ 31.625989] r10:
00000000 r8:
8000ede4 r7:
80955f2c r6:
0000004f r5:
8118e738 r4:
be00af00
[ 31.633952] [<
800702ec>] (unregister_irq_proc) from [<
80069dac>] (free_desc+0x2c/0x64)
[ 31.641898] r6:
0000004f r5:
80955f38 r4:
be00af00
[ 31.646604] [<
80069d80>] (free_desc) from [<
80069e68>] (irq_free_descs+0x4c/0x8c)
[ 31.654092] r7:
00000081 r6:
00000001 r5:
0000004f r4:
00000001
[ 31.659863] [<
80069e1c>] (irq_free_descs) from [<
8006fc3c>] (irq_dispose_mapping+0x40/0x5c)
[ 31.668247] r6:
be17b844 r5:
be17b800 r4:
0000004f r3:
802c5ec0
[ 31.673998] [<
8006fbfc>] (irq_dispose_mapping) from [<
7f004ea4>] (fsl_ssi_remove+0x58/0x70 [snd_so)
[ 31.683948] r4:
bb5bba10 r3:
00000001
[ 31.687618] [<
7f004e4c>] (fsl_ssi_remove [snd_soc_fsl_ssi]) from [<
803720a0>] (platform_drv_remove)
[ 31.697564] r5:
7f0064f8 r4:
be17b810
[ 31.701195] [<
80372080>] (platform_drv_remove) from [<
80370494>] (__device_release_driver+0x78/0xc)
[ 31.710361] r5:
7f0064f8 r4:
be17b810
[ 31.713987] [<
8037041c>] (__device_release_driver) from [<
80370d20>] (driver_detach+0xbc/0xc0)
[ 31.722631] r5:
7f0064f8 r4:
be17b810
[ 31.726259] [<
80370c64>] (driver_detach) from [<
80370304>] (bus_remove_driver+0x54/0x98)
[ 31.734382] r6:
00000800 r5:
00000000 r4:
7f0064f8 r3:
bb67f500
[ 31.740149] [<
803702b0>] (bus_remove_driver) from [<
80371398>] (driver_unregister+0x30/0x50)
[ 31.748617] r4:
7f0064f8 r3:
bd9f7080
[ 31.752245] [<
80371368>] (driver_unregister) from [<
80371f3c>] (platform_driver_unregister+0x14/0x)
[ 31.761498] r4:
7f00655c r3:
7f005a70
[ 31.765130] [<
80371f28>] (platform_driver_unregister) from [<
7f005a84>] (fsl_ssi_driver_exit+0x14/)
[ 31.776147] [<
7f005a70>] (fsl_ssi_driver_exit [snd_soc_fsl_ssi]) from [<
8008ed80>] (SyS_delete_mod)
[ 31.786553] [<
8008ec64>] (SyS_delete_module) from [<
8000ec20>] (ret_fast_syscall+0x0/0x48)
[ 31.794824] r6:
00c46d18 r5:
00000800 r4:
00c46d18
[ 31.799530] ---[ end trace
954e8a3a15379e52 ]---
The cause of problem and solution are well explained by Lars-Peter:
"The driver creates the mapping by calling irq_of_parse_and_map(), so it also
has to dispose the mapping. But the easy way out is to simply use
platform_get_irq() instead of irq_of_parse_map(). In this case the mapping is
not managed by the device but by the of core, so the device has not to dispose
the mapping."
Tested on a imx6q-sabresd board.
Reported-by: Jiada Wang <jiada_wang@mentor.com>
Suggested-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Qiao Zhou [Wed, 3 Dec 2014 02:13:43 +0000 (10:13 +0800)]
ASoC: soc-pcm: do not hw_free BE if it's still used
Do not free BE hw if it's still used by other FE during dpcm runtime
shutdown. Otherwise the BE runtime state will be STATE_HW_FREE and
won't be updated to STATE_CLOSE when shutdown ends, because BE dai
shutdown function won't close pcm when detecting BE is still under
use. With STATE_HW_FREE, BE can't be triggered start again.
This corner case can easily appear when one BE is used by two FE,
without this patch "ASoC: dpcm: Fix race between FE/BE updates and
trigger"(
ea9d0d771fcd32cd56070819749477d511ec9117). One FE tries to
shutdown but it's raced against xrun on another FE. It improves the
be dai hw_free logic.
Signed-off-by: Qiao Zhou <zhouqiao@marvell.com>
Acked-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Peter Rosin [Thu, 27 Nov 2014 21:02:42 +0000 (22:02 +0100)]
ASoC: Augment existing card DAPM routes in snd_soc_of_parse_audio_routing
If a snd_soc_card has any DAPM routes when it calls
snd_soc_of_parse_audio_routing, those are clobbered without this change.
Signed-off-by: Peter Rosin <peda@axentia.se>
Signed-off-by: Mark Brown <broonie@kernel.org>
Vishnu Motghare [Wed, 3 Dec 2014 12:35:25 +0000 (18:05 +0530)]
i2c: cadence: Set the hardware time-out register to maximum value
Cadence I2C controller has bug wherein it generates invalid read transactions
after timeout in master receiver mode. This driver does not use the HW
timeout and this interrupt is disabled but the feature itself cannot be
disabled. Hence, this patch writes the maximum value (0xFF) to this register.
This is one of the workarounds to this bug and it will not avoid the issue
completely but reduces the chances of error.
Signed-off-by: Vishnu Motghare <vishnum@xilinx.com>
Signed-off-by: Harini Katakam <harinik@xilinx.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Cc: stable@kernel.org