From patchwork Thu Oct 20 13:09:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fadwa Chiby X-Patchwork-Id: 6204 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4242:0:0:0:0:0 with SMTP id s2csp104100wrr; Thu, 20 Oct 2022 06:15:07 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5ZXpOTbwuL6StyWB6Fcdp4URyGH4IEiV3ALaoOmDnI/B4X+TJuAL+zAN80Tz5XLiHrRsaM X-Received: by 2002:a17:907:2c59:b0:78d:8e03:134 with SMTP id hf25-20020a1709072c5900b0078d8e030134mr10657122ejc.310.1666271707481; Thu, 20 Oct 2022 06:15:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666271707; cv=none; d=google.com; s=arc-20160816; b=AE+oeviBiYgdAV5e8KEQ6vMFjRwXdXmLTa+iPMPrcUIDF8sr9Uvz8ojMOe/MhJPJ2R Io9b7i0OIZyIwD8htnbTGZ4X5nY9zhNq09+duMLv3Gz9EDRJzA8lJKyFDPgRgCrbfWpZ RiiCMu+MZ1mQ7KBGO00T2TfMHsFOBDJ47vdCaoLnkZtl4CrwsGkUJ1jzsficoW8DJksA zRPswkokaZxhU4ShzaE1Ga1fI4vKV5ctw6gf3rzu2d3t9pSzfcq1s50jr2kmW2BRdNJx Cwy7Nj3PKBKGoEoz+91XTkYrJMuwVsmTxhB0JKsbhSmiGLZ6wL05JGeSiTzecvjpFk4H 0Wpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=J4boSMDIMSEVQTaENzgDytuelvqQTNOGg+C0gp1qMNY=; b=D/ENazr7jUcxyUCL1v2iBuf2s2yf1hkfQ9zCjBM7SYpPJm2mhGMyBd8U8GgfUdYyEF fPwDgipoe0jq5SWicxpWyimXM3eoSQnQfGg677PcC9KHLgoqQVJ7EW9dAw0opHBZMW5g CNhNIPpmN7djtaY6pchSIB2jsK9uDstKFxSuvuD2vIWG47xE38WhBp8KVX54XVH/zIIZ /25RJCdkcIqhgoHsQGopRtjp5IIFT3XnMvA91DmCE+GZxq1rrcps5GuHUL68Ja8kghIZ EUPvurrlh7z23lFevAXJIlS/iCtQtehrbxQ3jP9Fdkp6IC7lgpzXWZ0D5x1I25gRybHt OCzA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20210112.gappssmtp.com header.s=20210112 header.b="E/Hioe+j"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f20-20020a0564021e9400b0045cecdc1fbcsi19085103edf.9.2022.10.20.06.14.40; Thu, 20 Oct 2022 06:15:07 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@baylibre-com.20210112.gappssmtp.com header.s=20210112 header.b="E/Hioe+j"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230414AbiJTNNf (ORCPT + 99 others); Thu, 20 Oct 2022 09:13:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45074 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230243AbiJTNNc (ORCPT ); Thu, 20 Oct 2022 09:13:32 -0400 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C5BBF6D9C4 for ; Thu, 20 Oct 2022 06:13:01 -0700 (PDT) Received: by mail-wr1-x430.google.com with SMTP id bv10so34287302wrb.4 for ; Thu, 20 Oct 2022 06:13:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20210112.gappssmtp.com; s=20210112; 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=J4boSMDIMSEVQTaENzgDytuelvqQTNOGg+C0gp1qMNY=; b=E/Hioe+jZMzRIQ7yMGUhSU9ay7uPXjwm6UBqcrUgwU3IgoI5pSLHBPSmJ/pTFqxz5O roKsqMeS6FiuhGGMda7XTJ+1FNRXTc+pghU8rh44mD8Ycu1kaDyBDPqYJcIKudLuI3jQ dTDishgLlhpzIHyUch61+aiJxjLDxmT+ybnyQ2/D99l6jz71IPm7l1MV6gsmZlJWQtjX 3XcQqZJcsUHES4z20q/BGKRDN03p8cAUamKq+2i1FvjVCsyy92/vlLydwwdf/IGpOB8m R1k5Bs6QcyfQIBZRtzbYZXkUfHZ2Fxc2UuTPgBhyUrtSbJZHkAmkOfbCpdjL5JqiUrhW CugA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=J4boSMDIMSEVQTaENzgDytuelvqQTNOGg+C0gp1qMNY=; b=Mqfzj1D9vLLDsb5Qs/NdbrqXalaAJ4rKpsvdPqn+fhWMMMELCV6OmvxaqdmuRg6WS9 /H3gK+FpVHLuM64fDSNqB8TaMen0FsWHzezTf99Hdpg6I0EdI8E4AATZ3ATtTROXulGu ZDtHza1YV/HwoVEW7yoIERsxax2PVhUoNR4w44A8NpFHqmIvYfD1ja61NaQqHJJh5tTi 9bjFbXCIF67O+D5hVF/TVFh/Qxa3pkuebGo5av5eXelScXDX+kyWsUUFPNz7wm+yGUGh t2IAp2eRW4hUii5YGU7DR8avOLvutMdARidmsgXr/Ibs746Mj5XZIbNTpRpzwZ5aPFMv q/sQ== X-Gm-Message-State: ACrzQf0C9MYNtOuxY0IdaMHqff46QyeZZtkx4F94CZ9yb2+bnqcXiXXg jRIDfcW/CCF/rlpky+lTkewtqQ== X-Received: by 2002:a05:6000:1842:b0:22e:7bbf:c75 with SMTP id c2-20020a056000184200b0022e7bbf0c75mr8601406wri.547.1666271488170; Thu, 20 Oct 2022 06:11:28 -0700 (PDT) Received: from localhost.localdomain ([2001:861:3a82:90b0:2979:1615:9a68:f204]) by smtp.gmail.com with ESMTPSA id x8-20020a5d6508000000b00228dff8d975sm16453927wru.109.2022.10.20.06.11.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Oct 2022 06:11:27 -0700 (PDT) From: fchiby@baylibre.com To: Rob Herring , Krzysztof Kozlowski , Matthias Brugger , AngeloGioacchino Del Regno , Johnson Wang , "Zhiyong.Tao" Cc: Fabien Parent , Sen Chu , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org Subject: [PATCH 2/3] soc: mediatek: pwrap: add support for sys & tmr clocks Date: Thu, 20 Oct 2022 15:09:56 +0200 Message-Id: <20221020130957.25197-3-fchiby@baylibre.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221020130957.25197-1-fchiby@baylibre.com> References: <20221020130957.25197-1-fchiby@baylibre.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747212521843549192?= X-GMAIL-MSGID: =?utf-8?q?1747212521843549192?= From: Fabien Parent MT8365 requires an extra 2 clocks to be enabled to behave correctly. Add support these 2 clocks, they are made optional since they seem to be present only on MT8365. Signed-off-by: Fabien Parent --- drivers/soc/mediatek/mtk-pmic-wrap.c | 36 ++++++++++++++++++++++++---- 1 file changed, 32 insertions(+), 4 deletions(-) diff --git a/drivers/soc/mediatek/mtk-pmic-wrap.c b/drivers/soc/mediatek/mtk-pmic-wrap.c index eb82ae06697f..d56b00023ccd 100644 --- a/drivers/soc/mediatek/mtk-pmic-wrap.c +++ b/drivers/soc/mediatek/mtk-pmic-wrap.c @@ -1171,6 +1171,8 @@ struct pmic_wrapper { const struct pwrap_slv_type *slave; struct clk *clk_spi; struct clk *clk_wrap; + struct clk *clk_sys; + struct clk *clk_tmr; struct reset_control *rstc; struct reset_control *rstc_bridge; @@ -2214,6 +2216,20 @@ static int pwrap_probe(struct platform_device *pdev) return PTR_ERR(wrp->clk_wrap); } + wrp->clk_sys = devm_clk_get_optional(wrp->dev, "sys"); + if (IS_ERR(wrp->clk_sys)) { + return dev_err_probe(wrp->dev, PTR_ERR(wrp->clk_sys), + "failed to get clock: %pe\n", + wrp->clk_sys); + } + + wrp->clk_tmr = devm_clk_get_optional(wrp->dev, "tmr"); + if (IS_ERR(wrp->clk_tmr)) { + return dev_err_probe(wrp->dev, PTR_ERR(wrp->clk_tmr), + "failed to get clock: %pe\n", + wrp->clk_tmr); + } + ret = clk_prepare_enable(wrp->clk_spi); if (ret) return ret; @@ -2222,6 +2238,14 @@ static int pwrap_probe(struct platform_device *pdev) if (ret) goto err_out1; + ret = clk_prepare_enable(wrp->clk_sys); + if (ret) + goto err_out2; + + ret = clk_prepare_enable(wrp->clk_tmr); + if (ret) + goto err_out3; + /* Enable internal dynamic clock */ if (HAS_CAP(wrp->master->caps, PWRAP_CAP_DCM)) { pwrap_writel(wrp, 1, PWRAP_DCM_EN); @@ -2236,7 +2260,7 @@ static int pwrap_probe(struct platform_device *pdev) ret = pwrap_init(wrp); if (ret) { dev_dbg(wrp->dev, "init failed with %d\n", ret); - goto err_out2; + goto err_out4; } } @@ -2250,7 +2274,7 @@ static int pwrap_probe(struct platform_device *pdev) if (!(pwrap_readl(wrp, PWRAP_WACS2_RDATA) & mask_done)) { dev_dbg(wrp->dev, "initialization isn't finished\n"); ret = -ENODEV; - goto err_out2; + goto err_out4; } /* Initialize watchdog, may not be done by the bootloader */ @@ -2288,7 +2312,7 @@ static int pwrap_probe(struct platform_device *pdev) IRQF_TRIGGER_HIGH, "mt-pmic-pwrap", wrp); if (ret) - goto err_out2; + goto err_out4; wrp->regmap = devm_regmap_init(wrp->dev, NULL, wrp, wrp->slave->regops->regmap); if (IS_ERR(wrp->regmap)) { @@ -2300,11 +2324,15 @@ static int pwrap_probe(struct platform_device *pdev) if (ret) { dev_dbg(wrp->dev, "failed to create child devices at %pOF\n", np); - goto err_out2; + goto err_out4; } return 0; +err_out4: + clk_disable_unprepare(wrp->clk_tmr); +err_out3: + clk_disable_unprepare(wrp->clk_sys); err_out2: clk_disable_unprepare(wrp->clk_wrap); err_out1: