From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=148.251.105.195 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795100786; b=o7pY0hJGVl8QCcWvpJRWJWcdjRwqiM99P/BhL0BUGpeR56R5AbboKCIgd0GgoXqOsesp vaFP/FUADgwEDNhtSaQ93e8qpaMuiJd835im8bqJLO8cCFXI4/KRKCBPnOMtI8aGK8m2X pYi8ju4CSMC/6imgYGp2Kcc2Q9W7FYmWFmAH6YJXqhvel55p4/JuBBSlV8vKx4ORFP9U0 h2XTy9pGbjJgbiyWS/sOrCdzqi4DKmekgehuR1cr9Z+RMmGYbkPe++hqJsKDK1VQCDOy/ 7iyi5oZZ7da5aFaDazOW8lksddhKmH7iZJKO2JUGNJtvjomnAvstPIwl29+XnAptkOQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795100786; h=DMARC-Filter:DKIM-Signature:Received:From:Date:Subject:MIME-Version: Content-Type:Content-Transfer-Encoding:Message-Id:References: In-Reply-To:To:Cc:X-Mailer:X-Developer-Signature:X-Developer-Key; bh=ffI6AfEzW1Rx1Egh4t1RnqkH4d8+dZKNcKTIfEp/srM=; b=Swko7m/IOzeiJuIdIrqOKDIKP9d7l9wuwUYVvJOSd3WO5WhICN45e1tudmMlpI5JLHad BT0ehfMfbI1O71cpq9x2r45z7KrE5UBdFpOuTo6MlMPXhh4UnpaWqH7GWEGU5kbwE1KUm PCM4Dmd57YzUq4yKYbtQZwKP/OEzM0QrdgDi5fRm2PKD8Ie5YNjRnfYuM2cJPEGf+1RVi SmQz7d0Nmn03yBI6tqYnP8r2aAqbpgRps7DyOtXJBRthZ69/hQYyWbn/Cf6RWQEt0WqMx mnUYnBsaiXVEQ9j5P4XG9LUBqKTQnjVG2w+mxvQmrZ/Nns6vCzLnF2zzX+3bT13ozGw== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass header.d=collabora.com header.i=@collabora.com header.a=rsa-sha256 header.s=mail header.b=PxXYaHsm; arc=none smtp.remote-ip=148.251.105.195 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 61EA660A5BCD; Thu, 19 Nov 2026 15:06:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 61EA660A5BCD Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.a=rsa-sha256 header.s=mail header.b=PxXYaHsm DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1795100784; bh=8FkjUranZ840bXgQ/1fMe3Pws1WYKLdRCZ6t3UB3QcQ=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=PxXYaHsmujJAOS0ieWHwFmjYy6MbsL9GiiNSU+G7rvqobbOxioGRDRdxGiykvT2RN QyblgMk1DQUlQipybPe4Ogb5nelN0Wt78v/G69vwXqGNSmmk6EXaxJ6CsCDSfwUMUd PZqRvNjY5U6cBrAyEpjD0sAYV/ghPN3UBXOgscEfp3WjcI7ZCD5jaPVKpORkLTMrkP NI8JmTwPN3IL40CDz9R+aYEp+SlMbHwoOFAILRqtnPLn6YOrrAmAShscBMnzIU+L+g Ag6suG6ybPat7O/0oceZxyv3rw+JU4ACKTq1tF6YRC7BswdoXmMRXGWzGnSzYiQ2i6 dDAW/znljurlA== Received: from yukiji.home (unknown [100.64.0.131]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: laeyraud) by bali.collaboradmins.com (Postfix) with ESMTPSA id C02CC17E0E34; Thu, 19 Nov 2026 16:06:23 +0100 (CET) From: Louis-Alexis Eyraud Date: Thu, 19 Nov 2026 16:05:56 +0100 Subject: [PATCH v15 08/23] scsi: ufs: mediatek: Add dual 0.9V supply support X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20261119-mt8196-ufs-v15-8-aae1eb0382e8@collabora.com> References: <20261119-mt8196-ufs-v15-0-aae1eb0382e8@collabora.com> In-Reply-To: <20261119-mt8196-ufs-v15-0-aae1eb0382e8@collabora.com> To: Chunfeng Yun , Vinod Koul , Neil Armstrong , Manivannan Sadhasivam , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Matthias Brugger , AngeloGioacchino Del Regno , Peter Wang , Chaotian Jing , Alim Akhtar , Bart Van Assche , Bean Huo , Stanley Jhu , Stanley Jhu , "James E.J. Bottomley" , "Martin K. Petersen" , Philipp Zabel , Liam Girdwood , Mark Brown Cc: kernel@collabora.com, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-phy@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-scsi@vger.kernel.org, Nicolas Frattaroli , Louis-Alexis Eyraud X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1795100772; l=5211; i=louisalexis.eyraud@collabora.com; s=20250113; h=from:subject:message-id; bh=8FkjUranZ840bXgQ/1fMe3Pws1WYKLdRCZ6t3UB3QcQ=; b=aUzS5JmGfHPB3WYF3bTglGj3HiMcy8wKXYesPWzAlfbgM4CZvkrKlzcugj7samHxnypxKjVwZ r5wVvqQ3fZkBaDbCWVM4pe0HqWsNQsjmpIU8iaR2/yWBwxd45nj9sN/ X-Developer-Key: i=louisalexis.eyraud@collabora.com; a=ed25519; pk=CHFBDB2Kqh4EHc6JIqFn69GhxJJAzc0Zr4e8QxtumuM= The MT8196 SoC has an additional pin in comparison of the MT8183 SoC, that is used to feed the host controller with a 0.9V supply. In preparation of this SoC support, add in platform data and driver the management a second optional 0.9V regulator named "avdd09-1". Reviewed-by: AngeloGioacchino Del Regno Signed-off-by: Louis-Alexis Eyraud --- drivers/ufs/host/ufs-mediatek.c | 99 +++++++++++++++++++++++++++++++---------- drivers/ufs/host/ufs-mediatek.h | 1 + 2 files changed, 76 insertions(+), 24 deletions(-) diff --git a/drivers/ufs/host/ufs-mediatek.c b/drivers/ufs/host/ufs-mediatek.c index ac04b4145b02..d85824434b94 100644 --- a/drivers/ufs/host/ufs-mediatek.c +++ b/drivers/ufs/host/ufs-mediatek.c @@ -41,6 +41,7 @@ static void _ufs_mtk_clk_scale(struct ufs_hba *hba, bool scale_up); struct ufs_mtk_soc_data { bool has_avdd09; + bool has_avdd09_1; }; static const struct ufs_dev_quirk ufs_mtk_dev_fixups[] = { @@ -513,20 +514,43 @@ static int ufs_mtk_wait_link_state(struct ufs_hba *hba, u32 state, static int ufs_mtk_09v_off(struct ufs_mtk_host *host, bool allow_pwr_on) { struct arm_smccc_res res; - int ret; + int ret, ret2; - if (!host->reg_avdd09) + if (!host->reg_avdd09 && !host->reg_avdd09_1) return 0; ufs_mtk_va09_pwr_ctrl(res, 0); - ret = regulator_disable(host->reg_avdd09); - if (ret) { - dev_err(host->hba->dev, "Failed to disable avdd09-supply: %pe\n", - ERR_PTR(ret)); - if (allow_pwr_on) - ufs_mtk_va09_pwr_ctrl(res, 1); - return ret; + if (host->reg_avdd09) { + ret = regulator_disable(host->reg_avdd09); + if (ret) { + dev_err(host->hba->dev, "Failed to disable avdd09-supply: %pe\n", + ERR_PTR(ret)); + if (allow_pwr_on) + ufs_mtk_va09_pwr_ctrl(res, 1); + + return ret; + } + } + + if (host->reg_avdd09_1) { + ret = regulator_disable(host->reg_avdd09_1); + if (ret) { + dev_err(host->hba->dev, "Failed to disable avdd09-1-supply: %pe\n", + ERR_PTR(ret)); + + if (allow_pwr_on) { + if (host->reg_avdd09) { + ret2 = regulator_enable(host->reg_avdd09); + if (ret2) + dev_err(host->hba->dev, + "Failed to re-enable avdd09-supply: %pe\n", + ERR_PTR(ret2)); + } + ufs_mtk_va09_pwr_ctrl(res, 1); + } + return ret; + } } return 0; @@ -537,14 +561,28 @@ static int ufs_mtk_09v_on(struct ufs_mtk_host *host) struct arm_smccc_res res; int ret; - if (!host->reg_avdd09) + if (!host->reg_avdd09 && !host->reg_avdd09_1) return 0; - ret = regulator_enable(host->reg_avdd09); - if (ret) { - dev_err(host->hba->dev, "Failed to enable avdd09-supply: %pe\n", - ERR_PTR(ret)); - return ret; + if (host->reg_avdd09) { + ret = regulator_enable(host->reg_avdd09); + if (ret) { + dev_err(host->hba->dev, "Failed to enable avdd09-supply: %pe\n", + ERR_PTR(ret)); + return ret; + } + } + + if (host->reg_avdd09_1) { + ret = regulator_enable(host->reg_avdd09_1); + if (ret) { + dev_err(host->hba->dev, "Failed to enable avdd09-1-supply: %pe\n", + ERR_PTR(ret)); + if (host->reg_avdd09) + regulator_disable(host->reg_avdd09); + + return ret; + } } ufs_mtk_va09_pwr_ctrl(res, 1); @@ -1240,20 +1278,33 @@ static int ufs_mtk_get_supplies(struct ufs_mtk_host *host) struct device *dev = host->hba->dev; const struct ufs_mtk_soc_data *data = of_device_get_match_data(dev); - if (!data || !data->has_avdd09) + if (!data) return 0; - host->reg_avdd09 = devm_regulator_get_optional(dev, "avdd09"); - if (IS_ERR(host->reg_avdd09)) { - if (PTR_ERR(host->reg_avdd09) == -ENODEV) { + if (data->has_avdd09) { + host->reg_avdd09 = devm_regulator_get_optional(dev, "avdd09"); + if (IS_ERR(host->reg_avdd09)) { + if (PTR_ERR(host->reg_avdd09) != -ENODEV) { + return dev_err_probe(dev, + PTR_ERR(host->reg_avdd09), + "Failed to get avdd09 regulator: %pe\n", + host->reg_avdd09); + } host->reg_avdd09 = NULL; - return 0; } + } - return dev_err_probe(dev, - PTR_ERR(host->reg_avdd09), - "Failed to get avdd09 regulator: %pe\n", - host->reg_avdd09); + if (data->has_avdd09_1) { + host->reg_avdd09_1 = devm_regulator_get_optional(dev, "avdd09-1"); + if (IS_ERR(host->reg_avdd09_1)) { + if (PTR_ERR(host->reg_avdd09_1) != -ENODEV) { + return dev_err_probe(dev, + PTR_ERR(host->reg_avdd09_1), + "Failed to get avdd09-1 regulator: %pe\n", + host->reg_avdd09_1); + } + host->reg_avdd09_1 = NULL; + } } return 0; diff --git a/drivers/ufs/host/ufs-mediatek.h b/drivers/ufs/host/ufs-mediatek.h index c63740b98e85..477fb9e36555 100644 --- a/drivers/ufs/host/ufs-mediatek.h +++ b/drivers/ufs/host/ufs-mediatek.h @@ -176,6 +176,7 @@ struct ufs_mtk_mcq_intr_info { struct ufs_mtk_host { struct phy *mphy; struct regulator *reg_avdd09; + struct regulator *reg_avdd09_1; struct reset_control_bulk_data resets[MTK_UFS_NUM_RESETS]; struct ufs_hba *hba; struct ufs_mtk_crypt_cfg *crypt; -- 2.56.1