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

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

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

Pull sound fixes from Takashi Iwai:
 "Now we hit the usual ASoC-fix-flood in the middle of release.

  Most of the changes are trivial and device-specific, while one
  significant change is the fix for unbalanced of_graph_*() refcounts.
  This involved a change in the graph API itself that had been a bit
  messy"

* tag 'sound-4.13-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: hda - Fix speaker output from VAIO VPCL14M1R
  device property: Fix usecount for of_graph_get_port_parent()
  ASoC: rt5665: fix wrong register for bclk ratio control
  ASoC: Intel: Use MCLK instead of BLCK as the sysclock for RT5514 codec on kabylake platform
  ASoC: Intel: Enabling ASRC for RT5663 codec on kabylake platform
  ASoC: codecs: msm8916-analog: fix DIG_CLK_CTL_RXD3_CLK_EN define
  ASoC: Intel: Skylake: Fix missing sentinels in sst_acpi_mach
  ASoC: sh: hac: add missing "int ret"
  ASoC: samsung: odroid: Fix EPLL frequency values
  ASoC: sgtl5000: Use snd_soc_kcontrol_codec()
  ASoC: rt5665: fix GPIO6 pin function define
  ASoC: ux500: Restore platform DAI assignments
  ASoC: fix pcm-creation regression
  ASoC: do not close shared backend dailink
  ASoC: pxa: SND_PXA2XX_SOC should depend on HAS_DMA
  ASoC: Intel: Skylake: Fix default dma_buffer_size
  ASoC: rt5663: Update the HW default values based on the shipping version
  ASoC: imx-ssi: add check on platform_get_irq return value
parents 83b89ea4 5ef26e96

drivers/of/property.c

