Commit Graph

413004 Commits

Author SHA1 Message Date
Mark Brown
de3bb2ded6 Merge remote-tracking branch 'asoc/topic/ab8500' into asoc-next 2013-10-24 11:23:57 +01:00
Mark Brown
cbf125e211 Merge remote-tracking branch 'asoc/topic/88pm860x' into asoc-next 2013-10-24 11:23:57 +01:00
Mark Brown
b85e95781c Merge remote-tracking branch 'asoc/fix/tlv320aic3x' into asoc-linus 2013-10-24 11:23:56 +01:00
Mark Brown
ebc0b38625 Merge remote-tracking branch 'asoc/fix/rcar' into asoc-linus 2013-10-24 11:23:56 +01:00
Mark Brown
3bd36a147f Merge remote-tracking branch 'asoc/fix/pcm1792a' into asoc-linus 2013-10-24 11:23:55 +01:00
Mark Brown
dfbbe16f14 Merge remote-tracking branch 'asoc/fix/pcm1681' into asoc-linus 2013-10-24 11:23:55 +01:00
Mark Brown
92359d6d65 Merge remote-tracking branch 'asoc/fix/omap' into asoc-linus 2013-10-24 11:23:55 +01:00
Mark Brown
686b377152 Merge remote-tracking branch 'asoc/fix/fsl' into asoc-linus 2013-10-24 11:23:54 +01:00
Nicolin Chen
1abe729f78 ASoC: fsl: Add missing pm to current machine drivers
Add missing pm to current machine drivers so that all of them would
correctly do suspend/resume.

Signed-off-by: Nicolin Chen <b42378@freescale.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
2013-10-24 11:22:44 +01:00
Russell King
0ea1ec713f ARM: dma-mapping: don't allow DMA mappings to be marked executable
DMA mapping permissions were being derived from pgprot_kernel directly
without using PAGE_KERNEL.  This causes them to be marked with executable
permission, which is not what we want.  Fix this.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2013-10-24 11:17:27 +01:00
Mark Brown
d4d5cef649 Merge remote-tracking branch 'regulator/topic/tps65910' into regulator-next 2013-10-24 11:11:43 +01:00
Mark Brown
2532a39500 Merge remote-tracking branch 'regulator/topic/tps6586x' into regulator-next 2013-10-24 11:11:43 +01:00
Mark Brown
e11678e4b4 Merge remote-tracking branch 'regulator/topic/tps65090' into regulator-next 2013-10-24 11:11:42 +01:00
Mark Brown
f5549f5bd8 Merge remote-tracking branch 'regulator/topic/tps65023' into regulator-next 2013-10-24 11:11:42 +01:00
Mark Brown
6c7bdf8e63 Merge remote-tracking branch 'regulator/topic/tps6105x' into regulator-next 2013-10-24 11:11:41 +01:00
Mark Brown
07afa93e31 Merge remote-tracking branch 'regulator/topic/ti-abb' into regulator-next 2013-10-24 11:11:41 +01:00
Mark Brown
aa11a358f8 Merge remote-tracking branch 'regulator/topic/stw481x' into regulator-next 2013-10-24 11:11:40 +01:00
Mark Brown
67471b6a24 Merge remote-tracking branch 'regulator/topic/s5m8767' into regulator-next 2013-10-24 11:11:40 +01:00
Mark Brown
22eb85adaf Merge remote-tracking branch 'regulator/topic/palmas' into regulator-next 2013-10-24 11:11:39 +01:00
Mark Brown
aef393da75 Merge remote-tracking branch 'regulator/topic/optional' into regulator-next 2013-10-24 11:11:39 +01:00
Mark Brown
88c260a180 Merge remote-tracking branch 'regulator/topic/mc13783' into regulator-next 2013-10-24 11:11:38 +01:00
Mark Brown
08f09c63e1 Merge remote-tracking branch 'regulator/topic/max8997' into regulator-next 2013-10-24 11:11:38 +01:00
Mark Brown
4e31566d9b Merge remote-tracking branch 'regulator/topic/lp3971' into regulator-next 2013-10-24 11:11:38 +01:00
Mark Brown
4c35c8676f Merge remote-tracking branch 'regulator/topic/linear' into regulator-next 2013-10-24 11:11:37 +01:00
Mark Brown
a6117615a2 Merge remote-tracking branch 'regulator/topic/gpio' into regulator-next 2013-10-24 11:11:36 +01:00
Mark Brown
706664c290 Merge remote-tracking branch 'regulator/topic/fixed' into regulator-next 2013-10-24 11:11:36 +01:00
Mark Brown
b735e47f6e Merge remote-tracking branch 'regulator/topic/devm' into regulator-next 2013-10-24 11:11:35 +01:00
Mark Brown
3242a86170 Merge remote-tracking branch 'regulator/topic/da9210' into regulator-next 2013-10-24 11:11:34 +01:00
Mark Brown
513b485a2d Merge remote-tracking branch 'regulator/topic/da9063' into regulator-next 2013-10-24 11:11:34 +01:00
Mark Brown
2a86e8e753 Merge remote-tracking branch 'regulator/topic/da9052' into regulator-next 2013-10-24 11:11:33 +01:00
Mark Brown
81e439f476 Merge remote-tracking branch 'regulator/topic/core' into regulator-next 2013-10-24 11:11:33 +01:00
Mark Brown
cea64d8c08 Merge remote-tracking branch 'regulator/topic/as3722' into regulator-next 2013-10-24 11:11:33 +01:00
Mark Brown
f2399df731 Merge remote-tracking branch 'regulator/topic/anatop' into regulator-next 2013-10-24 11:11:32 +01:00
Mark Brown
420118d483 Merge remote-tracking branch 'regulator/topic/alias' into regulator-next 2013-10-24 11:11:32 +01:00
Mark Brown
2a2bec6554 Merge remote-tracking branch 'regulator/fix/ti-abb' into regulator-linus 2013-10-24 11:11:31 +01:00
Chanwoo Choi
04f9f068a6 regulator: s5m8767: Modify parsing method of the voltage table of buck2/3/4
The s5m8767 regulator driver parse always the voltage table of buck2/3/4.
If gpio_dvs feature isn't used and dts haven't included the voltage table
of buck2/3/4, s5m8767 regulator driver return error and file probe state.

