From patchwork Mon Aug 24 08:30:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 248175 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:522:0:0:0:0 with SMTP id h2csp2397134ils; Mon, 24 Aug 2020 02:46:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJznb/jqaTiBMjClyiqPJSGAqsS9DKJ2PLNObLfUV75Sdbto1yWV3sQAmvBt2loKPnxu3pa0 X-Received: by 2002:a50:de04:: with SMTP id z4mr4639134edk.10.1598262374516; Mon, 24 Aug 2020 02:46:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1598262374; cv=none; d=google.com; s=arc-20160816; b=wicSsgFHcSXIE1Hr0O6+deKkK6fQHVow5P6JqzlmWFL9Ho6tkqJN0KdWmYzI4Ikzbw XDCdp9vMN75qrhM6s0B5M1jDKZ5mPS4ISRMMxqJ0j8pVhIbx/1+cuUI97Kdy0qL2Ao3p 43tdJNYwO2qO5dNKzfHQB4s4SSkc83bUoAQ2Tc2nGt+ITc99CoqXLMXjl21mJOZTKtH1 dgQtiUGuOxsHBIGLox4jK9F64of7d5ZX2VWkYDP2UizqPTIIDvZ3lytDAPT7Uyc3VqKb rpy63/ZOibkM87RLg0888+yN+3k2R1RN/3E+lzDu5MlRkqt2eA3Ml1uRnZq1JdWY5f4k GxTQ== 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=7DzjQMTiwjgN+yqyxhWPqTyjB9PnND6ZyxT1GN04UFw=; b=jIcj8xXMMpFjjRWq07JjIzeRmKVOgIgWXsrDlYCwKTdD74RO/uo57DiBkeWOfpXWA+ RMInmaxXs8t+sSYOR9fh3U6Q4av5s6OQECwh2EKtQom07mszxwIABEw3+BGXwyO7glxa kO0uXJvnPSAd3S5Dl8AdiHgIWKESM55/pNljZSIS4CMR43olSQ4bznVvLBbls3qzpxFh Essv0LHG7QbTbRinsghQi9Jdm1qZWz+7B2fBPrBTmfg/8dYSK4TcTk6GihTmEBooI/iD BgWcqW9n0SsqfN03clLXTAhobICEUt2f+WeSGeEikW45DywHUUrFcnc8DSUpbm8kgas9 Nhag== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=gTWTq7V9; 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 dc26si5853841edb.203.2020.08.24.02.46.14; Mon, 24 Aug 2020 02:46:14 -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=gTWTq7V9; 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 S1728762AbgHXJqH (ORCPT + 15 others); Mon, 24 Aug 2020 05:46:07 -0400 Received: from mail.kernel.org ([198.145.29.99]:34564 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728944AbgHXImZ (ORCPT ); Mon, 24 Aug 2020 04:42:25 -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 784BF2075B; Mon, 24 Aug 2020 08:42:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598258545; bh=9HAS2loCHxQ24PIAcghVs2Z0hXa2Wx19xvuumM0vtFI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gTWTq7V9SlXGmnoi1/4GDGzxvNIFACaEWJbyJtIRVv8W5l/6xy3QqdpAui8HAhb9V LEZG5kCuNorXazsa2FVx/H7opZQRUJyb8ZSwqHpcwJNvAmNfO5HgKBq3sV6JECleCY v39Q7SSCj9+lZUovxYblJ4qUbfWu3D4XncbcYHtU= 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.7 066/124] ASoC: q6routing: add dummy register read/write function Date: Mon, 24 Aug 2020 10:30:00 +0200 Message-Id: <20200824082412.663970116@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200824082409.368269240@linuxfoundation.org> References: <20200824082409.368269240@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 46e50612b92c1..750e6a30444eb 100644 --- a/sound/soc/qcom/qdsp6/q6routing.c +++ b/sound/soc/qcom/qdsp6/q6routing.c @@ -973,6 +973,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 = { .probe = msm_routing_probe, .name = DRV_NAME, @@ -981,6 +995,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)