From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9BA48CCA46C for ; Fri, 16 Oct 2026 12:33:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=FIfA01j4NgeoLAm3VMYV1MlBRJ+XKZi0ynBquSNX7/E=; b=hAVtE738eaaicf ip+M+ioV+CgUqq0oLCX/d/HYZjL5eN6eTBvLa2tkIszY3TB5k2snbVduacG5oyhS9GckudOjLghc0 bN4dDAaiUof3zSpJQ+CE6gb+7u9MgRLs4qSFThnObT3SQ21VB+iPbVVC20MpO0kqK0ai+9I8/gMmy 1KFz1BBPyzKNwesz0C9yq0JHLFDULQa6UccO4mKBVdDRgstGyeYYOUvM3ka8B0KoyMM75HooCkRBA vlzEaaMm2LWkRQ5qZdwM343ScgnC6AerzI4gtRDMBWng9Yo+GIF0q7BIXxxk6jF9+Oxm2k06z2Eik RsLB6XNigUUYVQqj6rTw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1xHh8F-00000002tXx-3apR; Fri, 16 Oct 2026 12:33:55 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1xHh88-00000002tD1-2Hpj; Fri, 16 Oct 2026 12:33:48 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Cc:To:In-Reply-To:References: Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Sender:Reply-To:Content-ID:Content-Description; bh=/5SM0ELWb3f1rnD9eJjxT3f0sXZwPSM6qFPlcQfUFKw=; b=GNzGxZnnEgXgClKfXF1J5Bd8+H jXvrjYoO4UoMsk64z3cqotDpBBxonD78VwvlYR8dUa/2oUpqJS2bDghBJ4fPZH/9BZZhVEyAZVkd9 cscH0WkAcLA+1KQWPH4Egq3CflDS6sNKZnSNeNAvENoabDazWX/+qIq1Lp3bcAJIraovYyjY5MZyf lkYiwBe3RkdB4cy2lUA/0T6g16mOfi8jGnmtk7PBjcQyw2sobDdiLNw70nKywLQ0gMMPztvkleQdJ E5EGGEmmkQu8UzFBkCvB75Q6z3xtmOCx+99EpQf5W7OWjUgQE2iEjgf5/bt4d3iRC9TOvfuood933 6PUWgiWw==; Received: from bali.collaboradmins.com ([2a01:4f8:201:9162::2]) by desiato.infradead.org with esmtps (Exim 4.99.5 #2 (Red Hat Linux)) id 1xHh81-00000001UAC-2GJM; Fri, 16 Oct 2026 12:33:45 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1792154019; bh=3OjaJ0Jwue4KIRgb+NR+YYZzAVgjAUo5mirg5t33LtI=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=eGW5hF4TsCOq9DJ98GbC6D2MDUEGMx7cbqHXjm5iOraDe2cn15HuqHEuTriNZMkR0 DjDTIMbGFFxjQP437eNjM55i4Oo+C+Ypf3Pynq6x/91l8jcrZUlW+Lbu5JkrzlRfrv iu+6++X5q5lWHrO2MkXquqnnfHqKR9vv1kSF5t5nacNfKphOWbueh29CNa7StBc/uj 6B3rXB++3Ruy+NmOWwhnwsL+6fIpIQ3DHuwi8KKPlda61JGm4ppsPgS+Rh3fbBhlos M7j5wWLclp+Rdoixkth68xhIVTKtqOTenV1K0Meuth8mv26blMEaMr2Y+91KbQg806 EDH6IzSSs/KjQ== 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 9F9A817E011B; Fri, 16 Oct 2026 14:33:38 +0200 (CEST) From: Louis-Alexis Eyraud Date: Fri, 16 Oct 2026 14:33:00 +0200 Subject: [PATCH v14 08/23] scsi: ufs: mediatek: Add dual 0.9V supply support MIME-Version: 1.0 Message-Id: <20261016-mt8196-ufs-v14-8-e8d565e0cd45@collabora.com> References: <20261016-mt8196-ufs-v14-0-e8d565e0cd45@collabora.com> In-Reply-To: <20261016-mt8196-ufs-v14-0-e8d565e0cd45@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=1792154009; l=5198; i=louisalexis.eyraud@collabora.com; s=20250113; h=from:subject:message-id; bh=3OjaJ0Jwue4KIRgb+NR+YYZzAVgjAUo5mirg5t33LtI=; b=Aw680jt/R+7NSxt93XTUo1GFnWGnqUyqyIyTxakq1Hu/hYyrd/jEeN4h3C3Uv1yRZQB0scwvu QTnT52ivcuDD7GgLBFhJFoQqdygqbQafTHyxq4x19vaYn67KConq9ps X-Developer-Key: i=louisalexis.eyraud@collabora.com; a=ed25519; pk=CHFBDB2Kqh4EHc6JIqFn69GhxJJAzc0Zr4e8QxtumuM= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20261016_133343_815889_4EA76C88 X-CRM114-Status: GOOD ( 18.93 ) X-BeenThere: linux-phy@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Linux Phy Mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-phy" Errors-To: linux-phy-bounces+linux-phy=archiver.kernel.org@lists.infradead.org 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 bcb7f350984c..c8c5f85507af 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 (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)); + } + if (allow_pwr_on) + 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); @@ -1239,20 +1277,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.0 -- linux-phy mailing list linux-phy@lists.infradead.org https://lists.infradead.org/mailman/listinfo/linux-phy