This patch check only voltage table of buck on s5m8767_pmic_dt_parse_pdata()
if buck[2-4]_gpiodvs is true.

Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: YoungJun Cho <yj44.cho@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
2013-10-24 11:11:14 +01:00
Chanwoo Choi
033054e860 regulator: s5m8767: Modify parse_dt function to parse data related to ramp
This patch parse 'buck[2-4]_ramp_enable and buck_ramp_delay' platform data
from dts file.

Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
2013-10-24 11:11:14 +01:00
Wolfram Sang
501d609abe mfd: twl6040: Remove obsolete cleanup for i2c clientdata
A few new i2c-drivers came into the kernel which clear the clientdata-pointer
on exit or error. This is obsolete meanwhile, the core will do it.

Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
2013-10-24 12:08:23 +02:00
Laxman Dewangan
34c5c735a8 mfd: tps65910: Remove warning during dt node parsing
Driver throw the warning message if dt node does not
have the info for VMBCH-Threshold and VMBCH2-Threshold.
These properties are optional property and hence it
is not mandatory to have these on DT node and in this case
it should not throw the warning message.
It creates noise from driver as follows:
[    0.384605] tps65910 4-002d: VMBCH-Threshold not specified
[    0.384616] tps65910 4-002d: VMBCH2-Threshold not specified

Removing the warning message from driver.

Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
2013-10-24 12:08:22 +02:00
Mark Brown
90130d2e8f ASoC: dmaengine: Use filter_data rather than dma_data for compat requests
When using the legacy filter function channel requests we currently pass
the audio specific struct snd_dmaengine_dai_dma_data which isn't likely to
be helpful for actual filtering. Since there's already a field in the
structure called filter_data clearly intended for use here convert the
driver to use that.

All existing users of plain filter functions have been converted to use
an explicit compat function to override this behaviour except i.MX which
is working around this issue in its filter function and is updated to
just use filter_data directly here.

