Skip to contentSkip to conversation

sound fixes for 2.6.32-rc7

GIT PULL Takashi Iwai 1 participant 1 message Nov 8, 2009

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

Linus,

please pull sound fixes for v2.6.32-rc7 from:

git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git for-linus

containing the following trivial fixes.

Thanks!

Takashi

===

Ben Hutchings (1):
ALSA: snd-aica: declare MODULE_FIRMWARE

Daniel Drake (1):
ALSA: hda - Add OLPC XO-1.5 PCI ID

Daniel T Chen (1):
ALSA: intel8x0: Mute External Amplifier by default for another Sony model

Janusz Krzysztofik (1):
ASoC: OMAP: Don't try to set unsupported OMAP_DMA_DATA_BURST_16 on OMAP1

Jassi Brar (1):
ASoC: S3C64XX I2S: Enable audio-bus clock

Julian Anastasov (1):
ALSA: usb-audio: fix combine_word problem

Randy Dunlap (2):
sound: Use KERN_WARNING instead of KERN_WARN, which does not exist
ALSA: hda, move hp_bseries_system

Takashi Iwai (1):
ALSA: hda - Don't initialize CORB/RIRB for single_cmd mode

Thomas Gleixner (1):
sound: Replace old style lock initializer

Vitaliy Kulikov (1):
ALSA: hda - Enable GPIO control for mute LED on HP systems

---
 sound/oss/dmasound/dmasound_core.c |    4 ++-
 sound/oss/sb_common.c              |    4 +-
 sound/oss/sb_ess.c                 |    2 +-
 sound/pci/hda/hda_intel.c          |   12 ++++--
 sound/pci/hda/patch_conexant.c     |    1 +
 sound/pci/hda/patch_sigmatel.c     |   68 ++++++++++++++++++++++++++++++++++++
 sound/pci/intel8x0.c               |    6 +++
 sound/sh/aica.c                    |    1 +
 sound/soc/omap/omap-pcm.c          |    8 +++-
 sound/soc/s3c24xx/s3c64xx-i2s.c    |    2 +
 sound/usb/usbaudio.h               |    2 +-
 11 files changed, 99 insertions(+), 11 deletions(-)
sound/oss/dmasound/dmasound_core.c +3 -1
index 793b7f4..3f3c3f7 100644
@@ -219,7 +219,9 @@ static int shared_resources_initialised;
      *  Mid level stuff
      */
 
-struct sound_settings dmasound = { .lock = SPIN_LOCK_UNLOCKED };
+struct sound_settings dmasound = {
+	.lock = __SPIN_LOCK_UNLOCKED(dmasound.lock)
+};
 
 static inline void sound_silence(void)
 {
sound/oss/sb_common.c +2 -2
index 77d0e5e..ce4db49 100644
@@ -157,7 +157,7 @@ static void sb_intr (sb_devc *devc)
 				break;
 
 			default:
-				/* printk(KERN_WARN "Sound Blaster: Unexpected interrupt\n"); */
+				/* printk(KERN_WARNING "Sound Blaster: Unexpected interrupt\n"); */
 				;
 		}
 	}
@@ -177,7 +177,7 @@ static void sb_intr (sb_devc *devc)
 				break;
 
 			default:
-				/* printk(KERN_WARN "Sound Blaster: Unexpected interrupt\n"); */
+				/* printk(KERN_WARNING "Sound Blaster: Unexpected interrupt\n"); */
 				;
 		}
 	}
sound/oss/sb_ess.c +1 -1
index 180e95c..51a3d38 100644
@@ -782,7 +782,7 @@ printk(KERN_INFO "FKS: ess_handle_channel %s irq_mode=%d\n", channel, irq_mode);
 			break;
 
 		default:;
-			/* printk(KERN_WARN "ESS: Unexpected interrupt\n"); */
+			/* printk(KERN_WARNING "ESS: Unexpected interrupt\n"); */
 	}
 }
 
sound/pci/hda/hda_intel.c +8 -4
index e340792..6517f58 100644
@@ -722,9 +722,10 @@ static unsigned int azx_rirb_get_response(struct hda_bus *bus,
 		   chip->last_cmd[addr]);
 	chip->single_cmd = 1;
 	bus->response_reset = 0;
-	/* re-initialize CORB/RIRB */
+	/* release CORB/RIRB */
 	azx_free_cmd_io(chip);
-	azx_init_cmd_io(chip);
+	/* disable unsolicited responses */
+	azx_writel(chip, GCTL, azx_readl(chip, GCTL) & ~ICH6_GCTL_UNSOL);
 	return -1;
 }
 
