Unverified Commit 9ff73866 authored Apr 11, 2018 by Kuninori Morimoto Committed by Mark Brown Apr 16, 2018

ASoC: rsnd: don't assume node full path name for HDMI probing



Current ssi.c is assuming below 2 things to probing HDMI node.
1) remote node is including "hdmi0" or "hdmi1" in node name
2) remote_ep->full_name is including full path name

But, these assumptions are broken by below
1) Node names should not use numerical suffixes
 commit 6b5ac2f1 ("arm64: dts: renesas: r8a7795: Drop bogus HDMI
                       node names suffixes")
2) node full_name no longer include full path name
 commit a7e4cfb0 ("of/fdt: only store the device node basename
                       in full_name")

Because of these reasons, ssi.c can't probe HDMI on current kernel.
This patch probes HDMI0/1 by using its address.
Note is that we need to keep updating for this address for future
generation chip.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tested-by: Nguyen Viet Dung <dung.nguyen.aj@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

parent d188e140

sound/soc/sh/rcar/ssi.c

+9 −2

Original line number	Diff line number	Diff line
		@@ -1004,19 +1004,26 @@ static void __rsnd_ssi_parse_hdmi_connection(struct rsnd_priv *priv,
		struct device *dev = rsnd_priv_to_dev(priv);
		struct rsnd_mod *mod = rsnd_io_to_mod_ssi(io);
		struct rsnd_ssi *ssi;
		struct device_node *remote_node = of_graph_get_port_parent(remote_ep);

		/* support Gen3 only */
		if (!rsnd_is_gen3(priv))
		return;

		if (!mod)
		return;

		ssi = rsnd_mod_to_ssi(mod);

		if (strstr(remote_ep->full_name, "hdmi0")) {
		/* HDMI0 */
		if (strstr(remote_node->full_name, "hdmi@fead0000")) {
		rsnd_flags_set(ssi, RSND_SSI_HDMI0);
		dev_dbg(dev, "%s[%d] connected to HDMI0\n",
		rsnd_mod_name(mod), rsnd_mod_id(mod));
		}

		if (strstr(remote_ep->full_name, "hdmi1")) {
		/* HDMI1 */
		if (strstr(remote_node->full_name, "hdmi@feae0000")) {
		rsnd_flags_set(ssi, RSND_SSI_HDMI1);
		dev_dbg(dev, "%s[%d] connected to HDMI1\n",
		rsnd_mod_name(mod), rsnd_mod_id(mod));

Admin message