From patchwork Mon Apr 16 11:40:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 133452 Delivered-To: patch@linaro.org Received: by 10.46.84.18 with SMTP id i18csp3464904ljb; Mon, 16 Apr 2018 04:40:09 -0700 (PDT) X-Google-Smtp-Source: AIpwx4/zfX7/qO5aHvlA4+4eZ/iTMaS8QYWOVV8zbwFVwnM3oGXf6iwH5ZJFWgpQNMoKYaFicMWh X-Received: by 10.223.183.26 with SMTP id l26mr519064wre.115.1523878809390; Mon, 16 Apr 2018 04:40:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523878809; cv=none; d=google.com; s=arc-20160816; b=JQ4X94QAlIVf/P1+jtod1OR8GfpzUaAXhOZ8qP4jZn4ZWNnaKupFxDMGocikL1CaGE tAcRi6V4jyRbqEnlkS/lwxpgr5wVjh58V2lCRmwSKX6owgkMNhBmPnoaTIryUsm4XqC3 oGhFjT6XeG37igLnDsFKj7HL4giFo45+ovcERU3/bLq1B3O8JqFxaioE1sbQrWyzWjux aQsUyc5S6sq+Ho8vOe7UFh4eMLBFXLPc+eSDmVWiEtpoDBUG8vmRBNOmkkUhSP0tRlSO 5rZbGx5smyyOPM561RVJ7aqT2q4ItGdzF/Bj8FJBbRNNPzjg95RPJ0uN2/d68SWNfMBE suHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:date:message-id:in-reply-to:to:from :dkim-signature:delivered-to:arc-authentication-results; bh=/zcIubkB4eai2ZXSFNMk7hhjCe6ub4Tos/tepF5HzXk=; b=Aa0oBtfKj7HxxL1ZmTJG/xL+XBfoOAs5cvOKFdd+2pcgbBToUeDHYU3eeKsKI8SDyh u0I8qAh5V75w8aac5BJE4NxH/bEWWvoQ/JlkC5GvQzw/+VV66fwsROmsA0ROU3ABMkH+ 7MJtxJUxjfjRtWVMhk0SEiXsD1dmB8Q9MWnE17YCnzvU3qFrff5QTimKPa1j7fgOKdpy wgyp40Ph05lDQO40JeRhQbsrtfLuZGBysepfKs2I2iAqzME7kBtsMxqASQ5Sdvkrqi5G ivrkxry6V9N1VDhN0WfFow46C5KQuzYwHdsrTLR2YNRqRwf3rOqGoIcbEqcEvg6QuLf+ ffKg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=rzmpbTIx; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id z81si2320084wmb.187.2018.04.16.04.40.09; Mon, 16 Apr 2018 04:40:09 -0700 (PDT) Received-SPF: pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) client-ip=77.48.224.243; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=rzmpbTIx; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 01C042673F0; Mon, 16 Apr 2018 13:40:08 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 013862673F0; Mon, 16 Apr 2018 13:40:05 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail1.perex.cz X-Spam-Level: X-Spam-Status: No, score=0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=disabled version=3.4.0 Received: from heliosphere.sirena.org.uk (heliosphere.sirena.org.uk [172.104.155.198]) by alsa0.perex.cz (Postfix) with ESMTP id E982E2673ED for ; Mon, 16 Apr 2018 13:40:02 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Date:Message-Id:In-Reply-To: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner: List-Archive; bh=z+djKcU8BMQtPU0TFMbCr7M+25IFDsWyjt0m4Vk8VRQ=; b=rzmpbTIxhazu vuHVvHEPuos0Y9V6XH5K2v142+KKJBsLbrsZECPnvkGUrlR2JI06ZKjJ+NalFAZpUTzXxJjvkrGLB IoS5DaUu2S+YehuF4Qm2HSSim/UvHgrLakiVBETU+fPUGIuEQ7DC6rg0d1WigquO+ok241fr9+wfz MAyk4=; Received: from debutante.sirena.org.uk ([2001:470:1f1d:6b5::3] helo=debutante) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1f82UK-0005d2-Ux; Mon, 16 Apr 2018 11:40:00 +0000 Received: from broonie by debutante with local (Exim 4.90_1) (envelope-from ) id 1f82UK-0007Yi-Go; Mon, 16 Apr 2018 12:40:00 +0100 From: Mark Brown To: Kuninori Morimoto In-Reply-To: <87r2nmfqbu.wl%kuninori.morimoto.gx@renesas.com> Message-Id: Date: Mon, 16 Apr 2018 12:40:00 +0100 Cc: Mark Brown , Nguyen Viet Dung , "Yokoyama \(Renesas\)" , alsa-devel@alsa-project.org Subject: [alsa-devel] Applied "ASoC: rsnd: don't assume node full path name for HDMI probing" to the asoc tree X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org The patch ASoC: rsnd: don't assume node full path name for HDMI probing has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 9ff7386656f5b7d9524ab7bdf69d508d14800d42 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Wed, 11 Apr 2018 02:10:45 +0000 Subject: [PATCH] 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 6b5ac2f1cb11 ("arm64: dts: renesas: r8a7795: Drop bogus HDMI node names suffixes") 2) node full_name no longer include full path name commit a7e4cfb0a7ca ("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 Tested-by: Nguyen Viet Dung Signed-off-by: Mark Brown --- sound/soc/sh/rcar/ssi.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) -- 2.17.0 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c index 333b802681ad..31ffe3f0e163 100644 --- a/sound/soc/sh/rcar/ssi.c +++ b/sound/soc/sh/rcar/ssi.c @@ -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));