Received: by 2002:a05:6a10:5bc5:0:0:0:0 with SMTP id os5csp1444288pxb; Fri, 22 Oct 2021 00:41:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwseKWViRHUHY7gc0dh1AW4t7GW/Z1uAWyTe3DtGwHMZv3IGYyqEo4dnzD4wLsnCvMg4cQM X-Received: by 2002:a05:6402:1cc1:: with SMTP id ds1mr15171953edb.386.1634888487160; Fri, 22 Oct 2021 00:41:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634888487; cv=none; d=google.com; s=arc-20160816; b=Yv5Vhq61oLhNhhtbdYBabMx/LbapZxDryRE5aVcbYv+h32rwd6e2A8MC+AfH+pIVZ8 FaVzpowmHoeP3kXTRpjHtzgJHVnFbqU5o7z6heg9p46ISWhLEfzyv+ft/eaSu3nHy4CJ +St6PTS4sO5jWp7lHLfFXHKQHbQtZ1V3YuXKl+UqSW0DFmgp5EDuCgkoQm4W3E6UZG0T girmNm8a2yBVA5FCsZoOCzCQ8un/REv9ajpOuAolTAhqZ2uLQq0diZZpYcAOJKKnP4+5 /Cy0QGjIWz9hD26z2NLR85qCOOketnjE0VoR02UJ7Y/QX1KCEWy6mzQyrJ6WclCW+HQL E2EQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from; bh=AJCT3UhU/pKBQZPwRIbu63iCXf48supB18ze0Wh85Bk=; b=UAyQV8lHqcqmSbv2COC5Ea0vcgqqa2FHm1PU14pDaXhzZOJtLK28DHKCwzx482CNO0 bEUxFfY28c7Afir3cBSO/HBwkkU4T99Ej1bU7EAaOivC8wCFCy5ZkbxrekqzkhrHfbk8 i0F7H4hMQ6ygPHVl+YgYBBweDmR13Q3V+JyVE8bxvjnuhbuHjMHFXmwqhNvaqIMt/+7t hT+XoVmtJgpObsSUpyNRSkzG+bdba3Nm8bFVDc2Au5hQOQtrBu0djHHocpIkIJib0bbn NKRXpgHVml3vR0YCbArAU+437wBLmeJk014Q3kfsZ3AUgK4s78WoN9i91PeFfG70JjT1 efEQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id o16si10487969edi.503.2021.10.22.00.41.03; Fri, 22 Oct 2021 00:41:27 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232362AbhJVHkT (ORCPT + 99 others); Fri, 22 Oct 2021 03:40:19 -0400 Received: from inva020.nxp.com ([92.121.34.13]:56180 "EHLO inva020.nxp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232154AbhJVHkL (ORCPT ); Fri, 22 Oct 2021 03:40:11 -0400 Received: from inva020.nxp.com (localhost [127.0.0.1]) by inva020.eu-rdc02.nxp.com (Postfix) with ESMTP id A2C8F1A137C; Fri, 22 Oct 2021 09:37:53 +0200 (CEST) Received: from aprdc01srsp001v.ap-rdc01.nxp.com (aprdc01srsp001v.ap-rdc01.nxp.com [165.114.16.16]) by inva020.eu-rdc02.nxp.com (Postfix) with ESMTP id 68BBD1A06DC; Fri, 22 Oct 2021 09:37:53 +0200 (CEST) Received: from localhost.localdomain (shlinux2.ap.freescale.net [10.192.224.44]) by aprdc01srsp001v.ap-rdc01.nxp.com (Postfix) with ESMTP id 01B14183AC94; Fri, 22 Oct 2021 15:37:51 +0800 (+08) From: Richard Zhu To: l.stach@pengutronix.de, bhelgaas@google.com, lorenzo.pieralisi@arm.com, jingoohan1@gmail.com Cc: linux-pci@vger.kernel.org, linux-imx@nxp.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kernel@pengutronix.de, Richard Zhu Subject: [PATCH v3 4/7] PCI: imx6: move the clock disable function to a proper place Date: Fri, 22 Oct 2021 15:12:27 +0800 Message-Id: <1634886750-13861-5-git-send-email-hongxing.zhu@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1634886750-13861-1-git-send-email-hongxing.zhu@nxp.com> References: <1634886750-13861-1-git-send-email-hongxing.zhu@nxp.com> X-Virus-Scanned: ClamAV using ClamSMTP Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Just move the imx6_pcie_clk_disable() to a proper place without function changes, since it wouldn't be only used in imx6_pcie_suspend_noirq() later. Signed-off-by: Richard Zhu --- drivers/pci/controller/dwc/pci-imx6.c | 46 +++++++++++++-------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c index 39a485bfc676..b752a673e767 100644 --- a/drivers/pci/controller/dwc/pci-imx6.c +++ b/drivers/pci/controller/dwc/pci-imx6.c @@ -514,6 +514,29 @@ static int imx6_pcie_clk_enable(struct imx6_pcie *imx6_pcie) return ret; } +static void imx6_pcie_clk_disable(struct imx6_pcie *imx6_pcie) +{ + clk_disable_unprepare(imx6_pcie->pcie); + clk_disable_unprepare(imx6_pcie->pcie_phy); + clk_disable_unprepare(imx6_pcie->pcie_bus); + + switch (imx6_pcie->drvdata->variant) { + case IMX6SX: + clk_disable_unprepare(imx6_pcie->pcie_inbound_axi); + break; + case IMX7D: + regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR12, + IMX7D_GPR12_PCIE_PHY_REFCLK_SEL, + IMX7D_GPR12_PCIE_PHY_REFCLK_SEL); + break; + case IMX8MQ: + clk_disable_unprepare(imx6_pcie->pcie_aux); + break; + default: + break; + } +} + static void imx7d_pcie_wait_for_phy_pll_lock(struct imx6_pcie *imx6_pcie) { u32 val; @@ -939,29 +962,6 @@ static void imx6_pcie_pm_turnoff(struct imx6_pcie *imx6_pcie) usleep_range(1000, 10000); } -static void imx6_pcie_clk_disable(struct imx6_pcie *imx6_pcie) -{ - clk_disable_unprepare(imx6_pcie->pcie); - clk_disable_unprepare(imx6_pcie->pcie_phy); - clk_disable_unprepare(imx6_pcie->pcie_bus); - - switch (imx6_pcie->drvdata->variant) { - case IMX6SX: - clk_disable_unprepare(imx6_pcie->pcie_inbound_axi); - break; - case IMX7D: - regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR12, - IMX7D_GPR12_PCIE_PHY_REFCLK_SEL, - IMX7D_GPR12_PCIE_PHY_REFCLK_SEL); - break; - case IMX8MQ: - clk_disable_unprepare(imx6_pcie->pcie_aux); - break; - default: - break; - } -} - static int imx6_pcie_suspend_noirq(struct device *dev) { struct imx6_pcie *imx6_pcie = dev_get_drvdata(dev); -- 2.25.1