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

Unverified Commit 1ef6f346 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/fix/rcar' into asoc-linus

parents eefb175f 9e9e95df

sound/soc/sh/rcar/adg.c

+2 −2
Original line number Diff line number Diff line
@@ -479,10 +479,10 @@ static void rsnd_adg_get_clkout(struct rsnd_priv *priv, 
	}



	if (req_rate[0] % 48000 == 0)

		adg->flags = AUDIO_OUT_48;

		adg->flags |= AUDIO_OUT_48;



	if (of_get_property(np, "clkout-lr-asynchronous", NULL))

		adg->flags = LRCLK_ASYNC;

		adg->flags |= LRCLK_ASYNC;



	/*

	 * This driver is assuming that AUDIO_CLKA/AUDIO_CLKB/AUDIO_CLKC

sound/soc/sh/rcar/ssi.c

+4 −1
Original line number Diff line number Diff line
@@ -1112,6 +1112,9 @@ int rsnd_ssi_probe(struct rsnd_priv *priv) 


	i = 0;

	for_each_child_of_node(node, np) {

		if (!of_device_is_available(np))

			goto skip;



		ssi = rsnd_ssi_get(priv, i);



		snprintf(name, RSND_SSI_NAME_SIZE, "%s.%d",
@@ -1148,7 +1151,7 @@ int rsnd_ssi_probe(struct rsnd_priv *priv) 
			of_node_put(np);

			goto rsnd_ssi_probe_done;

		}



skip:

		i++;

	}