git.karo-electronics.de Git - karo-tx-linux.git/log

Merge tag 'fixes-for-v3.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus

Felipe writes:

usb: fixes for v3.15-rc4

Small pull request this time containing only 3 patches.

One patch is fixing at91 resource retrieval, one fixes a
conditional in the generic OTG FSM and another fixes a
state transition also on our generic OTG FSM.

Signed-of-by: Felipe Balbi <balbi@ti.com>

commit | commitdiff | tree

Linus Torvalds [Thu, 1 May 2014 22:54:44 +0000 (15:54 -0700)]

Merge branch 'parisc-3.15-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux

Pull parisc fixes from Helge Deller:
"Drop the architecture-specifc value for_STK_LIM_MAX to fix stack
  related problems with GNU make"

* 'parisc-3.15-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: Use generic uapi/asm/resource.h file
  parisc: remove _STK_LIM_MAX override

commit | commitdiff | tree

Mike Snitzer [Thu, 1 May 2014 20:14:24 +0000 (16:14 -0400)]

dm cache: fix writethrough mode quiescing in cache_map

Commit 2ee57d58735 ("dm cache: add passthrough mode") inadvertently
removed the deferred set reference that was taken in cache_map()'s
writethrough mode support. Restore taking this reference.

This issue was found with code inspection.

Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Acked-by: Joe Thornber <ejt@redhat.com>
Cc: stable@vger.kernel.org # 3.13+

commit | commitdiff | tree

Mark Brown [Thu, 1 May 2014 19:10:37 +0000 (12:10 -0700)]

Merge remote-tracking branch 'asoc/topic/wm8985' into asoc-next

commit | commitdiff | tree

Mark Brown [Thu, 1 May 2014 19:10:33 +0000 (12:10 -0700)]

Merge remote-tracking branches 'asoc/topic/simple', 'asoc/topic/sirf', 'asoc/topic/tlv320dac33', 'asoc/topic/wm8731', 'asoc/topic/wm8804' and 'asoc/topic/wm8955' into asoc-next

commit | commitdiff | tree

Mark Brown [Thu, 1 May 2014 19:10:29 +0000 (12:10 -0700)]

Merge remote-tracking branches 'asoc/topic/nuc900', 'asoc/topic/omap', 'asoc/topic/pxa', 'asoc/topic/rt5640', 'asoc/topic/rt5651', 'asoc/topic/samsung' and 'asoc/topic/sgtl5000' into asoc-next

commit | commitdiff | tree

Mark Brown [Thu, 1 May 2014 19:10:24 +0000 (12:10 -0700)]

Merge remote-tracking branches 'asoc/topic/fsl-spdif', 'asoc/topic/fsl-ssi', 'asoc/topic/headers', 'asoc/topic/intel', 'asoc/topic/jz4740', 'asoc/topic/max98095', 'asoc/topic/mc13783' and 'asoc/topic/multicodec' into asoc-next

commit | commitdiff | tree

Mark Brown [Thu, 1 May 2014 19:10:21 +0000 (12:10 -0700)]

Merge remote-tracking branches 'asoc/topic/davinci', 'asoc/topic/devm', 'asoc/topic/fsl' and 'asoc/topic/fsl-sai' into asoc-next

commit | commitdiff | tree

Mark Brown [Thu, 1 May 2014 19:10:17 +0000 (12:10 -0700)]

Merge remote-tracking branches 'asoc/topic/adsp', 'asoc/topic/ak4104', 'asoc/topic/arizona', 'asoc/topic/atmel', 'asoc/topic/cache', 'asoc/topic/component' and 'asoc/topic/cs42l51' into asoc-next

commit | commitdiff | tree

Mark Brown [Thu, 1 May 2014 19:10:16 +0000 (12:10 -0700)]

Merge remote-tracking branch 'asoc/topic/pcm512x' into asoc-next

commit | commitdiff | tree

Mark Brown [Thu, 1 May 2014 19:10:15 +0000 (12:10 -0700)]

Merge remote-tracking branch 'asoc/topic/enum' into asoc-next