@@ -865,7 +866,9 @@ static int azx_reset(struct azx *chip)
 	}
 
 	/* Accept unsolicited responses */
-	azx_writel(chip, GCTL, azx_readl(chip, GCTL) | ICH6_GCTL_UNSOL);
+	if (!chip->single_cmd)
+		azx_writel(chip, GCTL, azx_readl(chip, GCTL) |
+			   ICH6_GCTL_UNSOL);
 
 	/* detect codecs */
 	if (!chip->codec_mask) {
@@ -980,7 +983,8 @@ static void azx_init_chip(struct azx *chip)
 	azx_int_enable(chip);
 
 	/* initialize the codec command I/O */
-	azx_init_cmd_io(chip);
+	if (!chip->single_cmd)
+		azx_init_cmd_io(chip);
 
 	/* program the position buffer */
 	azx_writel(chip, DPLBASE, (u32)chip->posbuf.addr);
sound/pci/hda/patch_conexant.c +1 -0
index 3fbbc8c..6479e65 100644
@@ -2325,6 +2325,7 @@ static struct snd_pci_quirk cxt5066_cfg_tbl[] = {
 		      CXT5066_LAPTOP),
 	SND_PCI_QUIRK(0x1028, 0x02f5, "Dell",
 		      CXT5066_DELL_LAPTOP),
+	SND_PCI_QUIRK(0x152d, 0x0833, "OLPC XO-1.5", CXT5066_OLPC_XO_1_5),
 	{}
 };
 
sound/pci/hda/patch_sigmatel.c +68 -0

104 lines not on this page · raw message

sound/pci/intel8x0.c +6 -0
index 754867e..aac20fb 100644
@@ -1950,6 +1950,12 @@ static struct ac97_quirk ac97_quirks[] __devinitdata = {
 	},
 	{
 		.subvendor = 0x104d,
+		.subdevice = 0x8144,
+		.name = "Sony",
+		.type = AC97_TUNE_INV_EAPD
+	},
+	{
+		.subvendor = 0x104d,
 		.subdevice = 0x8197,
 		.name = "Sony S1XP",
 		.type = AC97_TUNE_INV_EAPD
sound/sh/aica.c +1 -0
index 583a369..a0df401 100644
@@ -49,6 +49,7 @@ MODULE_AUTHOR("Adrian McMenamin <[email protected]>");
 MODULE_DESCRIPTION("Dreamcast AICA sound (pcm) driver");
 MODULE_LICENSE("GPL");
 MODULE_SUPPORTED_DEVICE("{{Yamaha/SEGA, AICA}}");
+MODULE_FIRMWARE("aica_firmware.bin");
 
 /* module parameters */
 #define CARD_NAME "AICA"
sound/soc/omap/omap-pcm.c +6 -2
index 5735945..6a829ee 100644
@@ -195,8 +195,12 @@ static int omap_pcm_prepare(struct snd_pcm_substream *substream)
 	else
 		omap_enable_dma_irq(prtd->dma_ch, OMAP_DMA_FRAME_IRQ);
 
-	omap_set_dma_src_burst_mode(prtd->dma_ch, OMAP_DMA_DATA_BURST_16);
-	omap_set_dma_dest_burst_mode(prtd->dma_ch, OMAP_DMA_DATA_BURST_16);
+	if (!(cpu_class_is_omap1())) {
+		omap_set_dma_src_burst_mode(prtd->dma_ch,
+						OMAP_DMA_DATA_BURST_16);
+		omap_set_dma_dest_burst_mode(prtd->dma_ch,
+						OMAP_DMA_DATA_BURST_16);
+	}
 
 	return 0;
 }
sound/soc/s3c24xx/s3c64xx-i2s.c +2 -0
index 3c06c40..105a77e 100644
@@ -220,6 +220,8 @@ static __devinit int s3c64xx_iis_dev_probe(struct platform_device *pdev)
 		goto err;
 	}
 
+	clk_enable(i2s->iis_cclk);
+
 	ret = s3c_i2sv2_probe(pdev, dai, i2s, 0);
 	if (ret)
 		goto err_clk;
sound/usb/usbaudio.h +1 -1
index 8e7f789..e9a3a9d 100644
@@ -210,7 +210,7 @@ struct snd_usb_midi_endpoint_info {
 /*
  */
 
-#define combine_word(s)    ((*s) | ((unsigned int)(s)[1] << 8))
+#define combine_word(s)    ((*(s)) | ((unsigned int)(s)[1] << 8))
 #define combine_triple(s)  (combine_word(s) | ((unsigned int)(s)[2] << 16))
 #define combine_quad(s)    (combine_triple(s) | ((unsigned int)(s)[3] << 24))