Received: by 2002:a05:7412:98c1:b0:fa:551:50a7 with SMTP id kc1csp229620rdb; Fri, 5 Jan 2024 08:02:20 -0800 (PST) X-Google-Smtp-Source: AGHT+IFzZIwrpPrTe4eNn0qgSNRBYnYHxG/hrwY5sPTCOwnd5Jh+o+X+VT2SgdMrvbrDhRb2T5Gh X-Received: by 2002:a05:6a20:2591:b0:199:45ab:2915 with SMTP id k17-20020a056a20259100b0019945ab2915mr866631pzd.0.1704470540363; Fri, 05 Jan 2024 08:02:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704470540; cv=none; d=google.com; s=arc-20160816; b=A1ub0IepOGdJdeu592JRRwIGDSlhld9SHmOAQLgjF46A6iXKVpdWJz9hua2f/HHJV8 VW8UEutIb0Af8FiUnHpm4/aIC6Lty9kHIb2lHVbBr9Rq2eqpadwr9XNNI+/LbmoFvruE 6gsxzTQLi4FodbthXJLSHg6+OJGROlcGjpcaIxGPPWp4su8I5xzaVH4XB+QvOQKuJYvY eUCeT7GvGeMWNDj0QQ5mimoA9m8JdrPgkoGyR0rG0KMHZeiynXl33p2eWJwyrZ3PPvSE tjgKNPi1isFQuUFAKKm6ZGOmdp3vbiXAK6qCB+HBGE9tnxlgP1/isAWIyzl6L4mDmueZ 9JGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=qJ0gjfKMOfp9CH0Fl1AfdBLtnAI1t5WhWrFWLERW/vA=; fh=iJvz1+kl97MC+qFV9naLRWeJcJKNAc5zkQmU9UfpBXI=; b=W7qxA9qhtg39O0jjZsKZwJj2Y8JKr+jbYphYhOROjwBlZVLiAWd6QMmRE49VKdyPMs r7I3S01lwhU1l44YJqOEnYVCspJFWnvRcRe98nH6G4/tOdr8yFPQScqcxhkUeqv8ovNr IZzxleMmMlgtkUIV9E2sPkQBWgV6CIDXlz/8tnHe8fuADIaNU/8bnVa2z2dnXuSEFWTq n+6xTf6AgeUttAQ5NkDZ8LwSC90Gd0s251n/7KTiitJbPB77w/bHIWuzYRE+TlohzDo0 p2S+dc5mWuoUqw0exRsU8i194pCftDAxgy+FQLprmFt3C7O8j97tDgHIDAzOnGLHicCo QMyQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="XS/Sb/Bz"; spf=pass (google.com: domain of linux-kernel+bounces-18027-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-18027-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id z68-20020a626547000000b006d9bde5c1aasi1430927pfb.167.2024.01.05.08.02.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Jan 2024 08:02:20 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-18027-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="XS/Sb/Bz"; spf=pass (google.com: domain of linux-kernel+bounces-18027-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-18027-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id 7B919B23FF1 for ; Fri, 5 Jan 2024 16:00:59 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id B804734545; Fri, 5 Jan 2024 15:59:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="XS/Sb/Bz" X-Original-To: linux-kernel@vger.kernel.org Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4A197321AA for ; Fri, 5 Jan 2024 15:59:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-40b5155e154so19033865e9.3 for ; Fri, 05 Jan 2024 07:59:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1704470370; x=1705075170; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=qJ0gjfKMOfp9CH0Fl1AfdBLtnAI1t5WhWrFWLERW/vA=; b=XS/Sb/BzcPN/YiYnQh1ADnuMiAW0yh9gnCJUcvgxtAc3Dc7QAeaap5dcZwG3r+BmsQ zhPbWOPJ2Wlbdm1L8V0ceFSmiUYT6+XxbifY3nttZEzNllKI1kM5bcOshbqo8Bcb12K5 EgRg5PZzg3ntwFiylX0TVdKDDElIDF0IrA/oVt3eIfaoNRrAycPAIqdj49oGxzxTdLUB fZGEJFoNT0goismEutz8xFQhBbI7YBjVzmo7jOTn3CknPWXY4SInnkAH0NZuD5YXx3t4 a2+BOKsK/N9TCeJgpzEb1ZVaxD/q13oFaEOmgV6C/W4CZA/k3xAjMBo0ZrladGbTJeil gZoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704470370; x=1705075170; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qJ0gjfKMOfp9CH0Fl1AfdBLtnAI1t5WhWrFWLERW/vA=; b=vgkZgB6siLMLocEtzABbNkja1i4vDKm5gx5YbfklotSx8oNvBH6AghEOHPRakbVq6B wS9AP2Lz29nhBNaVQkPjRdc7Fm1zSlrjV9AZDX09jvIcTiRdql/fTU7cbZtvZeTcmbt/ zm3faLdoxsW0mK4XlYsbQdgSQA7CxCZO51YUa01DahAnpmrUEWg259W662TaLOp9aFzi Z3IioNzmV9/BVDKtU7bENwtJagji7Qnu2DYaZ4pESZsRBUXjXyFJdXaQHVACIs59CHnC lcrtzbuqpWMgnRV3uwaqag/QJY89P3SfRZcIrCbf771g1nFSLNEKtgU2fInDWbdSFrCh U6OQ== X-Gm-Message-State: AOJu0YznZ7F+EoXw8bo9L6IdK4B3UrMvZkoQub+dafgeALGgI6WhmVNa hCC7NcE2m1vO/z5WpV+FyVCvGjQM2PwAhA== X-Received: by 2002:a05:600c:a0b:b0:40d:8dcc:ffd6 with SMTP id z11-20020a05600c0a0b00b0040d8dccffd6mr1236643wmp.136.1704470370692; Fri, 05 Jan 2024 07:59:30 -0800 (PST) Received: from krzk-bin.. ([178.197.223.112]) by smtp.gmail.com with ESMTPSA id su8-20020a17090703c800b00a29910a9366sm326024ejb.8.2024.01.05.07.59.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Jan 2024 07:59:30 -0800 (PST) From: Krzysztof Kozlowski To: Srinivas Kandagatla , Banajit Goswami , Bjorn Andersson , Konrad Dybcio , Liam Girdwood , Mark Brown , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Philipp Zabel , Jaroslav Kysela , Takashi Iwai , alsa-devel@alsa-project.org, linux-arm-msm@vger.kernel.org, linux-sound@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski , Bartosz Golaszewski , Sean Anderson Subject: [PATCH v2 4/4] ASoC: codecs: wsa884x: Allow sharing reset GPIO Date: Fri, 5 Jan 2024 16:59:18 +0100 Message-Id: <20240105155918.279657-5-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240105155918.279657-1-krzysztof.kozlowski@linaro.org> References: <20240105155918.279657-1-krzysztof.kozlowski@linaro.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit On some boards with multiple WSA8840/WSA8845 speakers, the reset (shutdown) GPIO is shared between two speakers. Use the reset controller framework and its "reset-gpio" driver to handle this case. This allows bring-up and proper handling of all WSA884x speakers on X1E80100-CRD board. Cc: Bartosz Golaszewski Cc: Sean Anderson Signed-off-by: Krzysztof Kozlowski --- If previous patches are fine, then this commit is independent and could be taken via ASoC. --- sound/soc/codecs/wsa884x.c | 53 +++++++++++++++++++++++++++++++------- 1 file changed, 43 insertions(+), 10 deletions(-) diff --git a/sound/soc/codecs/wsa884x.c b/sound/soc/codecs/wsa884x.c index f2653df84e4a..a9767ef0e39d 100644 --- a/sound/soc/codecs/wsa884x.c +++ b/sound/soc/codecs/wsa884x.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -699,6 +700,7 @@ struct wsa884x_priv { struct sdw_stream_runtime *sruntime; struct sdw_port_config port_config[WSA884X_MAX_SWR_PORTS]; struct gpio_desc *sd_n; + struct reset_control *sd_reset; bool port_prepared[WSA884X_MAX_SWR_PORTS]; bool port_enable[WSA884X_MAX_SWR_PORTS]; unsigned int variant; @@ -1799,9 +1801,22 @@ static struct snd_soc_dai_driver wsa884x_dais[] = { }, }; -static void wsa884x_gpio_powerdown(void *data) +static void wsa884x_reset_powerdown(void *data) { - gpiod_direction_output(data, 1); + struct wsa884x_priv *wsa884x = data; + + if (wsa884x->sd_reset) + reset_control_assert(wsa884x->sd_reset); + else + gpiod_direction_output(wsa884x->sd_n, 1); +} + +static void wsa884x_reset_deassert(struct wsa884x_priv *wsa884x) +{ + if (wsa884x->sd_reset) + reset_control_deassert(wsa884x->sd_reset); + else + gpiod_direction_output(wsa884x->sd_n, 0); } static void wsa884x_regulator_disable(void *data) @@ -1809,6 +1824,27 @@ static void wsa884x_regulator_disable(void *data) regulator_bulk_disable(WSA884X_SUPPLIES_NUM, data); } +static int wsa884x_get_reset(struct device *dev, struct wsa884x_priv *wsa884x) +{ + wsa884x->sd_reset = devm_reset_control_get_optional_shared(dev, NULL); + if (IS_ERR(wsa884x->sd_reset)) + return dev_err_probe(dev, PTR_ERR(wsa884x->sd_reset), + "Failed to get reset\n"); + else if (wsa884x->sd_reset) + return 0; + /* + * else: NULL, so use the backwards compatible way for powerdown-gpios, + * which does not handle sharing GPIO properly. + */ + wsa884x->sd_n = devm_gpiod_get_optional(dev, "powerdown", + GPIOD_OUT_HIGH); + if (IS_ERR(wsa884x->sd_n)) + return dev_err_probe(dev, PTR_ERR(wsa884x->sd_n), + "Shutdown Control GPIO not found\n"); + + return 0; +} + static int wsa884x_probe(struct sdw_slave *pdev, const struct sdw_device_id *id) { @@ -1838,11 +1874,9 @@ static int wsa884x_probe(struct sdw_slave *pdev, if (ret) return ret; - wsa884x->sd_n = devm_gpiod_get_optional(dev, "powerdown", - GPIOD_OUT_HIGH); - if (IS_ERR(wsa884x->sd_n)) - return dev_err_probe(dev, PTR_ERR(wsa884x->sd_n), - "Shutdown Control GPIO not found\n"); + ret = wsa884x_get_reset(dev, wsa884x); + if (ret) + return ret; dev_set_drvdata(dev, wsa884x); wsa884x->slave = pdev; @@ -1858,9 +1892,8 @@ static int wsa884x_probe(struct sdw_slave *pdev, pdev->prop.sink_dpn_prop = wsa884x_sink_dpn_prop; pdev->prop.scp_int1_mask = SDW_SCP_INT1_BUS_CLASH | SDW_SCP_INT1_PARITY; - /* Bring out of reset */ - gpiod_direction_output(wsa884x->sd_n, 0); - ret = devm_add_action_or_reset(dev, wsa884x_gpio_powerdown, wsa884x->sd_n); + wsa884x_reset_deassert(wsa884x); + ret = devm_add_action_or_reset(dev, wsa884x_reset_powerdown, wsa884x); if (ret) return ret; -- 2.34.1