28 May, 2011
2 commits
-
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (45 commits)
ARM: 6945/1: Add unwinding support for division functions
ARM: kill pmd_off()
ARM: 6944/1: mm: allow ASID 0 to be allocated to tasks
ARM: 6943/1: mm: use TTBR1 instead of reserved context ID
ARM: 6942/1: mm: make TTBR1 always point to swapper_pg_dir on ARMv6/7
ARM: 6941/1: cache: ensure MVA is cacheline aligned in flush_kern_dcache_area
ARM: add sendmmsg syscall
ARM: 6863/1: allow hotplug on msm
ARM: 6832/1: mmci: support for ST-Ericsson db8500v2
ARM: 6830/1: mach-ux500: force PrimeCell revisions
ARM: 6829/1: amba: make hardcoded periphid override hardware
ARM: 6828/1: mach-ux500: delete SSP PrimeCell ID
ARM: 6827/1: mach-netx: delete hardcoded periphid
ARM: 6940/1: fiq: Briefly document driver responsibilities for suspend/resume
ARM: 6938/1: fiq: Refactor {get,set}_fiq_regs() for Thumb-2
ARM: 6914/1: sparsemem: fix highmem detection when using SPARSEMEM
ARM: 6913/1: sparsemem: allow pfn_valid to be overridden when using SPARSEMEM
at91: drop at572d940hf support
at91rm9200: introduce at91rm9200_set_type to specficy cpu package
at91: drop boot_params and PLAT_PHYS_OFFSET
... -
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (26 commits)
ASoC: Fix power down for widgetless per-card DAPM context case
ASoC: wm1250-ev1: Define "WM1250 Output" with SND_SOC_DAPM_OUTPUT
ASoC: Remove duplicate linux/delay.h inclusion.
ASoC: sam9g20_wm8731: use the proper SYSCKL value
ASoC: wm8731: fix wm8731_check_osc() connected condition
ALSA: hda - Reorganize controller quriks with bit flags
ALSA: hda - Use snd_printd() in snd_hda_parse_pin_def_config()
ALSA: core: remove unused variables.
ALSA: HDA: Increase MAX_HDMI_PINS
ALSA: PCM - Don't check DMA time-out too shortly
MAINTAINERS: add FireWire audio maintainer
ALSA: usb-audio: more control quirks for M-Audio FastTrack devices
ALSA: usb-audio: add new quirk type QUIRK_AUDIO_STANDARD_MIXER
ALSA: usb-audio: export snd_usb_feature_unit_ctl
ALSA: usb-audio: rework add_control_to_empty()
ALSA: usb-audio: move assignment of chip->ctrl_intf
ALSA: hda - Use model=auto for Lenovo G555
ALSA: HDA: Unify HDMI hotplug handling.
ALSA: hda - Force AD1988_6STACK_DIG for Asus M3N-HT Deluxe
ASoC: core - remove superfluous new line.
...
27 May, 2011
6 commits
-
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (57 commits)
regulator: Fix 88pm8607.c printk format warning
input: Add support for Qualcomm PMIC8XXX power key
input: Add Qualcomm pm8xxx keypad controller driver
mfd: Add omap-usbhs runtime PM support
mfd: Fix ASIC3 SD Host Controller Configuration size
mfd: Fix omap_usbhs_alloc_children error handling
mfd: Fix omap usbhs crash when rmmoding ehci or ohci
mfd: Add ASIC3 LED support
leds: Add ASIC3 LED support
mfd: Update twl4030-code maintainer e-mail address
mfd: Correct the name and bitmask for ab8500-gpadc BTempPullUp
mfd: Add manual ab8500-gpadc batt temp activation for AB8500 3.0
mfd: Provide ab8500-core enumerators for chip cuts
mfd: Check twl4030-power remove script error condition after i2cwrite
mfd: Fix twl6030 irq definitions
mfd: Add phoenix lite (twl6025) support to twl6030
mfd: Avoid to use constraint name in 88pm860x regulator driver
mfd: Remove checking on max8925 regulator[0]
mfd: Remove unused parameter from 88pm860x API
mfd: Avoid to allocate 88pm860x static platform data
... -
* 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (33 commits)
OMAP3: PM: Boot message is not an error, and not helpful, remove it
OMAP3: cpuidle: change the power domains modes determination logic
OMAP3: cpuidle: code rework for improved readability
OMAP3: cpuidle: re-organize the C-states data
OMAP3: clean-up mach specific cpuidle data structures
OMAP3 cpuidle: remove useless SDP specific timings
usb: otg: OMAP4430: Powerdown the internal PHY when USB is disabled
usb: otg: OMAP4430: Fixing the omap4430_phy_init function
usb: musb: am35x: fix compile error when building am35x
usb: musb: OMAP4430: Power down the PHY during board init
omap: drop board-igep0030.c
omap: igep0020: add support for IGEP3
omap: igep0020: minor refactoring
omap: igep0020: name refactoring for future merge with IGEP3
omap: Remove support for omap2evm
arm: omap2plus: GPIO cleanup
omap: musb: introduce default board config
omap: move detection of NAND CS to common-board-devices
omap: use common initialization for PMIC i2c bus
omap: consolidate touch screen initialization among different boards
... -
With the addition of a platform device mfd_cell pointer, MFD drivers
can go back to passing platform data back to their sub drivers.
This allows for an mfd_cell->mfd_data removal and thus keep the
sub drivers MFD agnostic. This is mostly needed for non MFD aware
sub drivers.Reviewed-by: Mark Brown
Signed-off-by: Samuel Ortiz -
With the addition of a platform device mfd_cell pointer, MFD drivers
can go back to passing platform back to their sub drivers.
This allows for an mfd_cell->mfd_data removal and thus keep the
sub drivers MFD agnostic. This is mostly needed for non MFD aware
sub drivers.Cc: Miguel Aguilar
Cc: Mark Brown
Cc: Liam Girdwood
Signed-off-by: Samuel Ortiz -
With the addition of a platform device mfd_cell pointer, MFD drivers
can go back to passing platform data back to their sub drivers.
This allows for an mfd_cell->mfd_data removal and thus keep the
sub drivers MFD agnostic. This is mostly needed for non MFD aware
sub drivers.Cc: Peter Ujfalusi
Cc: Mark Brown
Cc: Liam Girdwood
Cc: Dmitry Torokhov
Signed-off-by: Samuel Ortiz -
With the addition of a platform device mfd_cell pointer, MFD drivers
can go back to passing platform data back to their sub drivers.
This allows for an mfd_cell->mfd_data removal and thus keep the
sub drivers MFD agnostic. This is mostly needed for non MFD aware
sub drivers.Cc: Matti Aaltonen
Signed-off-by: Samuel Ortiz
26 May, 2011
6 commits
-
Commit 52ba67b ("ASoC: Force all DAPM contexts into the same bias state")
powers up all the DAPM contexts in a card if any DAPM context becomes
active. Unfortunately power down newer happens if per-card DAPM context
doesn't have any widgets.Reason for this is that power state of per-card DAPM context without
widgets is never cleared and thus all the DAPM contexts remain permanently
active. Test for widgetless calling DAPM context in dapm_power_widgets()
doesn't work for per-card DAPM context since power change is never
originating from widgetless per-card DAPM context.Fix this by pre-clearing power state flag of non-codec DAPM context at the
beginning of power sequence.Signed-off-by: Jarkko Nikula
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown -
Codec output pin should be defined with SND_SOC_DAPM_OUTPUT.
Signed-off-by: Axel Lin
Signed-off-by: Mark Brown -
It's enough to include linux/delay.h just once in
sound/soc/codecs/wm8915.c, so remove the duplicate.Signed-off-by: Jesper Juhl
Signed-off-by: Mark Brown -
at91sam9g20 is providing master clock to wm8731: not using a crystal but an
external MCLK. We can avoid conflict and save power using WM8731_SYSCLK_MCLK as
we do not need oscillator to be powered.Signed-off-by: Nicolas Ferre
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown -
The crystal oscillator is only enabled if the WM8731_SYSCLK_XTAL master clock
is specified. Fix the connected() struct snd_soc_dapm_route function to take
this into account. Oscillator is not enabled on machine that need it otherwise.Machine drivers have to make sure that they use the proper SYSCLK value.
Signed-off-by: Nicolas Ferre
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown -
…nux-samsung into devel-stable
Conflicts:
arch/arm/Kconfig
arch/arm/mach-exynos4/mach-nuri.c
25 May, 2011
1 commit
-
Signed-off-by: Liam Girdwood
Signed-off-by: Mark Brown
24 May, 2011
4 commits
-
Currently CODEC and platform drivers have their module reference count
incremented soc_probe_dai_link() whilst CPU DAI drivers have their reference
count incremented in soc_bind_dai_link().CPU DAIs should have their reference count incremented in soc_probe_dai_link()
just like the CODEC and platform drivers.Signed-off-by: Liam Girdwood
Signed-off-by: Mark Brown -
Commit f0fba2ad (ASoC: multi-component - ASoC Multi-Component Support)
broke support for Raumfeld platforms as it didn't take into account the
different hardware features on individual devices.In particular, Raumfeld speakers have no S/PDIF output, so the members
of the snd_soc_card struct must be set dynamically.Signed-off-by: Daniel Mack
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown
Cc: stable@kernel.org -
…rnel/git/khilman/linux-omap-pm into omap-for-linus
-
* 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: (48 commits)
serial: 8250_pci: add support for Cronyx Omega PCI multiserial board.
tty/serial: Fix break handling for PORT_TEGRA
tty/serial: Add explicit PORT_TEGRA type
n_tracerouter and n_tracesink ldisc additions.
Intel PTI implementaiton of MIPI 1149.7.
Kernel documentation for the PTI feature.
export kernel call get_task_comm().
tty: Remove to support serial for S5P6442
pch_phub: Support new device ML7223
8250_pci: Add support for the Digi/IBM PCIe 2-port Adapter
ASoC: Update cx20442 for TTY API change
pch_uart: Support new device ML7223 IOH
parport: Use request_muxed_region for IT87 probe and lock
tty/serial: add support for Xilinx PS UART
n_gsm: Use print_hex_dump_bytes
drivers/tty/moxa.c: Put correct tty value
TTY: tty_io, annotate locking functions
TTY: serial_core, remove superfluous set_task_state
TTY: serial_core, remove invalid test
Char: moxa, fix locking in moxa_write
...Fix up trivial conflicts in drivers/bluetooth/hci_ldisc.c and
drivers/tty/serial/Makefile.I did the hci_ldisc thing as an evil merge, cleaning things up.
22 May, 2011
2 commits
-
…/sound-2.6 into for-2.6.40
-
Commit 22de71b ("ASoC: core - allow ASoC more flexible machine name")
writes "(null)" to driver name string in struct snd_card if card->driver_name
is NULL. This causes segmentation faults with some user space ALSA utilities
like aplay and arecord.Fix this by using the card->name if no driver name is specified.
Signed-off-by: Jarkko Nikula
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown
20 May, 2011
6 commits
-
The prototype of the inline dummy version of tegra_i2s_debug_add
was not consistent with the real version.Reported-by: Rhyland-Klein
Signed-off-by: Stephen Warren
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown -
MODULE_ALIAS is required so that the module will auto-load based on a
platform_device registration in the board file.While we're at it, add some other MODULE_*.
Signed-off-by: Stephen Warren
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown -
…soc-2.6 into topic/asoc
-
The davinci-i2s driver copies the platform data for playback and capture
sram sizes which is in turn used by davinci-pcm to allocate ping-pong
buffers.Copy also the platform data in davinci-mcasp probe.
Signed-off-by: Ben Gardiner
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown -
AK4641 connected via I2S and I2C, jack detection via GPIO.
Signed-off-by: Philipp Zabel
Signed-off-by: Dmitry Artamonow
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown -
A driver for the AK4641 codec used in iPAQ hx4700 and Glofiish M800
among others.Signed-off-by: Harald Welte
Signed-off-by: Philipp Zabel
Signed-off-by: Dmitry Artamonow
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown
19 May, 2011
1 commit
-
Visual inspection shows that max98095_put_eq_enum() and
max98095_put_bq_enum() each have a possible NULL deref of 'pdata'.This change moves the NULL check above the use.
Signed-off-by: Taylor Hutt
Acked-by: Peter Hsiang
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown
17 May, 2011
3 commits
-
Enabling DEBUG_STRICT_USER_COPY_CHECKS causes the following
warning:In file included from arch/x86/include/asm/uaccess.h:573,
from include/linux/poll.h:14,
from include/sound/pcm.h:29,
from include/sound/ac97_codec.h:31,
from sound/soc/soc-core.c:34:
In function 'copy_from_user',
inlined from 'codec_reg_write_file' at
sound/soc/soc-core.c:252:
arch/x86/include/asm/uaccess_64.h:65:
warning: call to 'copy_from_user_overflow' declared with
attribute warning: copy_from_user() buffer size is not provably
correctpresumably due to buf_size being signed causing GCC to fail to
see that buf_size can't become negative.Acked-by: Liam Girdwood
Signed-off-by: Stephen Boyd
Signed-off-by: Mark Brown -
Commit fafd217 ("ASoC: Store a list of widgets in a DAPM mux/mixer kcontrol")
changed the control private data type that is passed to snd_soc_cnew when
creating dapm mixer and mux controls. Commit did not update a few codec
drivers that are using their own put callbacks and thus are accessing a
wrong data type.Signed-off-by: Jarkko Nikula
Tested-by: Stephen Warren
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown
16 May, 2011
8 commits
-
Don't want to upset the DSP.
Signed-off-by: Mark Brown
Acked-by: Liam Girdwood
Cc: stable@kernel.org -
If we're setting the currently applied value for one of the DSP algorithm
configurations we can just skip all the handling as the control set is a
noop. This ensures we do not disrupt a running DSP.Signed-off-by: Mark Brown
Acked-by: Liam Girdwood
Cc: stable@kernel.org -
Signed-off-by: Mark Brown
Acked-by: Liam Girdwood
Cc: stable@kernel.org -
Also fix a left/right typo while we're at it.
Signed-off-by: Mark Brown
Acked-by: Liam Girdwood <lrg@ti.com.
Cc: stable@kernel.org -
According to removing ARCH_S5P6442, we don't need to support
sound for S5P6442.Acked-by: Jassi Brar
Cc: Mark Brown
Signed-off-by: Kukjin Kim -
Added digital mute function in DAI1 and DAI2.
Signed-off-by: Jin Park
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown -
Moved the EX Limiter Mode from dapm widget to control, because it was not
required DAPM route.Signed-off-by: Jin Park
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown -
Fixed invalid register definitions in mixer controls such as left
speaker mixer, left hp mixer and left rec mixer.Signed-off-by: Jin Park
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown
15 May, 2011
1 commit
-
There is an unfortunate difference in return values between spi_write()
and i2c_master_send() so we need an adaptor function to translate.Reported-by: Lars-Peter Clausen
Signed-off-by: Mark Brown
Acked-by: Liam Girdwood