From patchwork Mon Aug 24 08:30:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 248169 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:522:0:0:0:0 with SMTP id h2csp2392768ils; Mon, 24 Aug 2020 02:37:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyngJBW3MCyYoB7nVm+XmAaYkvNCKJ0dVxzajhYxFkxeVYTWH7Sz8Gk7P+f2SsY4/xsMU4K X-Received: by 2002:a17:906:b04d:: with SMTP id bj13mr4949470ejb.175.1598261872076; Mon, 24 Aug 2020 02:37:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1598261872; cv=none; d=google.com; s=arc-20160816; b=SPMQ9f4nLVn6DxbYIzG+Fav51+/8Bg/EC25X/8ixR1o+ZIzv1OW5lZC7qJ0DzlAk3N CAYNB6EqE6oZMJaR/IGDuEqGMr95zdx4QvB8q2Oqrt3QZz2q+eC5EZMRAJqQXwD9/rjW pa8qQ9imFqeod5G3oSYEMvXHJ76K2IkRWo4OtTPuW2X42QLCCbKjob7q9+t3FOXhqaNr Rygrw4ATEZFrr/+4w1p4z0nCu8kzaIWP2MOF86TPimXEd0XJ5qaOgp7IO4tTaVzgNdss 0xWhx8ed8U2WCsZSsOHRbBe2xjZfdqaSCflpTfJKV1qp4dbUuEh+QyE0r9/tZa8OsOl+ OIcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=WAmJJkMwUsomVcnKLpgUGe2sBByV2/7lOtl5lTzsxiU=; b=c9LTCpH1dTw/8yZQKjUxSapugfLki3ThDXVXetb4JJZNkMQ0e4Yumb1v69lbPVqxVm asWMGr3/ssbm6PAhnzu/BHrJhagrPrgTaIga1RBshiXf7et09Fl+NV64uviCTgLYf/du JSoJstC7kEKco1lxPciEUojB7mPbyaBCgvRlLufgx3hgP+8h8HvY4kVyQoCV3+L1LzxD csb+z6IezDIzoUUp2oxBONFpX6D7Q/GWgYvVWv1hYyy33nlXXSqSgFCy0Gm6MYzkqwd2 ShXj0IKfyqBqqjWhQ8VqPq138hd8c+U3OifuLB7/SJCjpJpeammsDVgIxUMvL1JdjAhz mA9g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=jbhUijaQ; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id v7si2586804edf.94.2020.08.24.02.37.51; Mon, 24 Aug 2020 02:37:52 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=jbhUijaQ; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729383AbgHXIrl (ORCPT + 15 others); Mon, 24 Aug 2020 04:47:41 -0400 Received: from mail.kernel.org ([198.145.29.99]:47658 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729358AbgHXIri (ORCPT ); Mon, 24 Aug 2020 04:47:38 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 43EA2206F0; Mon, 24 Aug 2020 08:47:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598258857; bh=3Ej3eCQIkCDj0Or2d/txWft1A60P9a7pdqb2Z6788GU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jbhUijaQbEhA4gG1b1QvJQ48COVzkXkQEBrJSA6dvxbsPUVQ98QEjQ6qF19kfnI7Y Ma1aEHr9wvtgOz/8nGdWbsJ2UnQeU8SNiTv1oJBmBFBfrehNm77bYx5SfYbdKN1Uph CZIcdHgK3KH3zGgsl6F79sXo3jAnPs6VNe5IKgco= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, John Stultz , Srinivas Kandagatla , Mark Brown , Sasha Levin Subject: [PATCH 5.4 068/107] ASoC: q6routing: add dummy register read/write function Date: Mon, 24 Aug 2020 10:30:34 +0200 Message-Id: <20200824082408.492073736@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200824082405.020301642@linuxfoundation.org> References: <20200824082405.020301642@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Srinivas Kandagatla [ Upstream commit 796a58fe2b8c9b6668db00d92512ec84be663027 ] Most of the DAPM widgets for DSP ASoC components reuse reg field of the widgets for its internal calculations, however these are not real registers. So read/writes to these numbers are not really valid. However ASoC core will read these registers to get default state during startup. With recent changes to ASoC core, every register read/write failures are reported very verbosely. Prior to this fails to reads are totally ignored, so we never saw any error messages. To fix this add dummy read/write function to return default value. Fixes: e3a33673e845 ("ASoC: qdsp6: q6routing: Add q6routing driver") Reported-by: John Stultz Signed-off-by: Srinivas Kandagatla Link: https://lore.kernel.org/r/20200811120205.21805-2-srinivas.kandagatla@linaro.org Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/qcom/qdsp6/q6routing.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) -- 2.25.1 diff --git a/sound/soc/qcom/qdsp6/q6routing.c b/sound/soc/qcom/qdsp6/q6routing.c index ddcd9978cf57b..745cc9dd14f38 100644 --- a/sound/soc/qcom/qdsp6/q6routing.c +++ b/sound/soc/qcom/qdsp6/q6routing.c @@ -996,6 +996,20 @@ static int msm_routing_probe(struct snd_soc_component *c) return 0; } +static unsigned int q6routing_reg_read(struct snd_soc_component *component, + unsigned int reg) +{ + /* default value */ + return 0; +} + +static int q6routing_reg_write(struct snd_soc_component *component, + unsigned int reg, unsigned int val) +{ + /* dummy */ + return 0; +} + static const struct snd_soc_component_driver msm_soc_routing_component = { .ops = &q6pcm_routing_ops, .probe = msm_routing_probe, @@ -1004,6 +1018,8 @@ static const struct snd_soc_component_driver msm_soc_routing_component = { .num_dapm_widgets = ARRAY_SIZE(msm_qdsp6_widgets), .dapm_routes = intercon, .num_dapm_routes = ARRAY_SIZE(intercon), + .read = q6routing_reg_read, + .write = q6routing_reg_write, }; static int q6pcm_routing_probe(struct platform_device *pdev)