Received: by 2002:a05:6a10:5bc5:0:0:0:0 with SMTP id os5csp2718574pxb; Sun, 31 Oct 2021 23:46:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJysBpVbb0NoSTZiWkPdCX1wfgZf0yMKoNvCAUN2Yf9fNmerEmBSqSnP96EyQM1d6hciuosW X-Received: by 2002:a05:6602:164b:: with SMTP id y11mr4692409iow.9.1635749163965; Sun, 31 Oct 2021 23:46:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1635749163; cv=none; d=google.com; s=arc-20160816; b=KjZKIlL93fxlZMKScu22CKSrjtTyFYJGOBOwj0Zk1J1FVGhlY9Le0Go5kgjiJcGtBP hyDYeHjwi79T0lCdqibNQWeYWH3mPTqCyG6E70hdI/xCxZYs1dknUCnLF6VnyPZXuNhQ mw0r6hJ4g3iPufYmlstQj223srdVEUIVnN7DQVgLCVpsjA22QLRNQwuTwHgapi9U5KO7 0Cbv8kXTDdKW0DxE5unEDtEh9C25jux8TqZ/OGffa+3521HzF4oP/IiWUiVL7HMHrsrj Verng5Vo3pRzD7hqrmmrDpT0ERewjb5YnyE+DSaRQ1TeIqhKZLvBI0sGei3SdC9bp8KJ BbRA== 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=yBZuulm1X8nU+kbP/Y9cPVGc8/wG/3qqeys8mFI6+UU=; b=sc6iRMOgLghnOs5In08Y2fZxkE+cJCDIcyqva57G6Ui7xXhWfnpQHCJbnKOwm7KFYN bgBofVgUi5MxGibJsyTlDDzItr1nDsD/OKaGwch2AlBCPxFhSAzImAaDHBScD0uatZWK OoOOUBN3C7XooLrC9o1FhfbmkF3zaq6SkO9aUYzN2n2qn1INKnmnJvX8BjxMAs+d2uTW Y5TXq181zL6oMeUtrm2kOxOiihM+3q3A4oaLF3IM5fNv/6CXnwHeBmyD+wAN2k5xBngO 2703QF+I5KBZ7r/5q96/VxzzGyhksqVOtrOHryteqbXs4aKEeSbnFcLatykyYVW3EOsE dj6g== 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 e15si21994441ilu.146.2021.10.31.23.45.39; Sun, 31 Oct 2021 23:46:03 -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 S231145AbhKAGqk (ORCPT + 99 others); Mon, 1 Nov 2021 02:46:40 -0400 Received: from inva021.nxp.com ([92.121.34.21]:45326 "EHLO inva021.nxp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230514AbhKAGqg (ORCPT ); Mon, 1 Nov 2021 02:46:36 -0400 Received: from inva021.nxp.com (localhost [127.0.0.1]) by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id 4C6FE201200; Mon, 1 Nov 2021 07:44:02 +0100 (CET) Received: from aprdc01srsp001v.ap-rdc01.nxp.com (aprdc01srsp001v.ap-rdc01.nxp.com [165.114.16.16]) by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id 13C352011F2; Mon, 1 Nov 2021 07:44:02 +0100 (CET) Received: from localhost.localdomain (shlinux2.ap.freescale.net [10.192.224.44]) by aprdc01srsp001v.ap-rdc01.nxp.com (Postfix) with ESMTP id 74788183AC4E; Mon, 1 Nov 2021 14:44:00 +0800 (+08) From: Richard Zhu To: l.stach@pengutronix.de, bhelgaas@google.com, broonie@kernel.org, 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 v4 3/6] PCI: imx6: PCI: imx6: Move imx6_pcie_clk_disable() earlier Date: Mon, 1 Nov 2021 14:17:55 +0800 Message-Id: <1635747478-25562-4-git-send-email-hongxing.zhu@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1635747478-25562-1-git-send-email-hongxing.zhu@nxp.com> References: <1635747478-25562-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 an earlier 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 65a10b048a8b..11265c5e5782 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; @@ -940,29 +963,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