Commit be87cfb4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sound-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 

Pull sound update from Takashi Iwai:
 "This is the second updates for 3.5-rc1.  It's mainly for OMAP4 HDMI
  updates and the device tree updates for OMAP, in addition to a couple
  of PCM accuray improvement and Realtek ALC269VD codec support."

* tag 'sound-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (21 commits)
  ALSA: hda/realtek - Add new codec support for ALC269VD
  ALSA: core: group read of pointer, tstamp and jiffies
  ASoC: OMAP: HDMI: Rename sound card source file
  ASoC: OMAP: HDMI: Make sound card naming more generic
  ASoC: OMAP: HDMI: Make build config options more generic
  ASoC: OMAP: HDMI: Expand capabilities of the HDMI DAI
  ASoC: OMAP: HDMI: Improve how the display state is verified
  ASoC: OMAP: HDMI: Expand configuration of hw_params
  ASoC: OMAP: HDMI: Use the DSS audio interface
  ASoC: OMAP: HDMI: Create a structure for private data of the CPU DAI
  ASoC: OMAP: HDMI: Change error values in HDMI CPU DAI
  ASoC: OMAP: HDMI: Update the platform device names
  ASoC: omap-abe-twl6040: Introduce driver data for runtime parameters
  ASoC: omap-abe-twl6040: Move Digital Mic widget into dapm table
  ASoC: omap-abe-twl6040: Keep only one snd_soc_dai_link structure
  ASoC: omap-dmic: Add device tree bindings
  ASoC: omap-mcpdm: Add device tree bindings
  ASoC: omap-mcbsp: buffer size constraint only applies to playback stream
  ASoC: omap-mcbsp: Use the common interrupt line if supported by the SoC
  ASoC: omap-mcbsp: Remove unused FRAME dma_op_mode
  ...
parents 58823de9 adcc70b2

Documentation/devicetree/bindings/sound/omap-dmic.txt

0 → 100644
+21 −0
Original line number Diff line number Diff line 
* Texas Instruments OMAP4+ Digital Microphone Module



Required properties:

- compatible: "ti,omap4-dmic"

- reg: Register location and size as an array:

       <MPU access base address, size>,

       <L3 interconnect address, size>;

- interrupts: Interrupt number for DMIC

- interrupt-parent: The parent interrupt controller

- ti,hwmods: Name of the hwmod associated with OMAP dmic IP



Example:



dmic: dmic@4012e000 {

	compatible = "ti,omap4-dmic";

	reg = <0x4012e000 0x7f>, /* MPU private access */

	      <0x4902e000 0x7f>; /* L3 Interconnect */

	interrupts = <0 114 0x4>;

	interrupt-parent = <&gic>;

	ti,hwmods = "dmic";

};

Documentation/devicetree/bindings/sound/omap-mcpdm.txt

0 → 100644
+21 −0
Original line number Diff line number Diff line 
* Texas Instruments OMAP4+ McPDM



Required properties:

- compatible: "ti,omap4-mcpdm"

- reg: Register location and size as an array:

       <MPU access base address, size>,

       <L3 interconnect address, size>;

- interrupts: Interrupt number for McPDM

- interrupt-parent: The parent interrupt controller

- ti,hwmods: Name of the hwmod associated to the McPDM



Example:



mcpdm: mcpdm@40132000 {

	compatible = "ti,omap4-mcpdm";

	reg = <0x40132000 0x7f>, /* MPU private access */

	      <0x49032000 0x7f>; /* L3 Interconnect */

	interrupts = <0 112 0x4>;

	interrupt-parent = <&gic>;

	ti,hwmods = "mcpdm";

};

sound/core/pcm_lib.c

