git.stricted.de - GitHub/moto-9609/android_kernel_motorola

ASoC: samsung: Fix build error with dma function rename

commit 85ff3c29d720 ("ASoC: samsung: Rename DMA platform registration
functions") renames the DMA registration functions. Fix the places where
it was left out.

Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>

commit | commitdiff | tree

Michael Grzeschik [Mon, 19 Aug 2013 15:06:01 +0000 (17:06 +0200)]

ASoC: fsl: disable ssi irq for imx

We have to disable the ssi irq, as it is not safe for all platforms to
write back into the status register. It also runs into non-linefetch
aborts.

Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
Signed-off-by: Mark Brown <broonie@linaro.org>

commit | commitdiff | tree

Michael Grzeschik [Mon, 19 Aug 2013 15:06:00 +0000 (17:06 +0200)]

ASoC: fsl-ssi: imx-pcm-fiq bugfix

imx-pcm-fiq is checking for TE RE bits, so enable them only if
necessary.

Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
Signed-off-by: Mark Brown <broonie@linaro.org>

commit | commitdiff | tree

Steffen Trumtrar [Mon, 19 Aug 2013 15:05:59 +0000 (17:05 +0200)]

ASoC: fsl-ssi: add SSIEN errata work around

The chip errata for the i.MX35, Rev.2 has the following errata:

ENGcm06222: SSI:Transmission does not take place in bit length early frame sync
configuration

The workaround states, that TX_EN and SSI_EN bits should be set in the same
register write. As the next errata in the document (ENGcm06532) says to always
write RX_EN and TX_EN in the same register write in network mode.

Therefore include the whole write to
CCSR_SSI_SCR_TE and CCSR_SSI_SCR_RE
into the write to
CCSR_SSI_SCR_SSIEN

Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Signed-off-by: Mark Brown <broonie@linaro.org>

commit | commitdiff | tree

Markus Pargmann [Mon, 19 Aug 2013 15:05:58 +0000 (17:05 +0200)]

ASoC: fsl-ssi: ac97-slave support

This patch adds ac97-slave support.

For ac97, the registers have to be setup earlier than for other ssi
modes because there is some communication with the external device
before streaming. So this patch introduces a fsl_ssi_setup function to
setup the registers for different ssi operation modes seperately.

This patch was tested with imx27-pca100.

Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
Tested-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>

commit | commitdiff | tree

Mark Brown [Thu, 22 Aug 2013 10:09:03 +0000 (11:09 +0100)]

Merge remote-tracking branch 'asoc/topic/ac97' into asoc-fsl

commit | commitdiff | tree

Nicolin Chen [Wed, 21 Aug 2013 03:13:16 +0000 (11:13 +0800)]

ASoC: fsl: Add S/PDIF CPU DAI driver

This patch implements a device-tree-only CPU DAI driver for Freescale
S/PDIF controller that supports stereo playback and record feature.

Signed-off-by: Nicolin Chen <b42378@freescale.com>
Acked-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Mark Brown <broonie@linaro.org>

commit | commitdiff | tree

Sachin Kamat [Thu, 22 Aug 2013 08:00:15 +0000 (13:30 +0530)]

ASoC: pxa: Remove duplicate inclusion of dmaengine.h

dmaengine.h header file was included twice.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>

commit | commitdiff | tree

Julia Lawall [Mon, 19 Aug 2013 08:51:51 +0000 (10:51 +0200)]

ASoC: omap: simplify platform_get_resource_byname/devm_ioremap_resource

Remove unneeded error handling on the result of a call to
platform_get_resource_byname when the value is passed to devm_ioremap_resource.

In the case of omap-dmic.c, the error-handling code of
devm_ioremap_resource is also corrected to include releasing the clock.

A simplified version of the semantic patch that makes this change is as
follows: (http://coccinelle.lip6.fr/)

// <smpl>
@@
expression pdev,res,e,e1;
expression ret != 0;
identifier l;
@@

res = platform_get_resource_byname(...);
- if (res == NULL) { ... \(goto l;\|return ret;\) }
e = devm_ioremap_resource(e1, res);
// </smpl>

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Acked-by: Jarkko Nikula <jarkko.nikula@bitmer.com>
Signed-off-by: Mark Brown <broonie@linaro.org>

commit | commitdiff | tree

Fabio Estevam [Sat, 17 Aug 2013 21:13:00 +0000 (18:13 -0300)]

ASoC: fsl: fsl_ssi: Fix the order of resources removal

In fsl_ssi_remove() we need to remove the resources in the opposite order that
they were acquired in probe.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Mark Brown <broonie@linaro.org>

commit | commitdiff | tree

Markus Pargmann [Mon, 19 Aug 2013 15:05:55 +0000 (17:05 +0200)]

ASoC: core: Generic ac97 link reset functions

This patch adds generic ac97 reset functions using pincontrol and gpio
parsed from devicetree.

Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
Signed-off-by: Mark Brown <broonie@linaro.org>

commit | commitdiff | tree

Mark Brown [Mon, 19 Aug 2013 21:59:05 +0000 (22:59 +0100)]

ASoC: samsung: Rename DMA platform registration functions

The current naming with a simple asoc_ prefix is too generic for use in
multiplatform kernels.

Signed-off-by: Mark Brown <broonie@linaro.org>
Acked-by: Sangbeom Kim <sbkim73@samsung.com>

commit | commitdiff | tree

Mark Brown [Mon, 19 Aug 2013 19:33:20 +0000 (20:33 +0100)]

ASoC: samsung: Check to see if we managed to allocate a channel

Signed-off-by: Mark Brown <broonie@linaro.org>
Acked-by: Sangbeom Kim <sbkim73@samsung.com>

commit | commitdiff | tree

Mark Brown [Fri, 16 Aug 2013 11:07:19 +0000 (12:07 +0100)]

ASoC: imx: Add MODULE_LICENSE to DMA drivers

Reported-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Mark Brown <broonie@linaro.org>

commit | commitdiff | tree

Mark Brown [Mon, 19 Aug 2013 11:10:08 +0000 (12:10 +0100)]

ASoC: spdif: Remove duplicate const

Signed-off-by: Mark Brown <broonie@linaro.org>

commit | commitdiff | tree

Mark Brown [Mon, 19 Aug 2013 11:09:39 +0000 (12:09 +0100)]

ASoC: spdif: Add stub DAPM widgets for Rx

Ensure that the driver continues to work with mandatory DAPM.

Signed-off-by: Mark Brown <broonie@linaro.org>

commit | commitdiff | tree

Mark Brown [Mon, 19 Aug 2013 11:16:19 +0000 (12:16 +0100)]

ASoC: bt-sco: Provide stub DAPM integration

Ensure continued operation with DAPM being mandatory.

Signed-off-by: Mark Brown <broonie@linaro.org>

commit | commitdiff | tree

Mark Brown [Mon, 19 Aug 2013 11:13:14 +0000 (12:13 +0100)]

ASoC: bt-sco: Add generic compatible string

Provide a common compatible string for device trees to list as a fallback
for simplicity. We don't currently have a binding document but let's not
fix that right now...

Signed-off-by: Mark Brown <broonie@linaro.org>

commit | commitdiff | tree

Mark Brown [Mon, 19 Aug 2013 11:17:36 +0000 (12:17 +0100)]

ASoC: hdmi: Provide stub DAPM integration

Ensure continued operation with DAPM being mandatory.

Signed-off-by: Mark Brown <broonie@linaro.org>

commit | commitdiff | tree

Mark Brown [Mon, 19 Aug 2013 11:18:07 +0000 (12:18 +0100)]

ASoC: ac97: Provide stub DAPM integration

Ensure continued operation with DAPM being mandatory.

Signed-off-by: Mark Brown <broonie@linaro.org>

commit | commitdiff | tree

Mark Brown [Mon, 12 Aug 2013 22:59:19 +0000 (23:59 +0100)]

ASoC: wm8997: Add inputs for noise and mic mixers

The noise and mic mixer inputs were not connected, do so.

Signed-off-by: Mark Brown <broonie@linaro.org>

commit | commitdiff | tree

Mark Brown [Mon, 12 Aug 2013 22:59:08 +0000 (23:59 +0100)]

ASoC: wm5110: Add inputs for noise and mic mixers

The noise and mic mixer inputs were not connected, do so.

Signed-off-by: Mark Brown <broonie@linaro.org>

commit | commitdiff | tree

Mark Brown [Mon, 12 Aug 2013 22:58:58 +0000 (23:58 +0100)]

ASoC: wm5102: Add inputs for noise and mic mixers

The noise and mic mixer inputs were not connected, do so.

Signed-off-by: Mark Brown <broonie@linaro.org>

commit | commitdiff | tree

Linus Torvalds [Sun, 18 Aug 2013 21:36:53 +0000 (14:36 -0700)]

Linux 3.11-rc6

commit | commitdiff | tree

Mark Brown [Sun, 11 Aug 2013 11:29:07 +0000 (12:29 +0100)]

ASoC: cs4270: Add DAPM support

This makes it possible to hook the device into a more complex board and
ensures it will continue to work with non-DAPM support removed from the
core.

Signed-off-by: Mark Brown <broonie@linaro.org>

commit | commitdiff | tree

Mark Brown [Sun, 18 Aug 2013 17:25:53 +0000 (18:25 +0100)]

ASoC: wl1273: Add stub DAPM support

In order to ensure that the device continues to work with DAPM support
being mandatory provide stub DAPM widgets and routes.

Note that the public information on the device appears to make no
mention of the FM support the driver appears to have.

Signed-off-by: Mark Brown <broonie@linaro.org>

commit | commitdiff | tree

Linus Torvalds [Sun, 18 Aug 2013 15:51:28 +0000 (08:51 -0700)]

Merge branch 'for-3.11-fixes' of git://git./linux/kernel/git/tj/cgroup

Pull cgroup fix from Tejun Heo:
"This contains one patch to fix the return value of cpuset's cgroups
  interface function, which used to always return -ENODEV for the writes
  on the 'memory_pressure_enabled' file"

* 'for-3.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
  cpuset: fix the return value of cpuset_write_u64()

commit | commitdiff | tree

Mark Brown [Thu, 15 Aug 2013 11:04:28 +0000 (12:04 +0100)]

ASoC: pcm3008: Manage DAC and ADC power with DAPM

Rather than leaving the DAC and ADC active whenever the system is running
manage their power with DAPM.

Signed-off-by: Mark Brown <broonie@linaro.org>

commit | commitdiff | tree

Mark Brown [Thu, 15 Aug 2013 11:01:40 +0000 (12:01 +0100)]

ASoC: pcm3008: Add DAPM support

Make it possible to connect external devices to the CODEC and ensure
continued operation with non-DAPM support removed from the core.

Signed-off-by: Mark Brown <broonie@linaro.org>

commit | commitdiff | tree

Mark Brown [Thu, 15 Aug 2013 10:53:28 +0000 (11:53 +0100)]

ASoC: pcm3008: Use gpio_set_value_cansleep()

We don't set the GPIO values from atomic context so support GPIOs that
can't be controlled from atomic context.

Signed-off-by: Mark Brown <broonie@linaro.org>

commit | commitdiff | tree

Mike Dyer [Fri, 16 Aug 2013 17:36:28 +0000 (18:36 +0100)]

ASoC: wm8960: Fix PLL register writes

Bit 9 of PLL2,3 and 4 is reserved as '0'. The 24bit fractional part
should be split across each register in 8bit chunks.

Signed-off-by: Mike Dyer <mike.dyer@md-soft.co.uk>
Signed-off-by: Mark Brown <broonie@linaro.org>
Cc: stable@vger.kernel.org

commit | commitdiff | tree

Fabio Estevam [Sat, 17 Aug 2013 19:38:12 +0000 (16:38 -0300)]

ASoC: fsl: Drop SND_SOC_FSL_UTILS from i.mx machine code

SND_SOC_FSL_UTILS is only used by PowerPC machines, so let's drop it in the
i.mx case.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>

commit | commitdiff | tree

Mark Brown [Fri, 16 Aug 2013 10:54:51 +0000 (11:54 +0100)]

ASoC: si476x: Add DAPM support

This ensures the driver continues to work with DAPM mandatory and makes
it easier to connect the device up to other components in the subsystem.

Signed-off-by: Mark Brown <broonie@linaro.org>
Acked-by: Andrey Smirnov <andrew.smirnov@gmail.com>

commit | commitdiff | tree

Linus Torvalds [Sat, 17 Aug 2013 17:43:19 +0000 (10:43 -0700)]

Merge tag 'ext4_for_linus' of git://git./linux/kernel/git/tytso/ext4

Pull jbd2 bug fixes from Ted Ts'o:
"Two jbd2 bug fixes, one of which is a regression fix"

* tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
jbd2: Fix oops in jbd2_journal_file_inode()
jbd2: Fix use after free after error in jbd2_journal_dirty_metadata()

commit | commitdiff | tree

Guenter Roeck [Sat, 17 Aug 2013 03:50:55 +0000 (20:50 -0700)]

s390: Fix broken build

Fix this build error:

  In file included from fs/exec.c:61:0:
  arch/s390/include/asm/tlb.h:35:23: error: expected identifier or '(' before 'unsigned'
  arch/s390/include/asm/tlb.h:36:1: warning: no semicolon at end of struct or union [enabled by default]
  arch/s390/include/asm/tlb.h: In function 'tlb_gather_mmu':
  arch/s390/include/asm/tlb.h:57:5: error: 'struct mmu_gather' has no member named 'end'

Broken due to commit 2b047252d0 ("Fix TLB gather virtual address range
invalidation corner cases").

Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: stable@vger.kernel.org
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
[ Oh well. We had build testing for ppc amd um, but no s390  - Linus ]
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit | commitdiff | tree

Robin Holt [Fri, 16 Aug 2013 23:01:42 +0000 (18:01 -0500)]

MAINTAINERS: Change ownership for SGI specific modules.

I have taken a different job. I am removing myself as maintainer of
GRU. Dimitri will continue to maintain the SGI GRU driver, changing the
XP/XPC/XPNET maintainer to Cliff Whickman, but leaving behind my
personal email address to answer any questions about the design or
operation of the XP family of drivers.

Signed-off-by: Robin Holt <holt@sgi.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit | commitdiff | tree

Jan Kara [Sat, 17 Aug 2013 01:19:41 +0000 (21:19 -0400)]

jbd2: Fix oops in jbd2_journal_file_inode()

Commit 0713ed0cde76438d05849f1537d3aab46e099475 added
jbd2_journal_file_inode() call into ext4_block_zero_page_range().
However that function gets called from truncate path and thus inode
needn't have jinode attached - that happens in ext4_file_open() but
the file needn't be ever open since mount. Calling
jbd2_journal_file_inode() without jinode attached results in the oops.

We fix the problem by attaching jinode to inode also in ext4_truncate()
and ext4_punch_hole() when we are going to zero out partial blocks.

Reported-by: majianpeng <majianpeng@gmail.com>
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

commit | commitdiff | tree

Linus Torvalds [Fri, 16 Aug 2013 23:52:29 +0000 (16:52 -0700)]

Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm

Pull ARM fixes from Russell King:
"The usual collection of random fixes.  Also some further fixes to the
  last set of security fixes, and some more from Will (which you may
  already have in a slightly different form)"

* 'fixes' of git://git.linaro.org/people/rmk/linux-arm:
  ARM: 7807/1: kexec: validate CPU hotplug support
  ARM: 7812/1: rwlocks: retry trylock operation if strex fails on free lock
  ARM: 7811/1: locks: use early clobber in arch_spin_trylock
  ARM: 7810/1: perf: Fix array out of bounds access in armpmu_map_hw_event()
  ARM: 7809/1: perf: fix event validation for software group leaders
  ARM: Fix FIQ code on VIVT CPUs
  ARM: Fix !kuser helpers case
  ARM: Fix the world famous typo with is_gate_vma()

commit | commitdiff | tree

Linus Torvalds [Fri, 16 Aug 2013 23:49:06 +0000 (16:49 -0700)]

Merge branch 'for-3.11' of git://git./linux/kernel/git/geert/linux-m68k

Pull m68k fixes from Geert Uytterhoeven:
"These are two critical fixes, needed by distro kernels, and thus also
  destined for stable:

   - The do_div() commit fixes a crash in mounting btrfs volumes, which
     was a regression from 3.2,

   - The ARAnyM fix allows to have NatFeat drivers as loadable modules,
     which is needed for initrds"

* 'for-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: Truncate base in do_div()
  m68k/atari: ARAnyM - Fix NatFeat module support

commit | commitdiff | tree

Linus Torvalds [Fri, 16 Aug 2013 17:00:18 +0000 (10:00 -0700)]

Merge tag 'clk-fixes-for-linus' of git://git.linaro.org/people/mturquette/linux

Pull clock controller fixes from Michael Turquette:
"Two small fixes for the Zynq clock controller introduced in 3.11-rc1
  and another Exynos clock patch which fixes a regression that prevents
  the video pipeline from functioning on that platform"

* tag 'clk-fixes-for-linus' of git://git.linaro.org/people/mturquette/linux:
  clk: exynos4: Add CLK_GET_RATE_NOCACHE flag for the Exynos4x12 ISP clocks
  clk/zynq/clkc: Add CLK_SET_RATE_PARENT flag to ethernet muxes
  clk/zynq/clkc: Add dedicated spinlock for the SWDT

commit | commitdiff | tree

Linus Torvalds [Fri, 16 Aug 2013 16:59:00 +0000 (09:59 -0700)]

Merge tag 'pm-3.11-rc6' of git://git./linux/kernel/git/rafael/linux-pm

Pull power management fix from Rafael Wysocki:
"The removal of delayed_work_pending() checks from kernel/power/qos.c
  done in 3.9 introduced a deadlock in pm_qos_work_fn().

  Fix from Stephen Boyd"

* tag 'pm-3.11-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  PM / QoS: Fix workqueue deadlock when using pm_qos_update_request_timeout()

commit | commitdiff | tree

Linus Torvalds [Fri, 16 Aug 2013 16:58:21 +0000 (09:58 -0700)]

Merge tag 'sound-3.11' of git://git./linux/kernel/git/tiwai/sound

Pull sound fixes from Takashi Iwai:
"This batch contains a few USB audio fixes, a couple of HD-audio
  quirks, various small ASoC driver fixes in addition to an ASoC core
  fix that may lead to memory corruption.

  Unfortunately slightly more volume than the previous pull request, but
  all are reasonable regression fixes"

* tag 'sound-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: hda - Add a fixup for Gateway LT27
  ASoC: tegra: fix Tegra30 I2S capture parameter setup
  ALSA: usb-audio: Fix invalid volume resolution for Logitech HD Webcam C525
  ALSA: hda - Fix missing mute controls for CX5051
  ALSA: usb-audio: fix automatic Roland/Yamaha MIDI detection
  ALSA: 6fire: make buffers DMA-able (midi)
  ALSA: 6fire: make buffers DMA-able (pcm)
  ALSA: hda - Add pinfix for LG LW25 laptop
  ASoC: cs42l52: Add new TLV for Beep Volume
  ASoC: cs42l52: Reorder Min/Max and update to SX_TLV for Beep Volume
  ASoC: dapm: Fix empty list check in dapm_new_mux()
  ASoC: sgtl5000: fix buggy 'Capture Attenuate Switch' control
  ASoC: sgtl5000: prevent playback to be muted when terminating concurrent capture

commit | commitdiff | tree

Linus Torvalds [Fri, 16 Aug 2013 16:57:38 +0000 (09:57 -0700)]

Merge tag 'usb-3.11-rc6' of git://git./linux/kernel/git/gregkh/usb

Pull USB fixes from Greg KH:
"Here are some small USB fixes for 3.11-rc6 that have accumulated.

  Nothing huge, a EHCI fix that solves a much-reported audio USB
  problem, some usb-serial driver endian fixes and other minor fixes, a
  wireless USB oops fix, and two new quirks"

* tag 'usb-3.11-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  USB: keyspan: fix null-deref at disconnect and release
  USB: mos7720: fix broken control requests
  usb: add two quirky touchscreen
  USB: ti_usb_3410_5052: fix big-endian firmware handling
  USB: adutux: fix big-endian device-type reporting
  USB: usbtmc: fix big-endian probe of Rigol devices
  USB: mos7840: fix big-endian probe
  USB-Serial: Fix error handling of usb_wwan
  wusbcore: fix kernel panic when disconnecting a wireless USB->serial device
  USB: EHCI: accept very late isochronous URBs

RSS Atom