Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81ad969d authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'topic/hda' into for-linus 

* topic/hda: (51 commits)
  ALSA: hda - Fix the previous tagra-8ch patch
  ALSA: hda - Add 7.1 support for MSI GX620
  ALSA: support Sony Vaio TT
  ALSA: hda_intel: fix build error when !PM
  ALSA: hda - More Aspire 8930G fixes
  ALSA: hda - Acer Aspire 8930G support
  ALSA: hda - Limit codec-verb retry to limited hardwares
  ALSA: hda - Add codec bus reset and verb-retry at critical errors
  ALSA: hda - Reorder and clean-up ALC268 quirk table
  ALSA: hda - fix audio on LG R510
  ALSA: hda - Macbook[Pro] 5 6ch support
  ALSA: hda-intel: improve initialization for ALC262_HP_BPC model
  ALSA: hda - Jack Mode changes for Sigmatel boards
  ALSA: hda - Support NVIDIA 8 channel HDMI audio
  ALSA: hda - Fix a typo in the previous patch
  ALSA: hda - Fix reverted LED setup for HP
  ALSA: hda - Add more register bits definitions
  ALSA: hda - Always sync writes in single_cmd mode
  ALSA: hda - Support sync after writing a verb
  ALSA: hda - Allow concurrent RIRB access in single_cmd mode
  ...
parents 2f0dabcc f03ecf50

Documentation/sound/alsa/HD-Audio-Models.txt

+15 −3
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ ALC260 
  acer		Acer TravelMate

  will		Will laptops (PB V7900)

  replacer	Replacer 672V

  favorit100	Maxdata Favorit 100XS

  basic		fixed pin assignment (old default model)

  test		for testing/debugging purpose, almost all controls can

		adjusted.  Appearing only when compiled with
@@ -85,10 +86,11 @@ ALC269 
  eeepc-p703	ASUS Eeepc P703 P900A

  eeepc-p901	ASUS Eeepc P901 S101

  fujitsu	FSC Amilo

  lifebook	Fujitsu Lifebook S6420

  auto		auto-config reading BIOS (default)



ALC662/663

==========

ALC662/663/272

==============

  3stack-dig	3-stack (2-channel) with SPDIF

  3stack-6ch	 3-stack (6-channel)

  3stack-6ch-dig 3-stack (6-channel) with SPDIF
@@ -107,6 +109,9 @@ ALC662/663 
  asus-mode4	ASUS

  asus-mode5	ASUS

  asus-mode6	ASUS

  dell		Dell with ALC272

  dell-zm1	Dell ZM1 with ALC272

  samsung-nc10	Samsung NC10 mini notebook

  auto		auto-config reading BIOS (default)



ALC882/885
@@ -118,6 +123,7 @@ ALC882/885 
  asus-a7j	ASUS A7J

  asus-a7m	ASUS A7M

  macpro	MacPro support

  mb5		Macbook 5,1

  mbp3		Macbook Pro rev3

  imac24	iMac 24'' with jack detection

  w2jc		ASUS W2JC
@@ -133,10 +139,12 @@ ALC883/888 
  acer		Acer laptops (Travelmate 3012WTMi, Aspire 5600, etc)

  acer-aspire	Acer Aspire 9810

  acer-aspire-4930g Acer Aspire 4930G

  acer-aspire-8930g Acer Aspire 8930G

  medion	Medion Laptops

  medion-md2	Medion MD2

  targa-dig	Targa/MSI

  targa-2ch-dig	Targs/MSI with 2-channel

  targa-2ch-dig	Targa/MSI with 2-channel

  targa-8ch-dig Targa/MSI with 8-channel (MSI GX620)

  laptop-eapd   3-jack with SPDIF I/O and EAPD (Clevo M540JE, M550JE)

  lenovo-101e	Lenovo 101E

  lenovo-nb0763	Lenovo NB0763
@@ -150,6 +158,9 @@ ALC883/888 
  fujitsu-pi2515 Fujitsu AMILO Pi2515

  fujitsu-xa3530 Fujitsu AMILO XA3530

  3stack-6ch-intel Intel DG33* boards

  asus-p5q	ASUS P5Q-EM boards

  mb31		MacBook 3,1

  sony-vaio-tt  Sony VAIO TT

  auto		auto-config reading BIOS (default)



ALC861/660
@@ -348,6 +359,7 @@ STAC92HD71B* 
  hp-m4		HP mini 1000

  hp-dv5	HP dv series

  hp-hdx	HP HDX series

  hp-dv4-1222nr	HP dv4-1222nr (with LED support)

  auto		BIOS setup (default)



STAC92HD73*

sound/pci/hda/Kconfig