Signed-off-by: Mark Brown <broonie@linaro.org>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
2013-10-24 11:03:19 +01:00
Takashi Iwai
95f74c41b2 ALSA: hda - Fix mute LED on HP laptops in runtime suspend
When HP laptops with mute and mic-record LEDs go to runtime suspend,
these LEDs are turned on forcibly no matter whether GPIO pis are on or
off.  This strange behavior seems triggered by resetting the HD-audio
bus link at azx_rutime_suspend().  So, just add a new hda_bus flag to
avoid the link reset at runtime suspend and set it for these HP
machines.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-10-24 11:37:33 +02:00
Kailang Yang
161ebf295e ALSA: hda - Add support of ALC285 / ALC293 codecs
Yet another variants of ALC269.

Signed-off-by: Kailang Yang <kailang@realtek.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-10-24 11:36:33 +02:00
Kailang Yang
1d04c9de5c ALSA: hda - Add support of ALC255 codecs
It's just another variant of ALC269 & co.

Signed-off-by: Kailang Yang <kailang@realtek.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-10-24 11:35:18 +02:00
Joe Perches
b7baa9a0e3 ALSA: hda - Remove OOM message after input_allocate_device
Emitting an OOM message isn't necessary after input_allocate_device
as there's a generic OOM and a dump_stack already done.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-10-24 11:26:07 +02:00
Axel Lin
d706b1e493 regulator: da9052: Revert se apply_[reg|bit] with regmap based voltage_sel operations
This reverts commit 68f7506017.

Michael reported that with this patch we loose the fix_io code path from
da9052_reg_update. Thus revert it.

Reported-by: Michael Grzeschik <mgr@pengutronix.de>
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
2013-10-24 10:10:35 +01:00
Mark Brown
ea73b7ddf1 ASoC: dmaengine: Support custom channel names
Some devices have more than just simple TX and RX DMA channels, for example
modern Samsung I2S IPs support a secondary transmit DMA stream which is
mixed into the primary stream during playback. Allow such devices to
specify the names of the channels to be requested in their dma_data.

Signed-off-by: Mark Brown <broonie@linaro.org>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
2013-10-24 09:52:14 +01:00
Sachin Kamat
702e304f19 Documentation/pwm: Fix trivial typos
Fixes some trivial typos to improve readability.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
2013-10-24 10:51:33 +02:00
Thomas Gleixner
77748e6315 Merge branch 'fortglx/3.13/time' of git://git.linaro.org/people/jstultz/linux into timers/core
* An improved ssize_t fix for sysfs_get_uname
* Alarmtimer return fix, since ENOTSUPP isn't exported to userland
* Comment typo fixes

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
2013-10-24 10:31:17 +02:00
Nicholas Bellinger
48502ddbfb target: Fail XCOPY for non matching source + destination block_size
This patch adds an explicit check + failure for XCOPY I/O to source +
destination devices with a non-matching block_size.

This limitiation is currently due to the fact that the scatterlist
memory allocated for the XCOPY READ operation is passed zero-copy
to the XCOPY WRITE operation.

Reported-by: Thomas Glanzmann <thomas@glanzmann.de>
Reported-by: Douglas Gilbert <dgilbert@interlog.com>
Cc: Thomas Glanzmann <thomas@glanzmann.de>
Cc: Douglas Gilbert <dgilbert@interlog.com>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
2013-10-24 00:28:52 -07:00
Nicholas Bellinger
8a955d6dcc target: Generate failure for XCOPY I/O with non-zero scsi_status
This patch adds the missing non-zero se_cmd->scsi_status check required
for local XCOPY I/O within target_xcopy_issue_pt_cmd() to signal an
exception case failure.

This will trigger the generation of SAM_STAT_CHECK_CONDITION status
from within target_xcopy_do_work() process context code.

Reported-by: Thomas Glanzmann <thomas@glanzmann.de>
Reported-by: Douglas Gilbert <dgilbert@interlog.com>
Cc: Thomas Glanzmann <thomas@glanzmann.de>
Cc: Douglas Gilbert <dgilbert@interlog.com>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
2013-10-24 00:28:27 -07:00