Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp173284ybi; Fri, 24 May 2019 01:59:24 -0700 (PDT) X-Google-Smtp-Source: APXvYqxyMIZjgTxcc90aRHqBJJ1CwpLaFrfGv6WfGH4Y7KT927Ixs7q1GV6YM5pYsnaC4/qIhOkK X-Received: by 2002:a17:902:6bcb:: with SMTP id m11mr33838289plt.318.1558688363975; Fri, 24 May 2019 01:59:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558688363; cv=none; d=google.com; s=arc-20160816; b=ioy+zyIaxWIfi/Z41sljyo7I5pVcuqO7pI85aIMGC9cs6jDInjQSrwFQ6ZmlUNcqwI dOOWYe1l99zLQQHA2IsYKGWNAV8LzDGUuH2Q/ZumqLi8C5fYQj7B1C5n8fu6loAWKTbs PsMN1nwZAi0mtKHRlZq5BG7gY7VtFZSqwR9U0Q7TRuHL1FIr/DLcNyTgVNnCITgr8Sih Dq2PBwXPap1EUdU8kavFBclyeHEsXcMjyWQSvyJDsGxQjPfQq6zDZi0fiOxpgvdRLXUh F2+OV8LEQiA736Ic+K8kUwyMEcQPwWC9XvoMVQIkGDcU1vXSzVd+dq4Mfu0D4qskgv7K 3TXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:dkim-signature:mime-version:message-id :date:subject:cc:to:from; bh=nLIuj+dWoHUdiLPx4+WIEBrzL5eS8acbrvzehEuKewA=; b=GAB0ABEra6aYYXf9MrB6H5I3lYgySTyQjFYnNEzFBn/OH90YCCsmvWdB4OEuj+YBQq zq0uf5inCBfdN8GG9kHOF19Te3cOlscwPpLxAub3WcqI/zddUEee6FZEzE7fkT3IGEbv MUrGs6CvmY0iSpq+mdeUv4o1+RFhRRDx91ENXR68TaIXbHJpY4341+eJ/PhkGvykaBx3 +7fUHcnyEWo++ta7nuLUcqoHkiwcXe01zcZeY6A9jneoO2rclh6lfXNhb08v2xSFp8bH M6gbtQYu/Oczm0ELBQFMxuqIYEW+VVHVOdBls1Q+btSBIXk4mrXGbFKh/0wB5v+lCa3C 9t6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nvidia.com header.s=n1 header.b=U7qLd1q8; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nvidia.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c14si2979947pgd.314.2019.05.24.01.59.05; Fri, 24 May 2019 01:59:23 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nvidia.com header.s=n1 header.b=U7qLd1q8; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nvidia.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390026AbfEXIyY (ORCPT + 99 others); Fri, 24 May 2019 04:54:24 -0400 Received: from hqemgate15.nvidia.com ([216.228.121.64]:2118 "EHLO hqemgate15.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389964AbfEXIyT (ORCPT ); Fri, 24 May 2019 04:54:19 -0400 Received: from hqpgpgate102.nvidia.com (Not Verified[216.228.121.13]) by hqemgate15.nvidia.com (using TLS: TLSv1.2, DES-CBC3-SHA) id ; Fri, 24 May 2019 01:54:13 -0700 Received: from hqmail.nvidia.com ([172.20.161.6]) by hqpgpgate102.nvidia.com (PGP Universal service); Fri, 24 May 2019 01:54:18 -0700 X-PGP-Universal: processed; by hqpgpgate102.nvidia.com on Fri, 24 May 2019 01:54:18 -0700 Received: from HQMAIL108.nvidia.com (172.18.146.13) by HQMAIL106.nvidia.com (172.18.146.12) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Fri, 24 May 2019 08:54:17 +0000 Received: from hqnvemgw02.nvidia.com (172.16.227.111) by HQMAIL108.nvidia.com (172.18.146.13) with Microsoft SMTP Server (TLS) id 15.0.1473.3 via Frontend Transport; Fri, 24 May 2019 08:54:18 +0000 Received: from moonraker.nvidia.com (Not Verified[10.21.132.148]) by hqnvemgw02.nvidia.com with Trustwave SEG (v7,5,8,10121) id ; Fri, 24 May 2019 01:54:17 -0700 From: Jon Hunter To: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai CC: , , , Kuninori Morimoto , Jon Hunter Subject: [PATCH] Revert "ASoC: simple-card: Fix configuration of DAI format" Date: Fri, 24 May 2019 09:54:04 +0100 Message-ID: <1558688044-22025-1-git-send-email-jonathanh@nvidia.com> X-Mailer: git-send-email 2.7.4 X-NVConfidentiality: public MIME-Version: 1.0 Content-Type: text/plain DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nvidia.com; s=n1; t=1558688053; bh=nLIuj+dWoHUdiLPx4+WIEBrzL5eS8acbrvzehEuKewA=; h=X-PGP-Universal:From:To:CC:Subject:Date:Message-ID:X-Mailer: X-NVConfidentiality:MIME-Version:Content-Type; b=U7qLd1q8OQQZhGp7qzKaeHeA6i3Xdhy1PU+tomyMsdXeT4AGyOeWMWaCXa08lSbM6 Ph7h2yRh/+ZedkiWZQnPeGmW0K5ElEw0egotjTyGYhWPBzT205VlCYFU2ppM+kiBFz m6eeyCwAzBO5/yYdYJBIWWnlr27Xx09z0RcImMFsqbe39IRJV06XrGA44rpdD6hpqQ h/N7mlX7YjWvHukBqJEUgsWu1oC14osKxZbMIztu1lG9IE63xMMpwIwDJLsr79cVTg wkmj8u9jXSR5Ma0APD7hh6Y3raoh7J6UeY9SXog8GRaf8PvgiOEWs4vL0SQsWm8P2N wpIIL0Of/k6UA== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Revert commit 069d037aea98 ("ASoC: simple-card: Fix configuration of DAI format"). During further review, it turns out that the actual issue was caused by an incorrectly formatted device-tree node describing the soundcard. The following is incorrect because the simple-audio-card 'bitclock-master' and 'frame-master' properties should not reference the actual codec phandle ... sound { compatible = "simple-audio-card"; ... => simple-audio-card,bitclock-master = <&codec>; => simple-audio-card,frame-master = <&codec>; ... simple-audio-card,cpu { sound-dai = <&xxx>; }; simple-audio-card,codec { => sound-dai = <&codec>; }; }; Rather, these properties should reference the phandle to the 'simple-audio-card,codec' property as shown below ... sound { compatible = "simple-audio-card"; ... => simple-audio-card,bitclock-master = <&codec>; => simple-audio-card,frame-master = <&codec>; ... simple-audio-card,cpu { sound-dai = <&xxx>; }; => codec: simple-audio-card,codec { /* simple-card wants here */ sound-dai = <&xxx>; /* not here */ }; }; Signed-off-by: Jon Hunter --- sound/soc/generic/simple-card.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c index c2a2c5fd0801..d16e894fce2b 100644 --- a/sound/soc/generic/simple-card.c +++ b/sound/soc/generic/simple-card.c @@ -283,6 +283,11 @@ static int simple_dai_link_of(struct asoc_simple_priv *priv, codec_dai = dai_props->codec_dai = &priv->dais[li->dais++]; + ret = asoc_simple_parse_daifmt(dev, node, codec, + prefix, &dai_link->dai_fmt); + if (ret < 0) + goto dai_link_of_err; + simple_parse_mclk_fs(top, cpu, codec, dai_props, prefix); ret = asoc_simple_parse_cpu(cpu, dai_link, &single_cpu); @@ -293,11 +298,6 @@ static int simple_dai_link_of(struct asoc_simple_priv *priv, if (ret < 0) goto dai_link_of_err; - ret = asoc_simple_parse_daifmt(dev, node, dai_link->codecs->of_node, - prefix, &dai_link->dai_fmt); - if (ret < 0) - goto dai_link_of_err; - ret = asoc_simple_parse_platform(plat, dai_link); if (ret < 0) goto dai_link_of_err; -- 2.7.4