+13 −0
Original line number Diff line number Diff line
@@ -139,6 +139,19 @@ config SND_HDA_CODEC_CONEXANT 
	  snd-hda-codec-conexant.

	  This module is automatically loaded at probing.



config SND_HDA_CODEC_CA0110

	bool "Build Creative CA0110-IBG codec support"

	depends on SND_HDA_INTEL

	default y

	help

	  Say Y here to include Creative CA0110-IBG codec support in

	  snd-hda-intel driver, found on some Creative X-Fi cards.



	  When the HD-audio driver is built as a module, the codec

	  support code is also built as another module,

	  snd-hda-codec-ca0110.

	  This module is automatically loaded at probing.



config SND_HDA_CODEC_CMEDIA

	bool "Build C-Media HD-audio codec support"

	default y

sound/pci/hda/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ snd-hda-codec-analog-objs := patch_analog.o 
snd-hda-codec-idt-objs :=	patch_sigmatel.o

snd-hda-codec-si3054-objs :=	patch_si3054.o

snd-hda-codec-atihdmi-objs :=	patch_atihdmi.o

snd-hda-codec-ca0110-objs :=	patch_ca0110.o

snd-hda-codec-conexant-objs :=	patch_conexant.o

snd-hda-codec-via-objs :=	patch_via.o

snd-hda-codec-nvhdmi-objs :=	patch_nvhdmi.o
@@ -40,6 +41,9 @@ endif 
ifdef CONFIG_SND_HDA_CODEC_ATIHDMI

obj-$(CONFIG_SND_HDA_INTEL) += snd-hda-codec-atihdmi.o

endif

ifdef CONFIG_SND_HDA_CODEC_CA0110

obj-$(CONFIG_SND_HDA_INTEL) += snd-hda-codec-ca0110.o

endif

ifdef CONFIG_SND_HDA_CODEC_CONEXANT

obj-$(CONFIG_SND_HDA_INTEL) += snd-hda-codec-conexant.o

endif

sound/pci/hda/hda_beep.c

+44 −11
Original line number Diff line number Diff line
@@ -45,16 +45,15 @@ static void snd_hda_generate_beep(struct work_struct *work) 
			AC_VERB_SET_BEEP_CONTROL, beep->tone);

}



static int snd_hda_beep_event(struct input_dev *dev, unsigned int type,

				unsigned int code, int hz)

/* (non-standard) Linear beep tone calculation for IDT/STAC codecs 

 *

 * The tone frequency of beep generator on IDT/STAC codecs is

 * defined from the 8bit tone parameter, in Hz,

 *    freq = 48000 * (257 - tone) / 1024

 * that is from 12kHz to 93.75kHz in step of 46.875 hz

 */

static int beep_linear_tone(struct hda_beep *beep, int hz)

{

	struct hda_beep *beep = input_get_drvdata(dev);



	switch (code) {

	case SND_BELL:

		if (hz)

			hz = 1000;

	case SND_TONE:

	hz *= 1000; /* fixed point */

	hz = hz - DIGBEEP_HZ_MIN;

	if (hz < 0)
@@ -65,11 +64,45 @@ static int snd_hda_beep_event(struct input_dev *dev, unsigned int type, 
		hz /= DIGBEEP_HZ_STEP;

		hz++;

	}

	return hz;

}



/* HD-audio standard beep tone parameter calculation

 *

 * The tone frequency in Hz is calculated as

 *   freq = 48000 / (tone * 4)

 * from 47Hz to 12kHz

 */

static int beep_standard_tone(struct hda_beep *beep, int hz)

{

	if (hz <= 0)

		return 0; /* disabled */

	hz = 12000 / hz;

	if (hz > 0xff)

		return 0xff;

	if (hz <= 0)

		return 1;

	return hz;

}



static int snd_hda_beep_event(struct input_dev *dev, unsigned int type,

				unsigned int code, int hz)

{

	struct hda_beep *beep = input_get_drvdata(dev);



	switch (code) {

	case SND_BELL:

		if (hz)

			hz = 1000;

	case SND_TONE:

		if (beep->linear_tone)

			beep->tone = beep_linear_tone(beep, hz);

		else

			beep->tone = beep_standard_tone(beep, hz);

		break;

	default:

		return -1;

	}

	beep->tone = hz;



	/* schedule beep event */

	schedule_work(&beep->beep_work);

sound/pci/hda/hda_beep.h

+3 −2
Original line number Diff line number Diff line
@@ -30,8 +30,9 @@ struct hda_beep { 
	struct hda_codec *codec;

	char phys[32];

	int tone;

	int nid;

	int enabled;

	hda_nid_t nid;

	unsigned int enabled:1;

	unsigned int linear_tone:1;	/* linear tone for IDT/STAC codec */

	struct work_struct beep_work; /* scheduled task for beep event */

};