linux.git/drivers/staging/intel_sst, branch v3.0

Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

2011-05-23T19:49:28+00:00

* 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (970 commits)
  staging: usbip: replace usbip_u{dbg,err,info} and printk with dev_ and pr_
  staging:iio: Trivial kconfig reorganization and uniformity improvements.
  staging:iio:documenation partial update.
  staging:iio: use pollfunc allocation helpers in remaining drivers.
  staging:iio:max1363 misc cleanups and use of for_each_bit_set to simplify event code spitting out.
  staging:iio: implement an iio_info structure to take some of the constant elements out of iio_dev.
  staging:iio:meter:ade7758: Use private data space from iio_allocate_device
  staging:iio:accel:lis3l02dq make write_reg_8 take value not a pointer to value.
  staging:iio: ring core cleanups + check if read_last available in lis3l02dq
  staging:iio:core cleanup: squash tiny wrappers and use dev_set_name to handle creation of event interface name.
  staging:iio: poll func allocation clean up.
  staging:iio:ad7780 trivial unused header cleanup.
  staging:iio:adc: AD7780: Use private data space from iio_allocate_device + trivial fixes
  staging:iio:adc:AD7780: Convert to new channel registration method
  staging:iio:adc: AD7606: Drop dev_data in favour of iio_priv()
  staging:iio:adc: AD7606: Consitently use indio_dev
  staging:iio: Rip out helper for software rings.
  staging:iio:adc:AD7298: Use private data space from iio_allocate_device
  staging:iio: rationalization of different buffer implementation hooks.
  staging:iio:imu:adis16400 avoid allocating rx, tx, and state separately from iio_dev.
  ...

Fix up trivial conflicts in
 - drivers/staging/intel_sst/intelmid.c: patches applied in both branches
 - drivers/staging/rt2860/common/cmm_data_{pci,usb}.c: removed vs spelling
 - drivers/staging/usbip/vhci_sysfs.c: trivial header file inclusion

Merge branch 'topic/asoc' into for-linus

2011-05-22T08:01:33+00:00

sst: tweak the shared functions so we don't crash the ASoC driver

2011-05-11T21:01:45+00:00

The ASoC driver is currently pulling bits from staging rather than its own
copy. Post all the merges and fixes we've put back an assumption that
crashes ASoC so we need to fix it differently.

(See 0ed625b2f2751c249417bd28694e37ef48eb5fbb)

Signed-off-by: Alan Cox 
Signed-off-by: Greg Kroah-Hartman

intel_sst: fix output noises when it's not in playback

2011-05-10T20:00:53+00:00

When the corresponding output device is not in playback, we can hear a little
noises.

Fix it by powering on the device only when it's in playback.

Signed-off-by: Lu Guanqun 
Reviewed-by: Wu Fengguang 
Signed-off-by: Alan Cox 
Signed-off-by: Greg Kroah-Hartman

intel_sst: internal speaker needs setting a GPIO line

2011-05-10T20:00:49+00:00

On Moorestown platform, internal speaker's power line is connected to a GPIO
line, so we need to enable or disable it properly.

Reviewed-by: Wu Fengguang 
Signed-off-by: Jeff Cheng 
Signed-off-by: Lu Guanqun 
Signed-off-by: Wang Xingchao 
Signed-off-by: Alan Cox 
Signed-off-by: Greg Kroah-Hartman

intel_sst: add Master Volume

2011-05-10T19:59:02+00:00

With this patch, Master Volume will control AUDIOLVOL(0x10c) and
AUDIORVOL(0x10d); while PCM Volume will control HPLVOL(0x123) and
HPRVOL(0x124).

Signed-off-by: Lu Guanqun 
Signed-off-by: Alan Cox 
Signed-off-by: Greg Kroah-Hartman

intel_sst: set default output and input device

2011-05-10T19:59:01+00:00

Signed-off-by: Lu Guanqun 
Signed-off-by: Alan Cox 
Signed-off-by: Greg Kroah-Hartman

intel_sst: fix runtime pm issue

2011-05-10T19:59:00+00:00

Use correct api for enabling/disabling runtime pm.  Additionally,
fix runtime suspend/resume to not duplicate pci core functions

Signed-off-by: Chandramouli Narayanan 
Tested-by: Kristen Carlson Accardi 
Signed-off-by: Alan Cox 
Signed-off-by: Greg Kroah-Hartman

intel_sst: intelmid_v2_control: correct jack event type

2011-05-10T19:58:44+00:00

Correct event type of audio jack while receiving long press event.

Signed-off-by: Andy CH Lin 
Signed-off-by: Jekyll Lai 
Signed-off-by: Alan Cox 
Signed-off-by: Greg Kroah-Hartman

intel_sst: MRST can only do 16bit recording

2011-05-10T19:58:43+00:00

Fix bug

	$ arecord -D dsnoop -r 48000 -f S16_LE 1.wav
	ALSA lib pcm_direct.c:980:(snd1_pcm_direct_initialize_slave) unable to install hw params
	ALSA lib pcm_dsnoop.c:604:(snd_pcm_dsnoop_open) unable to initialize slave
	arecord: main:654: audio open error: Interrupted system call

Root cause is, the driver is reporting 32-bit capture capability
that is not supported by the MRST hardware. So the dsnoop plugin
end up requesting 32-bit capture which fails.

Signed-off-by: Wu Fengguang 
Signed-off-by: Alan Cox 
Signed-off-by: Greg Kroah-Hartman