Commit 440174ac authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/fix/dpcm', 'asoc/fix/imx',... 

Merge remote-tracking branches 'asoc/fix/dpcm', 'asoc/fix/imx', 'asoc/fix/msm8916', 'asoc/fix/multi-pcm', 'asoc/fix/of-graph' and 'asoc/fix/pxa' into asoc-linus
parents 7e5fed09 b1cd2e34 ae1fbdff deab4563 651e9268 c0a480d1 ac1ca3ba

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/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/fsl/imx-ssi.c

+4 −0
Original line number Diff line number Diff line
@@ -527,6 +527,10 @@ static int imx_ssi_probe(struct platform_device *pdev) 
	}



	ssi->irq = platform_get_irq(pdev, 0);

	if (ssi->irq < 0) {

		dev_err(&pdev->dev, "Failed to get IRQ: %d\n", ssi->irq);

		return ssi->irq;

	}



	ssi->clk = devm_clk_get(&pdev->dev, NULL);

	if (IS_ERR(ssi->clk)) {

sound/soc/generic/audio-graph-card.c

+5 −5
Original line number Diff line number Diff line
@@ -224,10 +224,12 @@ static int asoc_graph_card_parse_of(struct graph_card_data *priv) 


	of_for_each_phandle(&it, rc, node, "dais", NULL, 0) {

		ret = asoc_graph_card_dai_link_of(it.node, priv, idx++);

		if (ret < 0) {

			of_node_put(it.node);

		if (ret < 0)



			return ret;

		}

	}



	return asoc_simple_card_parse_card_name(card, NULL);

}
@@ -239,10 +241,8 @@ static int asoc_graph_get_dais_count(struct device *dev) 
	int count = 0;

	int rc;



	of_for_each_phandle(&it, rc, node, "dais", NULL, 0) {

	of_for_each_phandle(&it, rc, node, "dais", NULL, 0)

		count++;

		of_node_put(it.node);

	}



	return count;

}