From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D0F0B186E36; Mon, 12 Aug 2024 16:08:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723478908; cv=none; b=ae0DTGSB5vJkMFYxlgxjKp4JpPLM9naOqT20SCL/Q7ZYbJoR/ovlRw/glKcy5E9JQNirHzzKv3QLnL2tkpbXtuxOIH9Gm03n4GzqdVLlK0uhvnEsup4UmN6/uoJ6DOlxDzP1eoESjnzUw+BiTitG7LMSrgr5HyFTGBfgP+u/hHA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723478908; c=relaxed/simple; bh=zpq+SE+v84XAPwMYxRYkqLRpwSPUT/qmxep27uZozw0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KG21dD1wHVY8YiHUvKzx4Um2LCUvE3nlD6+N4dL23M/jdPC502t+ghUWeGdZ5iPD/XCq1Bb2bNwk8lpXh7w9gB9+JT7q6+TmC0ElfBnEiJBVxYk7wstNExF3Thr0aIMjNtAR3RF1h4nK4wl7YM07Glj0VK0nqL3zmm1nwH46C+8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=H7duNnbf; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="H7duNnbf" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3FD65C32782; Mon, 12 Aug 2024 16:08:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1723478908; bh=zpq+SE+v84XAPwMYxRYkqLRpwSPUT/qmxep27uZozw0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=H7duNnbfRhHlcAfuJ+Ah8Uqnq1A/fNk3iwSAO0iVGcnFcaG9CP2SIRo8GNflZ1d4c bULozYgz0eoCmdT3m3qT8Su1GPbT+9g0OYi89TNj8CKA2ay/TkCoJkqFnCUjd2miH5 lkdJ8aik550GiavEirF+aVUt7Qb47BREH0if6IgY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Krzysztof Kozlowski , Srinivas Kandagatla , Dmitry Baryshkov , Mark Brown , Sasha Levin , Neil Armstrong Subject: [PATCH 6.1 074/150] ASoC: codecs: wsa883x: parse port-mapping information Date: Mon, 12 Aug 2024 18:02:35 +0200 Message-ID: <20240812160128.031753175@linuxfoundation.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240812160125.139701076@linuxfoundation.org> References: <20240812160125.139701076@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Srinivas Kandagatla [ Upstream commit 1cf3295bd108abbd7f128071ae9775fd18394ca9 ] Add support to parse static master port map information from device tree. Reviewed-by: Krzysztof Kozlowski Tested-by: Krzysztof Kozlowski Tested-by: Neil Armstrong # on SM8650-HDK Signed-off-by: Srinivas Kandagatla Reviewed-by: Dmitry Baryshkov Link: https://patch.msgid.link/20240626-port-map-v2-2-6cc1c5608cdd@linaro.org Signed-off-by: Mark Brown Stable-dep-of: 6801ac36f256 ("ASoC: codecs: wsa883x: Correct Soundwire ports mask") Signed-off-by: Sasha Levin --- sound/soc/codecs/wsa883x.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sound/soc/codecs/wsa883x.c b/sound/soc/codecs/wsa883x.c index cd96c35a150c8..908f3c5035721 100644 --- a/sound/soc/codecs/wsa883x.c +++ b/sound/soc/codecs/wsa883x.c @@ -1410,6 +1410,14 @@ static int wsa883x_probe(struct sdw_slave *pdev, wsa883x->sconfig.direction = SDW_DATA_DIR_RX; wsa883x->sconfig.type = SDW_STREAM_PDM; + /** + * Port map index starts with 0, however the data port for this codec + * are from index 1 + */ + if (of_property_read_u32_array(dev->of_node, "qcom,port-mapping", &pdev->m_port_map[1], + WSA883X_MAX_SWR_PORTS)) + dev_dbg(dev, "Static Port mapping not specified\n"); + pdev->prop.sink_ports = GENMASK(WSA883X_MAX_SWR_PORTS, 0); pdev->prop.simple_clk_stop_capable = true; pdev->prop.sink_dpn_prop = wsa_sink_dpn_prop; -- 2.43.0