From patchwork Mon Oct 14 13:52:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anand Moon X-Patchwork-Id: 13835112 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 15B16D16275 for ; Mon, 14 Oct 2024 14:18:26 +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:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=km2bAahU7m6uO2pxp9kYHDsHw5A5x0oZaK/Jwnf4Tro=; b=Ocksmws8XyF6Pu YVzP6BNEAnx2imODwMUkYzwBwWnKrth7+jygFBxwWN1fD95A5JTedN0jkLrLkvL1gcOy1Ngeq35wn aWoBpkoSznxg7qvnqQoKBuBwwbH0cP5DqM1wLzqq0KpMp8B/vITuWwEZZG5JXVAiAObJ5Y/x36+3w z0IAWVYmhk+QoCBDUwS/l1cDmNEsNkQfpn3+SIsDDN0K01s8R5ngkXvLHOQWlYkjvjqUhjzm6YV9r b1PTq9O1iCFH2D2uzaJdi3MhEshSPtkQGGok+Ws0sEXdiHICnokaErKynaJ0Bb+UtpaQ6JSh+zxfA c4LzNbVpM2An3kkwvgmQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1t0Ltu-00000005RdT-0fPR; Mon, 14 Oct 2024 14:18:22 +0000 Received: from mail-pl1-x630.google.com ([2607:f8b0:4864:20::630]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1t0LUw-00000005Mbc-3zEx; Mon, 14 Oct 2024 13:52:36 +0000 Received: by mail-pl1-x630.google.com with SMTP id d9443c01a7336-20c7ee8fe6bso30253995ad.2; Mon, 14 Oct 2024 06:52:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728913953; x=1729518753; darn=lists.infradead.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=qUyfxVztW9mxx7PjElnNI2bHGC2anyBDdv1+iKkDclU=; b=bt6kBmCLD3R25UBHR4rMMqETCCwrzHfsAz2Oc+qlICy1r4kqcuY3yPYgLYzFDMacJl /W3N7SqFwFbreh2nKKh/kVY7V4MC4xtAKQlRM6Iacl+GWD/Fn8asScJD2Bf9EH4rEsoC ZYs55nX+43LyED+F0xnzAoLzq5AYoaT1yxIHVathW7tI18Miw2uZt3iwFWMRnAA4nHme iWFqyVWYFHUgLZuFch0xWVWHdU8sff2+qA0W3xwN2IoDq7BYKpC5O0vdkE4FwsHCxeiM f4G1ViZur8G4RfPMrtD21tM4p6W5tmfxCjejOeBykBBPNt2mOPBbZVB1a7y/gzhRNdP6 RftA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728913953; x=1729518753; 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=qUyfxVztW9mxx7PjElnNI2bHGC2anyBDdv1+iKkDclU=; b=lwzd/+xkT+zzHBDIgSyFN89PUbh3z/EGs3K6Kq5aXw1IaNfMvGnjwTtOpkwEJKa31M UlKjefOnkem/L2fYkrytXGMUxYGUPRdg8xBosdFPAjfjOKvWvfe8uQmUwBiSqiN4PYLm hD3GA2UuWiDkhI7FpeBKD2h+YYSpryifua/j9O7VWOFzftFKFGXYJVm3WUMCvtipnW64 JDgmcTfxh4IavDt8bLZOtkzXmMDqinccxOruhheTFD9FOcqFl2SrtKqlZ9C6OOrsHlB7 X9jpvH5ddZqPu06kwJFsjMah9qoCNXfSPWp5HaoexVUix11MVhcZlmk+uzAeGuXAVS8S CZ7A== X-Forwarded-Encrypted: i=1; AJvYcCVunzZci9lmhkYy/VXeOrVhPkYWrPysbNEMhPc7IFJQ817XkGmbQq+YJ1tViUhPPqnX/5OI0g60y3UXFcMWEzw=@lists.infradead.org, AJvYcCWpV63NP3/DtUlDZl4IC2OHKBchR0f/Vbmwjc7mZeT+Q1+FBZ7IqywSDaKHJ5+K+QV1X0BFh2sw2awQdKRbGbR5@lists.infradead.org X-Gm-Message-State: AOJu0YwLD/EzZ4glC7BDEMFP9jYYfxj0DWQGhP87euAlh8mf27U+GYhP +Mtj71lP2xcvCACq8B26fT6sXvn/78hokbsOz/BfnJ2XCvazk8yV X-Google-Smtp-Source: AGHT+IFo1rwXaSOjun7uwubAgzsogZL8MvNmPQaVDTjR02h7z8QhLH6poEamnj2LJPHrlMRQH4k81A== X-Received: by 2002:a17:902:d501:b0:20b:951f:6dff with SMTP id d9443c01a7336-20ca131e652mr163942875ad.0.1728913953131; Mon, 14 Oct 2024 06:52:33 -0700 (PDT) Received: from localhost.localdomain ([113.30.217.221]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-20c8c0e74d6sm66469135ad.166.2024.10.14.06.52.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Oct 2024 06:52:32 -0700 (PDT) From: Anand Moon To: Shawn Lin , Lorenzo Pieralisi , =?utf-8?q?Krzysztof_Wilczy=C5=84?= =?utf-8?q?ski?= , Manivannan Sadhasivam , Rob Herring , Bjorn Helgaas , Heiko Stuebner , Philipp Zabel , linux-pci@vger.kernel.org (open list:PCIE DRIVER FOR ROCKCHIP), linux-rockchip@lists.infradead.org (open list:PCIE DRIVER FOR ROCKCHIP), linux-arm-kernel@lists.infradead.org (moderated list:ARM/Rockchip SoC support), linux-kernel@vger.kernel.org (open list) Cc: Anand Moon Subject: [PATCH v8 1/3] PCI: rockchip: Simplify clock handling by using clk_bulk*() function Date: Mon, 14 Oct 2024 19:22:02 +0530 Message-ID: <20241014135210.224913-2-linux.amoon@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20241014135210.224913-1-linux.amoon@gmail.com> References: <20241014135210.224913-1-linux.amoon@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241014_065235_020341_9B3BDE45 X-CRM114-Status: GOOD ( 18.73 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org Refactor the clock handling in the Rockchip PCIe driver, introduce a more robust and efficient method for enabling and disabling clocks using clk_bulk*() API. Using the clk_bulk APIs, the clock handling for the core clocks becomes much simpler. - devm_clk_bulk_get_all(): Allows the driver to get all clocks defined in the DT thereby removing the hardcoded clock names in the driver. - clk_bulk_prepare_enable(): Allows the driver to prepare and enable all clocks defined in the driver. - clk_bulk_disable_unprepare(): Allows the driver to disable and unprepare all clocks defined in the driver. Reviewed-by: Manivannan Sadhasivam Signed-off-by: Anand Moon --- v8: Improve the description of the code changes in commit messagee. Add Rb: Manivannan v7: Update the functional change in commmit message. v6: None. v5: switch to use use devm_clk_bulk_get_all()? gets rid of hardcoding the clock names in driver. v4: use dev_err_probe for error patch. v3: Fix typo in commit message, dropped reported by. v2: Fix compilation error reported by Intel test robot. --- drivers/pci/controller/pcie-rockchip.c | 65 +++----------------------- drivers/pci/controller/pcie-rockchip.h | 7 ++- 2 files changed, 10 insertions(+), 62 deletions(-) diff --git a/drivers/pci/controller/pcie-rockchip.c b/drivers/pci/controller/pcie-rockchip.c index c07d7129f1c7..2777ef0cb599 100644 --- a/drivers/pci/controller/pcie-rockchip.c +++ b/drivers/pci/controller/pcie-rockchip.c @@ -127,29 +127,9 @@ int rockchip_pcie_parse_dt(struct rockchip_pcie *rockchip) "failed to get ep GPIO\n"); } - rockchip->aclk_pcie = devm_clk_get(dev, "aclk"); - if (IS_ERR(rockchip->aclk_pcie)) { - dev_err(dev, "aclk clock not found\n"); - return PTR_ERR(rockchip->aclk_pcie); - } - - rockchip->aclk_perf_pcie = devm_clk_get(dev, "aclk-perf"); - if (IS_ERR(rockchip->aclk_perf_pcie)) { - dev_err(dev, "aclk_perf clock not found\n"); - return PTR_ERR(rockchip->aclk_perf_pcie); - } - - rockchip->hclk_pcie = devm_clk_get(dev, "hclk"); - if (IS_ERR(rockchip->hclk_pcie)) { - dev_err(dev, "hclk clock not found\n"); - return PTR_ERR(rockchip->hclk_pcie); - } - - rockchip->clk_pcie_pm = devm_clk_get(dev, "pm"); - if (IS_ERR(rockchip->clk_pcie_pm)) { - dev_err(dev, "pm clock not found\n"); - return PTR_ERR(rockchip->clk_pcie_pm); - } + rockchip->num_clks = devm_clk_bulk_get_all(dev, &rockchip->clks); + if (rockchip->num_clks < 0) + return dev_err_probe(dev, err, "failed to get clocks\n"); return 0; } @@ -372,39 +352,11 @@ int rockchip_pcie_enable_clocks(struct rockchip_pcie *rockchip) struct device *dev = rockchip->dev; int err; - err = clk_prepare_enable(rockchip->aclk_pcie); - if (err) { - dev_err(dev, "unable to enable aclk_pcie clock\n"); - return err; - } - - err = clk_prepare_enable(rockchip->aclk_perf_pcie); - if (err) { - dev_err(dev, "unable to enable aclk_perf_pcie clock\n"); - goto err_aclk_perf_pcie; - } - - err = clk_prepare_enable(rockchip->hclk_pcie); - if (err) { - dev_err(dev, "unable to enable hclk_pcie clock\n"); - goto err_hclk_pcie; - } - - err = clk_prepare_enable(rockchip->clk_pcie_pm); - if (err) { - dev_err(dev, "unable to enable clk_pcie_pm clock\n"); - goto err_clk_pcie_pm; - } + err = clk_bulk_prepare_enable(rockchip->num_clks, rockchip->clks); + if (err) + return dev_err_probe(dev, err, "failed to enable clocks\n"); return 0; - -err_clk_pcie_pm: - clk_disable_unprepare(rockchip->hclk_pcie); -err_hclk_pcie: - clk_disable_unprepare(rockchip->aclk_perf_pcie); -err_aclk_perf_pcie: - clk_disable_unprepare(rockchip->aclk_pcie); - return err; } EXPORT_SYMBOL_GPL(rockchip_pcie_enable_clocks); @@ -412,10 +364,7 @@ void rockchip_pcie_disable_clocks(void *data) { struct rockchip_pcie *rockchip = data; - clk_disable_unprepare(rockchip->clk_pcie_pm); - clk_disable_unprepare(rockchip->hclk_pcie); - clk_disable_unprepare(rockchip->aclk_perf_pcie); - clk_disable_unprepare(rockchip->aclk_pcie); + clk_bulk_disable_unprepare(rockchip->num_clks, rockchip->clks); } EXPORT_SYMBOL_GPL(rockchip_pcie_disable_clocks); diff --git a/drivers/pci/controller/pcie-rockchip.h b/drivers/pci/controller/pcie-rockchip.h index 6111de35f84c..bebab80c9553 100644 --- a/drivers/pci/controller/pcie-rockchip.h +++ b/drivers/pci/controller/pcie-rockchip.h @@ -11,6 +11,7 @@ #ifndef _PCIE_ROCKCHIP_H #define _PCIE_ROCKCHIP_H +#include #include #include #include @@ -299,10 +300,8 @@ struct rockchip_pcie { struct reset_control *pm_rst; struct reset_control *aclk_rst; struct reset_control *pclk_rst; - struct clk *aclk_pcie; - struct clk *aclk_perf_pcie; - struct clk *hclk_pcie; - struct clk *clk_pcie_pm; + struct clk_bulk_data *clks; + int num_clks; struct regulator *vpcie12v; /* 12V power supply */ struct regulator *vpcie3v3; /* 3.3V power supply */ struct regulator *vpcie1v8; /* 1.8V power supply */