+18 −5
Original line number Diff line number Diff line
@@ -313,9 +313,22 @@ static int snd_pcm_update_hw_ptr0(struct snd_pcm_substream *substream, 
	snd_pcm_uframes_t old_hw_ptr, new_hw_ptr, hw_base;

	snd_pcm_sframes_t hdelta, delta;

	unsigned long jdelta;

	unsigned long curr_jiffies;

	struct timespec curr_tstamp;



	old_hw_ptr = runtime->status->hw_ptr;



	/*

	 * group pointer, time and jiffies reads to allow for more

	 * accurate correlations/corrections.

	 * The values are stored at the end of this routine after

	 * corrections for hw_ptr position

	 */

	pos = substream->ops->pointer(substream);

	curr_jiffies = jiffies;

	if (runtime->tstamp_mode == SNDRV_PCM_TSTAMP_ENABLE)

		snd_pcm_gettime(runtime, (struct timespec *)&curr_tstamp);



	if (pos == SNDRV_PCM_POS_XRUN) {

		xrun(substream);

		return -EPIPE;
@@ -343,7 +356,7 @@ static int snd_pcm_update_hw_ptr0(struct snd_pcm_substream *substream, 
		delta = runtime->hw_ptr_interrupt + runtime->period_size;

		if (delta > new_hw_ptr) {

			/* check for double acknowledged interrupts */

			hdelta = jiffies - runtime->hw_ptr_jiffies;

			hdelta = curr_jiffies - runtime->hw_ptr_jiffies;

			if (hdelta > runtime->hw_ptr_buffer_jiffies/2) {

				hw_base += runtime->buffer_size;

				if (hw_base >= runtime->boundary)
@@ -388,7 +401,7 @@ static int snd_pcm_update_hw_ptr0(struct snd_pcm_substream *substream, 
		 * Without regular period interrupts, we have to check

		 * the elapsed time to detect xruns.

		 */

		jdelta = jiffies - runtime->hw_ptr_jiffies;

		jdelta = curr_jiffies - runtime->hw_ptr_jiffies;

		if (jdelta < runtime->hw_ptr_buffer_jiffies / 2)

			goto no_delta_check;

		hdelta = jdelta - delta * HZ / runtime->rate;
@@ -430,7 +443,7 @@ static int snd_pcm_update_hw_ptr0(struct snd_pcm_substream *substream, 
	if (hdelta < runtime->delay)

		goto no_jiffies_check;

	hdelta -= runtime->delay;

	jdelta = jiffies - runtime->hw_ptr_jiffies;

	jdelta = curr_jiffies - runtime->hw_ptr_jiffies;

	if (((hdelta * HZ) / runtime->rate) > jdelta + HZ/100) {

		delta = jdelta /

			(((runtime->period_size * HZ) / runtime->rate)
@@ -492,9 +505,9 @@ static int snd_pcm_update_hw_ptr0(struct snd_pcm_substream *substream, 
	}

	runtime->hw_ptr_base = hw_base;

	runtime->status->hw_ptr = new_hw_ptr;

	runtime->hw_ptr_jiffies = jiffies;

	runtime->hw_ptr_jiffies = curr_jiffies;

	if (runtime->tstamp_mode == SNDRV_PCM_TSTAMP_ENABLE)

		snd_pcm_gettime(runtime, (struct timespec *)&runtime->status->tstamp);

		runtime->status->tstamp = curr_tstamp;



	return snd_pcm_update_state(substream, runtime);

}

sound/pci/hda/patch_realtek.c

+33 −5
Original line number Diff line number Diff line
@@ -2368,6 +2368,7 @@ static struct alc_codec_rename_table rename_tbl[] = { 
	{ 0x10ec0269, 0xffff, 0xa023, "ALC259" },

	{ 0x10ec0269, 0xffff, 0x6023, "ALC281X" },

	{ 0x10ec0269, 0x00f0, 0x0020, "ALC269VC" },

	{ 0x10ec0269, 0x00f0, 0x0030, "ALC269VD" },

	{ 0x10ec0887, 0x00f0, 0x0030, "ALC887-VD" },

	{ 0x10ec0888, 0x00f0, 0x0030, "ALC888-VD" },

	{ 0x10ec0888, 0xf0f0, 0x3020, "ALC886" },
@@ -5614,6 +5615,7 @@ enum { 
	ALC269_TYPE_ALC269VA,

	ALC269_TYPE_ALC269VB,

	ALC269_TYPE_ALC269VC,

	ALC269_TYPE_ALC269VD,

};



/*
@@ -5625,8 +5627,21 @@ static int alc269_parse_auto_config(struct hda_codec *codec) 
	static const hda_nid_t alc269_ssids[] = { 0, 0x1b, 0x14, 0x21 };

	static const hda_nid_t alc269va_ssids[] = { 0x15, 0x1b, 0x14, 0 };

	struct alc_spec *spec = codec->spec;

	const hda_nid_t *ssids = spec->codec_variant == ALC269_TYPE_ALC269VA ?

		alc269va_ssids : alc269_ssids;

	const hda_nid_t *ssids;



	switch (spec->codec_variant) {

	case ALC269_TYPE_ALC269VA:

	case ALC269_TYPE_ALC269VC:

		ssids = alc269va_ssids;

		break;

	case ALC269_TYPE_ALC269VB:

	case ALC269_TYPE_ALC269VD:

		ssids = alc269_ssids;

		break;

	default:

		ssids = alc269_ssids;

		break;

	}



	return alc_parse_auto_config(codec, alc269_ignore, ssids);

}
@@ -5643,6 +5658,11 @@ static void alc269_toggle_power_output(struct hda_codec *codec, int power_up) 


static void alc269_shutup(struct hda_codec *codec)

{

	struct alc_spec *spec = codec->spec;



	if (spec->codec_variant != ALC269_TYPE_ALC269VB)

		return;



	if ((alc_get_coef0(codec) & 0x00ff) == 0x017)

		alc269_toggle_power_output(codec, 0);

	if ((alc_get_coef0(codec) & 0x00ff) == 0x018) {
@@ -5654,19 +5674,24 @@ static void alc269_shutup(struct hda_codec *codec) 
#ifdef CONFIG_PM

static int alc269_resume(struct hda_codec *codec)

{

	if ((alc_get_coef0(codec) & 0x00ff) == 0x018) {

	struct alc_spec *spec = codec->spec;



	if (spec->codec_variant == ALC269_TYPE_ALC269VB ||

			(alc_get_coef0(codec) & 0x00ff) == 0x018) {

		alc269_toggle_power_output(codec, 0);

		msleep(150);

	}



	codec->patch_ops.init(codec);



	if ((alc_get_coef0(codec) & 0x00ff) == 0x017) {

	if (spec->codec_variant == ALC269_TYPE_ALC269VB ||

			(alc_get_coef0(codec) & 0x00ff) == 0x017) {

		alc269_toggle_power_output(codec, 1);

		msleep(200);

	}



	if ((alc_get_coef0(codec) & 0x00ff) == 0x018)

	if (spec->codec_variant == ALC269_TYPE_ALC269VB ||

			(alc_get_coef0(codec) & 0x00ff) == 0x018)

		alc269_toggle_power_output(codec, 1);



	snd_hda_codec_resume_amp(codec);
@@ -6081,6 +6106,9 @@ static int patch_alc269(struct hda_codec *codec) 
				err = alc_codec_rename(codec, "ALC3202");

			spec->codec_variant = ALC269_TYPE_ALC269VC;

			break;

		case 0x0030:

			spec->codec_variant = ALC269_TYPE_ALC269VD;

			break;

		default:

			alc_fix_pll_init(codec, 0x20, 0x04, 15);

		}

sound/soc/omap/Kconfig

+4 −3
Original line number Diff line number Diff line
@@ -109,11 +109,12 @@ config SND_OMAP_SOC_OMAP_ABE_TWL6040 
	  - PandaBoard (4430)

	  - PandaBoardES (4460)



config SND_OMAP_SOC_OMAP4_HDMI

	tristate "SoC Audio support for Texas Instruments OMAP4 HDMI"

	depends on SND_OMAP_SOC && OMAP4_DSS_HDMI && OMAP2_DSS && ARCH_OMAP4

config SND_OMAP_SOC_OMAP_HDMI

	tristate "SoC Audio support for Texas Instruments OMAP HDMI"

	depends on SND_OMAP_SOC && OMAP4_DSS_HDMI && OMAP2_DSS

	select SND_OMAP_SOC_HDMI

	select SND_SOC_OMAP_HDMI_CODEC

	select OMAP4_DSS_HDMI_AUDIO

	help

	  Say Y if you want to add support for SoC HDMI audio on Texas Instruments

	  OMAP4 chips

CRA Git | Maintained and supported by SUSTech CRA and CCSE