From patchwork Tue Oct 3 16:53:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 114704 Delivered-To: patch@linaro.org Received: by 10.80.163.150 with SMTP id s22csp5002672edb; Tue, 3 Oct 2017 09:53:55 -0700 (PDT) X-Google-Smtp-Source: AOwi7QDCMrVdmK8RDu8pAfCdZ2Ons1+mPSCJc8s5Yi7eAdByIk865H0QiUpmXMb+GxCiDXcJhq2q X-Received: by 10.28.13.76 with SMTP id 73mr12885889wmn.101.1507049635496; Tue, 03 Oct 2017 09:53:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507049635; cv=none; d=google.com; s=arc-20160816; b=gKsBw/5GtWcoiwPN/b2JHxvPQtN2NWJ6I884XcZr/hU5OVSQ5YsNpthD/cLcslO4PU 8j02VwitRZJkzLilmEp9jqsdSA74lQTUwcqlG/SVUF/2wgZYkLQRslUaWNOk+n5Di0E/ WPkCTlqwVJskno9bwgGAyaMJyB+3XhA06Y9Q6HCpXCf/ODXiC0SjbV/xoY+Fl6PZc7So n/rxxZ6QsEn+Xx2Ufl9Izf5lsdTA4p5+6Dy8JRbzxBA4HPHBJJbvUXDHS2FMXKdeIDEN YAA3oA6oYZhK0mQ3KjXDjpyUWJZyamtgjoNkfFqh1HPX9OHQQdvbPvEB65KQqV4DtN/4 GD6A== 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=Rmh1pIWeO70W7YJk4pdMa9olZClhm8aX1etJBA6qlAs=; b=PZTBEYn3zurvbkSAhfEZF6FkFIjwZyOCHilTHNzzAODlG3gxbvfAjEWM/7wzrlu+DG aRt90gq8IvECQM8hlInxBqiGtxMYau3QGJJ6QkHStLcnBibNj9jcoj5fn4tsFJlJoqFD kfx+4vTiZGBxDXln/28MZsuYzRTDeH5vD6aku2bCctf9jLCzKXskrSfRSBlvwfzJsc0H OsK8Izz2EgeukIzYree777vBu4OC+UodC8DSbGQhhn6JZAUprM/w95Du7OnP+GK8ASCY 4xMRKngIpZJzZtW2za/nmVnO4VdiWrKtzR3KRcLlBVa+xc7nFdXaw3VAf2PZiNcpbSKa 5qWQ== 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=WRGpuOIY; 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 l12si11105374wrf.98.2017.10.03.09.53.55; Tue, 03 Oct 2017 09:53:55 -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=WRGpuOIY; 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 405FB266E8B; Tue, 3 Oct 2017 18:53:53 +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 3F66A267187; Tue, 3 Oct 2017 18:53:52 +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.0 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, RP_MATCHES_RCVD, 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 488C52668F0 for ; Tue, 3 Oct 2017 18:53:49 +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=RoITJcScd9Eiha6R7zziRoOoyn+r6s5zzC/nwfcOCZA=; b=WRGpuOIYy+3j xPaj9n3AEksSaRY2vGpNnqWSyQd5ytNzzy8bwMvyKZJz8L83B5tuk3rvGsTrqms4D4WvcSW/1T2Jv CZrxECAbelcfajivaGC3oXxifKyT4nakKd+5FvXXCU8WhiFCVpiD2vPsGkVk2EGcuQdoZVnItUhHu HAP2M=; Received: from [2001:470:1f1d:6b5:7e7a:91ff:fede:4a45] (helo=finisterre.ee.mobilebroadband) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1dzQS3-0005Hf-Hv; Tue, 03 Oct 2017 16:53:47 +0000 Received: by finisterre.ee.mobilebroadband (Postfix, from userid 1000) id 7C890440053; Tue, 3 Oct 2017 17:53:46 +0100 (BST) From: Mark Brown To: Kuninori Morimoto In-Reply-To: <87efqmm2hh.wl%kuninori.morimoto.gx@renesas.com> Message-Id: <20171003165346.7C890440053@finisterre.ee.mobilebroadband> Date: Tue, 3 Oct 2017 17:53:46 +0100 (BST) Cc: alsa-devel@alsa-project.org, Mark Brown , Hiroyuki Yokoyama , Simon Subject: [alsa-devel] Applied "ASoC: rcar: skip disabled-SSI nodes" 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: rcar: skip disabled-SSI nodes has been applied to the asoc tree at git://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 9e9e95df06433b4f89cfeef0003af091ee0ebc86 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Mon, 2 Oct 2017 07:37:32 +0000 Subject: [PATCH] ASoC: rcar: skip disabled-SSI nodes The current device tree representation of the R-Car SSI assumes that they are numbered consecutively, starting from 0. Alas, this is not the case with the R8A77995 (D3) SoC which SSI1/SSI2 aren't present. In order to keep the existing device trees working, I'm suggesting to use a disabled node for SSI0/SSI1. Teach the SSI probe to just skip disabled nodes. Signed-off-by: Kuninori Morimoto Tested-by: Hiroyuki Yokoyama Signed-off-by: Mark Brown --- sound/soc/sh/rcar/ssi.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -- 2.14.1 _______________________________________________ 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 fffc07e72627..03c2a1f02643 100644 --- a/sound/soc/sh/rcar/ssi.c +++ b/sound/soc/sh/rcar/ssi.c @@ -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++; }