summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
Diffstat (limited to 'sound')
-rw-r--r--sound/i2c/other/Makefile2
-rw-r--r--sound/i2c/other/tea575x-tuner.c577
-rw-r--r--sound/pci/Kconfig12
-rw-r--r--sound/pci/ens1370.c2
-rw-r--r--sound/pci/es1968.c2
-rw-r--r--sound/pci/fm801.c2
-rw-r--r--sound/pci/hda/hda_intel.c36
-rw-r--r--sound/pci/via82xx.c2
-rw-r--r--sound/soc/fsl/imx-sgtl5000.c2
-rw-r--r--sound/soc/fsl/imx-wm8962.c2
-rw-r--r--sound/soc/soc-io.c2
11 files changed, 46 insertions, 595 deletions
diff --git a/sound/i2c/other/Makefile b/sound/i2c/other/Makefile
index c95d8f1..5526b03 100644
--- a/sound/i2c/other/Makefile
+++ b/sound/i2c/other/Makefile
@@ -8,10 +8,8 @@ snd-ak4117-objs := ak4117.o
snd-ak4113-objs := ak4113.o
snd-ak4xxx-adda-objs := ak4xxx-adda.o
snd-pt2258-objs := pt2258.o
-snd-tea575x-tuner-objs := tea575x-tuner.o
# Module Dependency
obj-$(CONFIG_SND_PDAUDIOCF) += snd-ak4117.o
obj-$(CONFIG_SND_ICE1712) += snd-ak4xxx-adda.o
obj-$(CONFIG_SND_ICE1724) += snd-ak4114.o snd-ak4113.o snd-ak4xxx-adda.o snd-pt2258.o
-obj-$(CONFIG_SND_TEA575X) += snd-tea575x-tuner.o
diff --git a/sound/i2c/other/tea575x-tuner.c b/sound/i2c/other/tea575x-tuner.c
deleted file mode 100644
index 8a36a1d..0000000
--- a/sound/i2c/other/tea575x-tuner.c
+++ /dev/null
@@ -1,577 +0,0 @@
-/*
- * ALSA driver for TEA5757/5759 Philips AM/FM radio tuner chips
- *
- * Copyright (c) 2004 Jaroslav Kysela <perex@perex.cz>
- *
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- */
-
-#include <asm/io.h>
-#include <linux/delay.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/slab.h>
-#include <linux/sched.h>
-#include <media/v4l2-device.h>
-#include <media/v4l2-dev.h>
-#include <media/v4l2-fh.h>
-#include <media/v4l2-ioctl.h>
-#include <media/v4l2-event.h>
-#include <sound/tea575x-tuner.h>
-
-MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
-MODULE_DESCRIPTION("Routines for control of TEA5757/5759 Philips AM/FM radio tuner chips");
-MODULE_LICENSE("GPL");
-
-/*
- * definitions
- */
-
-#define TEA575X_BIT_SEARCH (1<<24) /* 1 = search action, 0 = tuned */
-#define TEA575X_BIT_UPDOWN (1<<23) /* 0 = search down, 1 = search up */
-#define TEA575X_BIT_MONO (1<<22) /* 0 = stereo, 1 = mono */
-#define TEA575X_BIT_BAND_MASK (3<<20)
-#define TEA575X_BIT_BAND_FM (0<<20)
-#define TEA575X_BIT_BAND_MW (1<<20)
-#define TEA575X_BIT_BAND_LW (2<<20)
-#define TEA575X_BIT_BAND_SW (3<<20)
-#define TEA575X_BIT_PORT_0 (1<<19) /* user bit */
-#define TEA575X_BIT_PORT_1 (1<<18) /* user bit */
-#define TEA575X_BIT_SEARCH_MASK (3<<16) /* search level */
-#define TEA575X_BIT_SEARCH_5_28 (0<<16) /* FM >5uV, AM >28uV */
-#define TEA575X_BIT_SEARCH_10_40 (1<<16) /* FM >10uV, AM > 40uV */
-#define TEA575X_BIT_SEARCH_30_63 (2<<16) /* FM >30uV, AM > 63uV */
-#define TEA575X_BIT_SEARCH_150_1000 (3<<16) /* FM > 150uV, AM > 1000uV */
-#define TEA575X_BIT_DUMMY (1<<15) /* buffer */
-#define TEA575X_BIT_FREQ_MASK 0x7fff
-
-enum { BAND_FM, BAND_FM_JAPAN, BAND_AM };
-
-static const struct v4l2_frequency_band bands[] = {
- {
- .type = V4L2_TUNER_RADIO,
- .index = 0,
- .capability = V4L2_TUNER_CAP_LOW | V4L2_TUNER_CAP_STEREO |
- V4L2_TUNER_CAP_FREQ_BANDS,
- .rangelow = 87500 * 16,
- .rangehigh = 108000 * 16,
- .modulation = V4L2_BAND_MODULATION_FM,
- },
- {
- .type = V4L2_TUNER_RADIO,
- .index = 0,
- .capability = V4L2_TUNER_CAP_LOW | V4L2_TUNER_CAP_STEREO |
- V4L2_TUNER_CAP_FREQ_BANDS,
- .rangelow = 76000 * 16,
- .rangehigh = 91000 * 16,
- .modulation = V4L2_BAND_MODULATION_FM,
- },
- {
- .type = V4L2_TUNER_RADIO,
- .index = 1,
- .capability = V4L2_TUNER_CAP_LOW | V4L2_TUNER_CAP_FREQ_BANDS,
- .rangelow = 530 * 16,
- .rangehigh = 1710 * 16,
- .modulation = V4L2_BAND_MODULATION_AM,
- },
-};
-
-/*
- * lowlevel part
- */
-
-static void snd_tea575x_write(struct snd_tea575x *tea, unsigned int val)
-{
- u16 l;
- u8 data;
-
- if (tea->ops->write_val)
- return tea->ops->write_val(tea, val);
-
- tea->ops->set_direction(tea, 1);
- udelay(16);
-
- for (l = 25; l > 0; l--) {
- data = (val >> 24) & TEA575X_DATA;
- val <<= 1; /* shift data */
- tea->ops->set_pins(tea, data | TEA575X_WREN);
- udelay(2);
- tea->ops->set_pins(tea, data | TEA575X_WREN | TEA575X_CLK);
- udelay(2);
- tea->ops->set_pins(tea, data | TEA575X_WREN);
- udelay(2);
- }
-
- if (!tea->mute)
- tea->ops->set_pins(tea, 0);
-}
-
-static u32 snd_tea575x_read(struct snd_tea575x *tea)
-{
- u16 l, rdata;
- u32 data = 0;
-
- if (tea->ops->read_val)
- return tea->ops->read_val(tea);
-
- tea->ops->set_direction(tea, 0);
- tea->ops->set_pins(tea, 0);
- udelay(16);
-
- for (l = 24; l--;) {
- tea->ops->set_pins(tea, TEA575X_CLK);
- udelay(2);
- if (!l)
- tea->tuned = tea->ops->get_pins(tea) & TEA575X_MOST ? 0 : 1;
- tea->ops->set_pins(tea, 0);
- udelay(2);
- data <<= 1; /* shift data */
- rdata = tea->ops->get_pins(tea);
- if (!l)
- tea->stereo = (rdata & TEA575X_MOST) ? 0 : 1;
- if (rdata & TEA575X_DATA)
- data++;
- udelay(2);
- }
-
- if (tea->mute)
- tea->ops->set_pins(tea, TEA575X_WREN);
-
- return data;
-}
-
-static u32 snd_tea575x_val_to_freq(struct snd_tea575x *tea, u32 val)
-{
- u32 freq = val & TEA575X_BIT_FREQ_MASK;
-
- if (freq == 0)
- return freq;
-
- switch (tea->band) {
- case BAND_FM:
- /* freq *= 12.5 */
- freq *= 125;
- freq /= 10;
- /* crystal fixup */
- freq -= TEA575X_FMIF;
- break;
- case BAND_FM_JAPAN:
- /* freq *= 12.5 */
- freq *= 125;
- freq /= 10;
- /* crystal fixup */
- freq += TEA575X_FMIF;
- break;
- case BAND_AM:
- /* crystal fixup */
- freq -= TEA575X_AMIF;
- break;
- }
-
- return clamp(freq * 16, bands[tea->band].rangelow,
- bands[tea->band].rangehigh); /* from kHz */
-}
-
-static u32 snd_tea575x_get_freq(struct snd_tea575x *tea)
-{
- return snd_tea575x_val_to_freq(tea, snd_tea575x_read(tea));
-}
-
-void snd_tea575x_set_freq(struct snd_tea575x *tea)
-{
- u32 freq = tea->freq / 16; /* to kHz */
- u32 band = 0;
-
- switch (tea->band) {
- case BAND_FM:
- band = TEA575X_BIT_BAND_FM;
- /* crystal fixup */
- freq += TEA575X_FMIF;
- /* freq /= 12.5 */
- freq *= 10;
- freq /= 125;
- break;
- case BAND_FM_JAPAN:
- band = TEA575X_BIT_BAND_FM;
- /* crystal fixup */
- freq -= TEA575X_FMIF;
- /* freq /= 12.5 */
- freq *= 10;
- freq /= 125;
- break;
- case BAND_AM:
- band = TEA575X_BIT_BAND_MW;
- /* crystal fixup */
- freq += TEA575X_AMIF;
- break;
- }
-
- tea->val &= ~(TEA575X_BIT_FREQ_MASK | TEA575X_BIT_BAND_MASK);
- tea->val |= band;
- tea->val |= freq & TEA575X_BIT_FREQ_MASK;
- snd_tea575x_write(tea, tea->val);
- tea->freq = snd_tea575x_val_to_freq(tea, tea->val);
-}
-
-/*
- * Linux Video interface
- */
-
-static int vidioc_querycap(struct file *file, void *priv,
- struct v4l2_capability *v)
-{
- struct snd_tea575x *tea = video_drvdata(file);
-
- strlcpy(v->driver, tea->v4l2_dev->name, sizeof(v->driver));
- strlcpy(v->card, tea->card, sizeof(v->card));
- strlcat(v->card, tea->tea5759 ? " TEA5759" : " TEA5757", sizeof(v->card));
- strlcpy(v->bus_info, tea->bus_info, sizeof(v->bus_info));
- v->device_caps = V4L2_CAP_TUNER | V4L2_CAP_RADIO;
- if (!tea->cannot_read_data)
- v->device_caps |= V4L2_CAP_HW_FREQ_SEEK;
- v->capabilities = v->device_caps | V4L2_CAP_DEVICE_CAPS;
- return 0;
-}
-
-static int vidioc_enum_freq_bands(struct file *file, void *priv,
- struct v4l2_frequency_band *band)
-{
- struct snd_tea575x *tea = video_drvdata(file);
- int index;
-
- if (band->tuner != 0)
- return -EINVAL;
-
- switch (band->index) {
- case 0:
- if (tea->tea5759)
- index = BAND_FM_JAPAN;
- else
- index = BAND_FM;
- break;
- case 1:
- if (tea->has_am) {
- index = BAND_AM;
- break;
- }
- /* Fall through */
- default:
- return -EINVAL;
- }
-
- *band = bands[index];
- if (!tea->cannot_read_data)
- band->capability |= V4L2_TUNER_CAP_HWSEEK_BOUNDED;
-
- return 0;
-}
-
-static int vidioc_g_tuner(struct file *file, void *priv,
- struct v4l2_tuner *v)
-{
- struct snd_tea575x *tea = video_drvdata(file);
- struct v4l2_frequency_band band_fm = { 0, };
-
- if (v->index > 0)
- return -EINVAL;
-
- snd_tea575x_read(tea);
- vidioc_enum_freq_bands(file, priv, &band_fm);
-
- memset(v, 0, sizeof(*v));
- strlcpy(v->name, tea->has_am ? "FM/AM" : "FM", sizeof(v->name));
- v->type = V4L2_TUNER_RADIO;
- v->capability = band_fm.capability;
- v->rangelow = tea->has_am ? bands[BAND_AM].rangelow : band_fm.rangelow;
- v->rangehigh = band_fm.rangehigh;
- v->rxsubchans = tea->stereo ? V4L2_TUNER_SUB_STEREO : V4L2_TUNER_SUB_MONO;
- v->audmode = (tea->val & TEA575X_BIT_MONO) ?
- V4L2_TUNER_MODE_MONO : V4L2_TUNER_MODE_STEREO;
- v->signal = tea->tuned ? 0xffff : 0;
- return 0;
-}
-
-static int vidioc_s_tuner(struct file *file, void *priv,
- const struct v4l2_tuner *v)
-{
- struct snd_tea575x *tea = video_drvdata(file);
- u32 orig_val = tea->val;
-
- if (v->index)
- return -EINVAL;
- tea->val &= ~TEA575X_BIT_MONO;
- if (v->audmode == V4L2_TUNER_MODE_MONO)
- tea->val |= TEA575X_BIT_MONO;
- /* Only apply changes if currently tuning FM */
- if (tea->band != BAND_AM && tea->val != orig_val)
- snd_tea575x_set_freq(tea);
-
- return 0;
-}
-
-static int vidioc_g_frequency(struct file *file, void *priv,
- struct v4l2_frequency *f)
-{
- struct snd_tea575x *tea = video_drvdata(file);
-
- if (f->tuner != 0)
- return -EINVAL;
- f->type = V4L2_TUNER_RADIO;
- f->frequency = tea->freq;
- return 0;
-}
-
-static int vidioc_s_frequency(struct file *file, void *priv,
- const struct v4l2_frequency *f)
-{
- struct snd_tea575x *tea = video_drvdata(file);
-
- if (f->tuner != 0 || f->type != V4L2_TUNER_RADIO)
- return -EINVAL;
-
- if (tea->has_am && f->frequency < (20000 * 16))
- tea->band = BAND_AM;
- else if (tea->tea5759)
- tea->band = BAND_FM_JAPAN;
- else
- tea->band = BAND_FM;
-
- tea->freq = clamp_t(u32, f->frequency, bands[tea->band].rangelow,
- bands[tea->band].rangehigh);
- snd_tea575x_set_freq(tea);
- return 0;
-}
-
-static int vidioc_s_hw_freq_seek(struct file *file, void *fh,
- const struct v4l2_hw_freq_seek *a)
-{
- struct snd_tea575x *tea = video_drvdata(file);
- unsigned long timeout;
- int i, spacing;
-
- if (tea->cannot_read_data)
- return -ENOTTY;
- if (a->tuner || a->wrap_around)
- return -EINVAL;
-
- if (file->f_flags & O_NONBLOCK)
- return -EWOULDBLOCK;
-
- if (a->rangelow || a->rangehigh) {
- for (i = 0; i < ARRAY_SIZE(bands); i++) {
- if ((i == BAND_FM && tea->tea5759) ||
- (i == BAND_FM_JAPAN && !tea->tea5759) ||
- (i == BAND_AM && !tea->has_am))
- continue;
- if (bands[i].rangelow == a->rangelow &&
- bands[i].rangehigh == a->rangehigh)
- break;
- }
- if (i == ARRAY_SIZE(bands))
- return -EINVAL; /* No matching band found */
- if (i != tea->band) {
- tea->band = i;
- tea->freq = clamp(tea->freq, bands[i].rangelow,
- bands[i].rangehigh);
- snd_tea575x_set_freq(tea);
- }
- }
-
- spacing = (tea->band == BAND_AM) ? 5 : 50; /* kHz */
-
- /* clear the frequency, HW will fill it in */
- tea->val &= ~TEA575X_BIT_FREQ_MASK;
- tea->val |= TEA575X_BIT_SEARCH;
- if (a->seek_upward)
- tea->val |= TEA575X_BIT_UPDOWN;
- else
- tea->val &= ~TEA575X_BIT_UPDOWN;
- snd_tea575x_write(tea, tea->val);
- timeout = jiffies + msecs_to_jiffies(10000);
- for (;;) {
- if (time_after(jiffies, timeout))
- break;
- if (schedule_timeout_interruptible(msecs_to_jiffies(10))) {
- /* some signal arrived, stop search */
- tea->val &= ~TEA575X_BIT_SEARCH;
- snd_tea575x_set_freq(tea);
- return -ERESTARTSYS;
- }
- if (!(snd_tea575x_read(tea) & TEA575X_BIT_SEARCH)) {
- u32 freq;
-
- /* Found a frequency, wait until it can be read */
- for (i = 0; i < 100; i++) {
- msleep(10);
- freq = snd_tea575x_get_freq(tea);
- if (freq) /* available */
- break;
- }
- if (freq == 0) /* shouldn't happen */
- break;
- /*
- * if we moved by less than the spacing, or in the
- * wrong direction, continue seeking
- */
- if (abs(tea->freq - freq) < 16 * spacing ||
- (a->seek_upward && freq < tea->freq) ||
- (!a->seek_upward && freq > tea->freq)) {
- snd_tea575x_write(tea, tea->val);
- continue;
- }
- tea->freq = freq;
- tea->val &= ~TEA575X_BIT_SEARCH;
- return 0;
- }
- }
- tea->val &= ~TEA575X_BIT_SEARCH;
- snd_tea575x_set_freq(tea);
- return -ENODATA;
-}
-
-static int tea575x_s_ctrl(struct v4l2_ctrl *ctrl)
-{
- struct snd_tea575x *tea = container_of(ctrl->handler, struct snd_tea575x, ctrl_handler);
-
- switch (ctrl->id) {
- case V4L2_CID_AUDIO_MUTE:
- tea->mute = ctrl->val;
- snd_tea575x_set_freq(tea);
- return 0;
- }
-
- return -EINVAL;
-}
-
-static const struct v4l2_file_operations tea575x_fops = {
- .unlocked_ioctl = video_ioctl2,
- .open = v4l2_fh_open,
- .release = v4l2_fh_release,
- .poll = v4l2_ctrl_poll,
-};
-
-static const struct v4l2_ioctl_ops tea575x_ioctl_ops = {
- .vidioc_querycap = vidioc_querycap,
- .vidioc_g_tuner = vidioc_g_tuner,
- .vidioc_s_tuner = vidioc_s_tuner,
- .vidioc_g_frequency = vidioc_g_frequency,
- .vidioc_s_frequency = vidioc_s_frequency,
- .vidioc_s_hw_freq_seek = vidioc_s_hw_freq_seek,
- .vidioc_enum_freq_bands = vidioc_enum_freq_bands,
- .vidioc_log_status = v4l2_ctrl_log_status,
- .vidioc_subscribe_event = v4l2_ctrl_subscribe_event,
- .vidioc_unsubscribe_event = v4l2_event_unsubscribe,
-};
-
-static const struct video_device tea575x_radio = {
- .ioctl_ops = &tea575x_ioctl_ops,
- .release = video_device_release_empty,
-};
-
-static const struct v4l2_ctrl_ops tea575x_ctrl_ops = {
- .s_ctrl = tea575x_s_ctrl,
-};
-
-/*
- * initialize all the tea575x chips
- */
-int snd_tea575x_init(struct snd_tea575x *tea, struct module *owner)
-{
- int retval;
-
- tea->mute = true;
-
- /* Not all devices can or know how to read the data back.
- Such devices can set cannot_read_data to true. */
- if (!tea->cannot_read_data) {
- snd_tea575x_write(tea, 0x55AA);
- if (snd_tea575x_read(tea) != 0x55AA)
- return -ENODEV;
- }
-
- tea->val = TEA575X_BIT_BAND_FM | TEA575X_BIT_SEARCH_5_28;
- tea->freq = 90500 * 16; /* 90.5Mhz default */
- snd_tea575x_set_freq(tea);
-
- tea->vd = tea575x_radio;
- video_set_drvdata(&tea->vd, tea);
- mutex_init(&tea->mutex);
- strlcpy(tea->vd.name, tea->v4l2_dev->name, sizeof(tea->vd.name));
- tea->vd.lock = &tea->mutex;
- tea->vd.v4l2_dev = tea->v4l2_dev;
- tea->fops = tea575x_fops;
- tea->fops.owner = owner;
- tea->vd.fops = &tea->fops;
- set_bit(V4L2_FL_USE_FH_PRIO, &tea->vd.flags);
- /* disable hw_freq_seek if we can't use it */
- if (tea->cannot_read_data)
- v4l2_disable_ioctl(&tea->vd, VIDIOC_S_HW_FREQ_SEEK);
-
- if (!tea->cannot_mute) {
- tea->vd.ctrl_handler = &tea->ctrl_handler;
- v4l2_ctrl_handler_init(&tea->ctrl_handler, 1);
- v4l2_ctrl_new_std(&tea->ctrl_handler, &tea575x_ctrl_ops,
- V4L2_CID_AUDIO_MUTE, 0, 1, 1, 1);
- retval = tea->ctrl_handler.error;
- if (retval) {
- v4l2_err(tea->v4l2_dev, "can't initialize controls\n");
- v4l2_ctrl_handler_free(&tea->ctrl_handler);
- return retval;
- }
-
- if (tea->ext_init) {
- retval = tea->ext_init(tea);
- if (retval) {
- v4l2_ctrl_handler_free(&tea->ctrl_handler);
- return retval;
- }
- }
-
- v4l2_ctrl_handler_setup(&tea->ctrl_handler);
- }
-
- retval = video_register_device(&tea->vd, VFL_TYPE_RADIO, tea->radio_nr);
- if (retval) {
- v4l2_err(tea->v4l2_dev, "can't register video device!\n");
- v4l2_ctrl_handler_free(tea->vd.ctrl_handler);
- return retval;
- }
-
- return 0;
-}
-
-void snd_tea575x_exit(struct snd_tea575x *tea)
-{
- video_unregister_device(&tea->vd);
- v4l2_ctrl_handler_free(tea->vd.ctrl_handler);
-}
-
-static int __init alsa_tea575x_module_init(void)
-{
- return 0;
-}
-
-static void __exit alsa_tea575x_module_exit(void)
-{
-}
-
-module_init(alsa_tea575x_module_init)
-module_exit(alsa_tea575x_module_exit)
-
-EXPORT_SYMBOL(snd_tea575x_init);
-EXPORT_SYMBOL(snd_tea575x_exit);
-EXPORT_SYMBOL(snd_tea575x_set_freq);
diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig
index fe6fa93..46ed9e8 100644
--- a/sound/pci/Kconfig
+++ b/sound/pci/Kconfig
@@ -1,10 +1,5 @@
# ALSA PCI drivers
-config SND_TEA575X
- tristate
- depends on SND_FM801_TEA575X_BOOL || SND_ES1968_RADIO || RADIO_SF16FMR2 || RADIO_MAXIRADIO || RADIO_SHARK
- default SND_FM801 || SND_ES1968 || RADIO_SF16FMR2 || RADIO_MAXIRADIO || RADIO_SHARK
-
menuconfig SND_PCI
bool "PCI sound devices"
depends on PCI
@@ -542,7 +537,11 @@ config SND_ES1968_INPUT
config SND_ES1968_RADIO
bool "Enable TEA5757 radio tuner support for es1968"
depends on SND_ES1968
+ depends on MEDIA_RADIO_SUPPORT
depends on VIDEO_V4L2=y || VIDEO_V4L2=SND_ES1968
+ select RADIO_ADAPTERS
+ select RADIO_TEA575X
+
help
Say Y here to include support for TEA5757 radio tuner integrated on
some MediaForte cards (e.g. SF64-PCE2).
@@ -562,7 +561,10 @@ config SND_FM801
config SND_FM801_TEA575X_BOOL
bool "ForteMedia FM801 + TEA5757 tuner"
depends on SND_FM801
+ depends on MEDIA_RADIO_SUPPORT
depends on VIDEO_V4L2=y || VIDEO_V4L2=SND_FM801
+ select RADIO_ADAPTERS
+ select RADIO_TEA575X
help
Say Y here to include support for soundcards based on the ForteMedia
FM801 chip with a TEA5757 tuner (MediaForte SF256-PCS, SF256-PCP and
diff --git a/sound/pci/ens1370.c b/sound/pci/ens1370.c
index ca8929b..61262f3 100644
--- a/sound/pci/ens1370.c
+++ b/sound/pci/ens1370.c
@@ -1842,7 +1842,7 @@ static int snd_ensoniq_create_gameport(struct ensoniq *ensoniq, int dev)
default:
if (!request_region(io_port, 8, "ens137x: gameport")) {
- printk(KERN_WARNING "ens137x: gameport io port 0x%#x in use\n",
+ printk(KERN_WARNING "ens137x: gameport io port %#x in use\n",
io_port);
return -EBUSY;
}
diff --git a/sound/pci/es1968.c b/sound/pci/es1968.c
index 5e2ec96..b0e3d92 100644
--- a/sound/pci/es1968.c
+++ b/sound/pci/es1968.c
@@ -113,7 +113,7 @@
#include <sound/initval.h>
#ifdef CONFIG_SND_ES1968_RADIO
-#include <sound/tea575x-tuner.h>
+#include <media/tea575x.h>
#endif
#define CARD_NAME "ESS Maestro1/2"
diff --git a/sound/pci/fm801.c b/sound/pci/fm801.c
index 706c5b6..45bc8a9 100644
--- a/sound/pci/fm801.c
+++ b/sound/pci/fm801.c
@@ -37,7 +37,7 @@
#include <asm/io.h>
#ifdef CONFIG_SND_FM801_TEA575X_BOOL
-#include <sound/tea575x-tuner.h>
+#include <media/tea575x.h>
#endif
MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 7f88dd6..6e61a01 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -555,6 +555,9 @@ struct azx {
#ifdef CONFIG_SND_HDA_DSP_LOADER
struct azx_dev saved_azx_dev;
#endif
+
+ /* secondary power domain for hdmi audio under vga device */
+ struct dev_pm_domain hdmi_pm_domain;
};
#define CREATE_TRACE_POINTS
@@ -1397,8 +1400,9 @@ static irqreturn_t azx_interrupt(int irq, void *dev_id)
int i, ok;
#ifdef CONFIG_PM_RUNTIME
- if (chip->pci->dev.power.runtime_status != RPM_ACTIVE)
- return IRQ_NONE;
+ if (chip->driver_caps & AZX_DCAPS_PM_RUNTIME)
+ if (chip->pci->dev.power.runtime_status != RPM_ACTIVE)
+ return IRQ_NONE;
#endif
spin_lock(&chip->reg_lock);
@@ -1409,7 +1413,7 @@ static irqreturn_t azx_interrupt(int irq, void *dev_id)
}
status = azx_readl(chip, INTSTS);
- if (status == 0) {
+ if (status == 0 || status == 0xffffffff) {
spin_unlock(&chip->reg_lock);
return IRQ_NONE;
}
@@ -2971,6 +2975,12 @@ static int azx_runtime_suspend(struct device *dev)
struct snd_card *card = dev_get_drvdata(dev);
struct azx *chip = card->private_data;
+ if (chip->disabled)
+ return 0;
+
+ if (!(chip->driver_caps & AZX_DCAPS_PM_RUNTIME))
+ return 0;
+
/* enable controller wake up event */
azx_writew(chip, WAKEEN, azx_readw(chip, WAKEEN) |
STATESTS_INT_MASK);
@@ -2991,6 +3001,12 @@ static int azx_runtime_resume(struct device *dev)
struct hda_codec *codec;
int status;
+ if (chip->disabled)
+ return 0;
+
+ if (!(chip->driver_caps & AZX_DCAPS_PM_RUNTIME))
+ return 0;
+
if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL)
hda_display_power(true);
@@ -3020,6 +3036,9 @@ static int azx_runtime_idle(struct device *dev)
struct snd_card *card = dev_get_drvdata(dev);
struct azx *chip = card->private_data;
+ if (chip->disabled)
+ return 0;
+
if (!power_save_controller ||
!(chip->driver_caps & AZX_DCAPS_PM_RUNTIME))
return -EBUSY;
@@ -3102,13 +3121,19 @@ static void azx_vs_set_state(struct pci_dev *pci,
"%s: %s via VGA-switcheroo\n", pci_name(chip->pci),
disabled ? "Disabling" : "Enabling");
if (disabled) {
+ pm_runtime_put_sync_suspend(&pci->dev);
azx_suspend(&pci->dev);
+ /* when we get suspended by vga switcheroo we end up in D3cold,
+ * however we have no ACPI handle, so pci/acpi can't put us there,
+ * put ourselves there */
+ pci->current_state = PCI_D3cold;
chip->disabled = true;
if (snd_hda_lock_devices(chip->bus))
snd_printk(KERN_WARNING SFX "%s: Cannot lock devices!\n",
pci_name(chip->pci));
} else {
snd_hda_unlock_devices(chip->bus);
+ pm_runtime_get_noresume(&pci->dev);
chip->disabled = false;
azx_resume(&pci->dev);
}
@@ -3163,6 +3188,9 @@ static int register_vga_switcheroo(struct azx *chip)
if (err < 0)
return err;
chip->vga_switcheroo_registered = 1;
+
+ /* register as an optimus hdmi audio power domain */
+ vga_switcheroo_init_domain_pm_optimus_hdmi_audio(&chip->pci->dev, &chip->hdmi_pm_domain);
return 0;
}
#else
@@ -3914,7 +3942,7 @@ static int azx_probe_continue(struct azx *chip)
power_down_all_codecs(chip);
azx_notifier_register(chip);
azx_add_card_list(chip);
- if (chip->driver_caps & AZX_DCAPS_PM_RUNTIME)
+ if ((chip->driver_caps & AZX_DCAPS_PM_RUNTIME) || chip->use_vga_switcheroo)
pm_runtime_put_noidle(&pci->dev);
return 0;
diff --git a/sound/pci/via82xx.c b/sound/pci/via82xx.c
index 3c511d0..5ae6f04 100644
--- a/sound/pci/via82xx.c
+++ b/sound/pci/via82xx.c
@@ -1940,7 +1940,7 @@ static int snd_via686_create_gameport(struct via82xx *chip, unsigned char *legac
r = request_region(JOYSTICK_ADDR, 8, "VIA686 gameport");
if (!r) {
- printk(KERN_WARNING "via82xx: cannot reserve joystick port 0x%#x\n",
+ printk(KERN_WARNING "via82xx: cannot reserve joystick port %#x\n",
JOYSTICK_ADDR);
return -EBUSY;
}
diff --git a/sound/soc/fsl/imx-sgtl5000.c b/sound/soc/fsl/imx-sgtl5000.c
index 389cbfa..46c5b4f 100644
--- a/sound/soc/fsl/imx-sgtl5000.c
+++ b/sound/soc/fsl/imx-sgtl5000.c
@@ -13,7 +13,7 @@
#include <linux/module.h>
#include <linux/of.h>
#include <linux/of_platform.h>
-#include <linux/of_i2c.h>
+#include <linux/i2c.h>
#include <linux/clk.h>
#include <sound/soc.h>
diff --git a/sound/soc/fsl/imx-wm8962.c b/sound/soc/fsl/imx-wm8962.c
index 1d70e27..722afe6 100644
--- a/sound/soc/fsl/imx-wm8962.c
+++ b/sound/soc/fsl/imx-wm8962.c
@@ -15,7 +15,7 @@
#include <linux/module.h>
#include <linux/of_platform.h>
-#include <linux/of_i2c.h>
+#include <linux/i2c.h>
#include <linux/slab.h>
#include <linux/clk.h>
#include <sound/soc.h>
diff --git a/sound/soc/soc-io.c b/sound/soc/soc-io.c
index 8ca9ecc..122c0c1 100644
--- a/sound/soc/soc-io.c
+++ b/sound/soc/soc-io.c
@@ -158,7 +158,7 @@ int snd_soc_codec_set_cache_io(struct snd_soc_codec *codec,
return -EINVAL;
}
- return PTR_RET(codec->control_data);
+ return PTR_ERR_OR_ZERO(codec->control_data);
}
EXPORT_SYMBOL_GPL(snd_soc_codec_set_cache_io);
#else
OpenPOWER on IntegriCloud