+15 −2
Original line number Diff line number Diff line
@@ -708,6 +708,15 @@ struct device_node *of_graph_get_port_parent(struct device_node *node) 
{

	unsigned int depth;



	if (!node)

		return NULL;



	/*

	 * Preserve usecount for passed in node as of_get_next_parent()

	 * will do of_node_put() on it.

	 */

	of_node_get(node);



	/* Walk 3 levels up only if there is 'ports' node. */

	for (depth = 3; depth && node; depth--) {

		node = of_get_next_parent(node);
@@ -728,12 +737,16 @@ EXPORT_SYMBOL(of_graph_get_port_parent); 
struct device_node *of_graph_get_remote_port_parent(

			       const struct device_node *node)

{

	struct device_node *np;

	struct device_node *np, *pp;



	/* Get remote endpoint node. */

	np = of_graph_get_remote_endpoint(node);



	return of_graph_get_port_parent(np);

	pp = of_graph_get_port_parent(np);



	of_node_put(np);



	return pp;

}

EXPORT_SYMBOL(of_graph_get_remote_port_parent);

include/sound/soc.h

+0 −6
Original line number Diff line number Diff line
@@ -795,10 +795,6 @@ struct snd_soc_component_driver { 
	int (*suspend)(struct snd_soc_component *);

	int (*resume)(struct snd_soc_component *);



	/* pcm creation and destruction */

	int (*pcm_new)(struct snd_soc_pcm_runtime *);

	void (*pcm_free)(struct snd_pcm *);



	/* DT */

	int (*of_xlate_dai_name)(struct snd_soc_component *component,

				 struct of_phandle_args *args,
@@ -874,8 +870,6 @@ struct snd_soc_component { 
	void (*remove)(struct snd_soc_component *);

	int (*suspend)(struct snd_soc_component *);

	int (*resume)(struct snd_soc_component *);

	int (*pcm_new)(struct snd_soc_pcm_runtime *);

	void (*pcm_free)(struct snd_pcm *);



	/* machine specific init */

	int (*init)(struct snd_soc_component *component);

sound/pci/hda/patch_realtek.c

+1 −0
Original line number Diff line number Diff line
@@ -2296,6 +2296,7 @@ static const struct snd_pci_quirk alc882_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1043, 0x8691, "ASUS ROG Ranger VIII", ALC882_FIXUP_GPIO3),

	SND_PCI_QUIRK(0x104d, 0x9047, "Sony Vaio TT", ALC889_FIXUP_VAIO_TT),

	SND_PCI_QUIRK(0x104d, 0x905a, "Sony Vaio Z", ALC882_FIXUP_NO_PRIMARY_HP),

	SND_PCI_QUIRK(0x104d, 0x9060, "Sony Vaio VPCL14M1R", ALC882_FIXUP_NO_PRIMARY_HP),

	SND_PCI_QUIRK(0x104d, 0x9043, "Sony Vaio VGC-LN51JGB", ALC882_FIXUP_NO_PRIMARY_HP),

	SND_PCI_QUIRK(0x104d, 0x9044, "Sony VAIO AiO", ALC882_FIXUP_NO_PRIMARY_HP),

sound/soc/codecs/msm8916-wcd-analog.c

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
#define CDC_D_CDC_DIG_CLK_CTL		(0xf04A)

#define DIG_CLK_CTL_RXD1_CLK_EN		BIT(0)

#define DIG_CLK_CTL_RXD2_CLK_EN		BIT(1)

#define DIG_CLK_CTL_RXD3_CLK_EN		BIT(3)

#define DIG_CLK_CTL_RXD3_CLK_EN		BIT(2)

#define DIG_CLK_CTL_TXD_CLK_EN		BIT(4)

#define DIG_CLK_CTL_NCP_CLK_EN_MASK	BIT(6)

#define DIG_CLK_CTL_NCP_CLK_EN		BIT(6)

sound/soc/codecs/rt5663.c

+9 −9
Original line number Diff line number Diff line
@@ -466,7 +466,7 @@ static const struct reg_default rt5663_reg[] = { 
	{ 0x0006, 0x1000 },

	{ 0x000a, 0x0000 },

	{ 0x0010, 0x000f },

	{ 0x0015, 0x42c1 },

	{ 0x0015, 0x42f1 },

	{ 0x0016, 0x0000 },

	{ 0x0018, 0x000b },

	{ 0x0019, 0xafaf },
@@ -509,7 +509,7 @@ static const struct reg_default rt5663_reg[] = { 
	{ 0x008a, 0x0000 },

	{ 0x008b, 0x0000 },

	{ 0x008c, 0x0003 },

	{ 0x008e, 0x0004 },

	{ 0x008e, 0x0008 },

	{ 0x008f, 0x1000 },

	{ 0x0090, 0x0646 },

	{ 0x0091, 0x0e3e },
@@ -520,7 +520,7 @@ static const struct reg_default rt5663_reg[] = { 
	{ 0x0098, 0x0000 },

	{ 0x009a, 0x0000 },

	{ 0x009f, 0x0000 },

	{ 0x00ae, 0x2000 },

	{ 0x00ae, 0x6000 },

	{ 0x00af, 0x0000 },

	{ 0x00b6, 0x0000 },

	{ 0x00b7, 0x0000 },
@@ -538,7 +538,7 @@ static const struct reg_default rt5663_reg[] = { 
	{ 0x00d9, 0x08f9 },

	{ 0x00db, 0x0008 },

	{ 0x00dc, 0x00c0 },

	{ 0x00dd, 0x6724 },

	{ 0x00dd, 0x6729 },

	{ 0x00de, 0x3131 },

	{ 0x00df, 0x0008 },

	{ 0x00e0, 0x4000 },
@@ -578,7 +578,7 @@ static const struct reg_default rt5663_reg[] = { 
	{ 0x0116, 0x0000 },

	{ 0x0117, 0x0f00 },

	{ 0x0118, 0x0006 },

	{ 0x0125, 0x2224 },

	{ 0x0125, 0x2424 },

	{ 0x0126, 0x5550 },

	{ 0x0127, 0x0400 },

	{ 0x0128, 0x7711 },
@@ -596,8 +596,8 @@ static const struct reg_default rt5663_reg[] = { 
	{ 0x0145, 0x0002 },

	{ 0x0146, 0x0000 },

	{ 0x0160, 0x0e80 },

	{ 0x0161, 0x0020 },

	{ 0x0162, 0x0080 },

	{ 0x0161, 0x0080 },

	{ 0x0162, 0x0200 },

	{ 0x0163, 0x0800 },

	{ 0x0164, 0x0000 },

	{ 0x0165, 0x0000 },
@@ -676,8 +676,8 @@ static const struct reg_default rt5663_reg[] = { 
	{ 0x0251, 0x0000 },

	{ 0x0252, 0x028a },

	{ 0x02fa, 0x0000 },

	{ 0x02fb, 0x0000 },

	{ 0x02fc, 0x0000 },

	{ 0x02fb, 0x00a4 },

	{ 0x02fc, 0x0300 },

	{ 0x0300, 0x0000 },

	{ 0x03d0, 0x0000 },

	{ 0x03d1, 0x0000 },