commit | commitdiff | tree

Mark Brown [Thu, 1 May 2014 19:10:15 +0000 (12:10 -0700)]

Merge remote-tracking branch 'asoc/topic/dt' into asoc-next

commit | commitdiff | tree

Mark Brown [Thu, 1 May 2014 19:10:14 +0000 (12:10 -0700)]

Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next

commit | commitdiff | tree

Mark Brown [Thu, 1 May 2014 19:10:13 +0000 (12:10 -0700)]

Merge remote-tracking branch 'asoc/topic/core' into asoc-next

commit | commitdiff | tree

Mark Brown [Thu, 1 May 2014 19:10:09 +0000 (12:10 -0700)]

Merge remote-tracking branches 'asoc/fix/rcar' and 'asoc/fix/tlv320aic31xx' into asoc-linus

commit | commitdiff | tree

Mark Brown [Thu, 1 May 2014 19:10:07 +0000 (12:10 -0700)]

Merge remote-tracking branches 'asoc/fix/audmux' and 'asoc/fix/intel' into asoc-linus

commit | commitdiff | tree

Mark Brown [Thu, 1 May 2014 19:10:06 +0000 (12:10 -0700)]

Merge tag 'asoc-v3.15-rc2' into asoc-linus

ASoC: Fixes for v3.15

A smattering of driver-specific fixes here, nothing generic.  The Cirrus
CODEC conversions to devm_ are leak fixes - the conversion adds missing
error handling code.

# gpg: Signature made Wed 23 Apr 2014 04:11:02 PDT using RSA key ID 7EA229BD
# gpg: Good signature from "Mark Brown <broonie@sirena.org.uk>"
# gpg:                 aka "Mark Brown <broonie@debian.org>"
# gpg:                 aka "Mark Brown <broonie@kernel.org>"
# gpg:                 aka "Mark Brown <broonie@tardis.ed.ac.uk>"
# gpg:                 aka "Mark Brown <broonie@linaro.org>"
# gpg:                 aka "Mark Brown <Mark.Brown@linaro.org>"

commit | commitdiff | tree

Arnd Bergmann [Tue, 29 Apr 2014 11:18:33 +0000 (19:18 +0800)]

ASoC: atmel: Atmel WM8904 codec support needs I2C

The WM8904 codec driver needs I2C to be enabled, so the
SND_ATMEL_SOC_WM8904 option also requires this.

Found using randconfig build testing.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Xia Kaixu <kaixu.xia@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>

commit | commitdiff | tree

Linus Torvalds [Thu, 1 May 2014 18:28:03 +0000 (11:28 -0700)]

Merge tag 'pinctrl-v3.15-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl

Pull pin control fixes from Linus Walleij:
"Here is a small set of pin control fixes for the v3.15 series.  All
  are individual driver fixes and quite self-contained.  One of them
  tagged for stable.

   - Signedness bug in the TB10x

   - GPIO inversion fix for the AS3722

   - Clear pending pin interrups enabled in the bootloader in the
     pinctrl-single driver

   - Minor pin definition fixes for the PFC/Renesas driver"

* tag 'pinctrl-v3.15-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
  sh-pfc: r8a7791: Fix definition of MOD_SEL3
  sh-pfc: r8a7790: Fix definition of IPSR5
  pinctrl: single: Clear pin interrupts enabled by bootloader
  pinctrl: as3722: fix handling of GPIO invert bit
  pinctrl/TB10x: Fix signedness bug

commit | commitdiff | tree

Xiubo Li [Wed, 30 Apr 2014 10:10:06 +0000 (18:10 +0800)]

ASoC: fsl: Allow to select ESAI device individually

This will be useful for out-of-tree drivers since in-tree drivers
could select it automatically.

Signed-off-by: Xiubo Li <Li.Xiubo@freescale.com>
Signed-off-by: Mark Brown <broonie@linaro.org>

commit | commitdiff | tree

Xiubo Li [Wed, 30 Apr 2014 10:10:05 +0000 (18:10 +0800)]

ASoC: fsl: Allow to select SAI device individually

This will be useful for out-of-tree drivers since in-tree drivers
could select it automatically.

Signed-off-by: Xiubo Li <Li.Xiubo@freescale.com>
Signed-off-by: Mark Brown <broonie@linaro.org>

commit | commitdiff | tree

Arnd Bergmann [Tue, 29 Apr 2014 11:18:29 +0000 (19:18 +0800)]

ASoC: pxa: TTC DKB audio needs I2C

The missing dependency can lead to build errors, so
make it explicit in Kconfig.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Xia Kaixu <kaixu.xia@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>

commit | commitdiff | tree

Arnd Bergmann [Tue, 29 Apr 2014 11:18:27 +0000 (19:18 +0800)]

ASoC: omap: RX-51 audio needs I2C

The codec requires I2C to be enabled, so any other option
that selects it should also depend on I2C.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Xia Kaixu <kaixu.xia@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>

commit | commitdiff | tree

Sebastian Reichel [Mon, 28 Apr 2014 14:07:26 +0000 (16:07 +0200)]

ASoC: omap: rx51: Add DT support

This patch adds device tree support to the Nokia N900 audio driver and
adds documentation for the DT binding.

Signed-off-by: Sebastian Reichel <sre@kernel.org>
Signed-off-by: Mark Brown <broonie@linaro.org>

commit | commitdiff | tree

Mark Brown [Thu, 1 May 2014 17:57:03 +0000 (10:57 -0700)]

Merge branch 'asoc-dt' into asoc-omap

commit | commitdiff | tree

Sebastian Reichel [Mon, 28 Apr 2014 14:07:22 +0000 (16:07 +0200)]

ASoC: dt: Allow Aux Codecs to be specified using DT

This patch adds support for specifying auxiliary codecs and
codec configuration via device tree phandles.

This change adds new fields to snd_soc_aux_dev and snd_soc_codec_conf
and adds support for the changes to SoC core methods.

Signed-off-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Sebastian Reichel <sre@kernel.org>
Signed-off-by: Mark Brown <broonie@linaro.org>

commit | commitdiff | tree

Sebastian Reichel [Mon, 28 Apr 2014 14:07:25 +0000 (16:07 +0200)]

ASoC: omap: rx51: Add some error messages

Add more error messages making it easier to identify problems.

Signed-off-by: Sebastian Reichel <sre@kernel.org>
Signed-off-by: Mark Brown <broonie@linaro.org>

commit | commitdiff | tree

Sebastian Reichel [Mon, 28 Apr 2014 14:07:24 +0000 (16:07 +0200)]

ASoC: omap: rx51: get GPIO numbers via gpiod API

Update the driver to get GPIO numbers from the
devm gpiod API instead of requesting hardcoded
GPIO numbers.

Signed-off-by: Sebastian Reichel <sre@kernel.org>
Signed-off-by: Mark Brown <broonie@linaro.org>

commit | commitdiff | tree

Sebastian Reichel [Mon, 28 Apr 2014 14:07:23 +0000 (16:07 +0200)]

ASoC: omap: rx51: omap_mcbsp_st_add_controls: add id parameter

This is a preparation for DT based booting where the McBSP id
is set to -1 for all McBSP instances.

Signed-off-by: Sebastian Reichel <sre@kernel.org>
Signed-off-by: Mark Brown <broonie@linaro.org>

commit | commitdiff | tree

Linus Torvalds [Thu, 1 May 2014 17:35:01 +0000 (10:35 -0700)]

Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux

Pull module fixes from Rusty Russell:
"Fixed one missing place for the new taint flag, and remove a warning
  giving only false positives (now we finally figured out why)"

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
  module: remove warning about waiting module removal.
  Fix: tracing: use 'E' instead of 'X' for unsigned module taint flag

commit | commitdiff | tree

Helge Deller [Tue, 29 Apr 2014 14:13:22 +0000 (16:13 +0200)]

parisc: Use generic uapi/asm/resource.h file

Signed-off-by: Helge Deller <deller@gmx.de>

Linux kernel for KaRo TX COM modules

RSS Atom