From patchwork Fri Oct 7 16:36:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 9366809 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 05F1760752 for ; Fri, 7 Oct 2016 16:36:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E661E29773 for ; Fri, 7 Oct 2016 16:36:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DAE272977A; Fri, 7 Oct 2016 16:36:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5A53929773 for ; Fri, 7 Oct 2016 16:36:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S941132AbcJGQgV (ORCPT ); Fri, 7 Oct 2016 12:36:21 -0400 Received: from mail.kernel.org ([198.145.29.136]:54628 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S941018AbcJGQgU (ORCPT ); Fri, 7 Oct 2016 12:36:20 -0400 Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DBDAF203E1; Fri, 7 Oct 2016 16:36:18 +0000 (UTC) Received: from localhost (unknown [69.55.156.165]) (using TLSv1.2 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8708C20131; Fri, 7 Oct 2016 16:36:13 +0000 (UTC) Subject: [PATCH 6/8] PCI: exynos: Swap order of exynos_phy_writel() reg/val arguments To: Jingoo Han , Krzysztof Kozlowski , Kukjin Kim From: Bjorn Helgaas Cc: linux-pci@vger.kernel.org, linux-samsung-soc@vger.kernel.org Date: Fri, 07 Oct 2016 11:36:11 -0500 Message-ID: <20161007163611.25314.70157.stgit@bhelgaas-glaptop2.roam.corp.google.com> In-Reply-To: <20161007163526.25314.29033.stgit@bhelgaas-glaptop2.roam.corp.google.com> References: <20161007163526.25314.29033.stgit@bhelgaas-glaptop2.roam.corp.google.com> User-Agent: StGit/0.16 MIME-Version: 1.0 X-Virus-Scanned: ClamAV using ClamSMTP Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Swap order of exynos_phy_writel() arguments to match the "dev, pos, val" order used by pci_write_config_word() and other drivers. No functional change intended. Signed-off-by: Bjorn Helgaas --- drivers/pci/host/pci-exynos.c | 60 +++++++++++++++++++++-------------------- 1 file changed, 30 insertions(+), 30 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/pci/host/pci-exynos.c b/drivers/pci/host/pci-exynos.c index eb50b1a..463cbd6 100644 --- a/drivers/pci/host/pci-exynos.c +++ b/drivers/pci/host/pci-exynos.c @@ -117,7 +117,7 @@ static u32 exynos_phy_readl(struct exynos_pcie *exynos, u32 reg) return readl(exynos->phy_base + reg); } -static void exynos_phy_writel(struct exynos_pcie *exynos, u32 val, u32 reg) +static void exynos_phy_writel(struct exynos_pcie *exynos, u32 reg, u32 val) { writel(val, exynos->phy_base + reg); } @@ -211,23 +211,23 @@ static void exynos_pcie_power_on_phy(struct exynos_pcie *exynos) val = exynos_phy_readl(exynos, PCIE_PHY_COMMON_POWER); val &= ~PCIE_PHY_COMMON_PD_CMN; - exynos_phy_writel(exynos, val, PCIE_PHY_COMMON_POWER); + exynos_phy_writel(exynos, PCIE_PHY_COMMON_POWER, val); val = exynos_phy_readl(exynos, PCIE_PHY_TRSV0_POWER); val &= ~PCIE_PHY_TRSV0_PD_TSV; - exynos_phy_writel(exynos, val, PCIE_PHY_TRSV0_POWER); + exynos_phy_writel(exynos, PCIE_PHY_TRSV0_POWER, val); val = exynos_phy_readl(exynos, PCIE_PHY_TRSV1_POWER); val &= ~PCIE_PHY_TRSV1_PD_TSV; - exynos_phy_writel(exynos, val, PCIE_PHY_TRSV1_POWER); + exynos_phy_writel(exynos, PCIE_PHY_TRSV1_POWER, val); val = exynos_phy_readl(exynos, PCIE_PHY_TRSV2_POWER); val &= ~PCIE_PHY_TRSV2_PD_TSV; - exynos_phy_writel(exynos, val, PCIE_PHY_TRSV2_POWER); + exynos_phy_writel(exynos, PCIE_PHY_TRSV2_POWER, val); val = exynos_phy_readl(exynos, PCIE_PHY_TRSV3_POWER); val &= ~PCIE_PHY_TRSV3_PD_TSV; - exynos_phy_writel(exynos, val, PCIE_PHY_TRSV3_POWER); + exynos_phy_writel(exynos, PCIE_PHY_TRSV3_POWER, val); } static void exynos_pcie_power_off_phy(struct exynos_pcie *exynos) @@ -236,61 +236,61 @@ static void exynos_pcie_power_off_phy(struct exynos_pcie *exynos) val = exynos_phy_readl(exynos, PCIE_PHY_COMMON_POWER); val |= PCIE_PHY_COMMON_PD_CMN; - exynos_phy_writel(exynos, val, PCIE_PHY_COMMON_POWER); + exynos_phy_writel(exynos, PCIE_PHY_COMMON_POWER, val); val = exynos_phy_readl(exynos, PCIE_PHY_TRSV0_POWER); val |= PCIE_PHY_TRSV0_PD_TSV; - exynos_phy_writel(exynos, val, PCIE_PHY_TRSV0_POWER); + exynos_phy_writel(exynos, PCIE_PHY_TRSV0_POWER, val); val = exynos_phy_readl(exynos, PCIE_PHY_TRSV1_POWER); val |= PCIE_PHY_TRSV1_PD_TSV; - exynos_phy_writel(exynos, val, PCIE_PHY_TRSV1_POWER); + exynos_phy_writel(exynos, PCIE_PHY_TRSV1_POWER, val); val = exynos_phy_readl(exynos, PCIE_PHY_TRSV2_POWER); val |= PCIE_PHY_TRSV2_PD_TSV; - exynos_phy_writel(exynos, val, PCIE_PHY_TRSV2_POWER); + exynos_phy_writel(exynos, PCIE_PHY_TRSV2_POWER, val); val = exynos_phy_readl(exynos, PCIE_PHY_TRSV3_POWER); val |= PCIE_PHY_TRSV3_PD_TSV; - exynos_phy_writel(exynos, val, PCIE_PHY_TRSV3_POWER); + exynos_phy_writel(exynos, PCIE_PHY_TRSV3_POWER, val); } static void exynos_pcie_init_phy(struct exynos_pcie *exynos) { /* DCC feedback control off */ - exynos_phy_writel(exynos, 0x29, PCIE_PHY_DCC_FEEDBACK); + exynos_phy_writel(exynos, PCIE_PHY_DCC_FEEDBACK, 0x29); /* set TX/RX impedance */ - exynos_phy_writel(exynos, 0xd5, PCIE_PHY_IMPEDANCE); + exynos_phy_writel(exynos, PCIE_PHY_IMPEDANCE, 0xd5); /* set 50Mhz PHY clock */ - exynos_phy_writel(exynos, 0x14, PCIE_PHY_PLL_DIV_0); - exynos_phy_writel(exynos, 0x12, PCIE_PHY_PLL_DIV_1); + exynos_phy_writel(exynos, PCIE_PHY_PLL_DIV_0, 0x14); + exynos_phy_writel(exynos, PCIE_PHY_PLL_DIV_1, 0x12); /* set TX Differential output for lane 0 */ - exynos_phy_writel(exynos, 0x7f, PCIE_PHY_TRSV0_DRV_LVL); + exynos_phy_writel(exynos, PCIE_PHY_TRSV0_DRV_LVL, 0x7f); /* set TX Pre-emphasis Level Control for lane 0 to minimum */ - exynos_phy_writel(exynos, 0x0, PCIE_PHY_TRSV0_EMP_LVL); + exynos_phy_writel(exynos, PCIE_PHY_TRSV0_EMP_LVL, 0x0); /* set RX clock and data recovery bandwidth */ - exynos_phy_writel(exynos, 0xe7, PCIE_PHY_PLL_BIAS); - exynos_phy_writel(exynos, 0x82, PCIE_PHY_TRSV0_RXCDR); - exynos_phy_writel(exynos, 0x82, PCIE_PHY_TRSV1_RXCDR); - exynos_phy_writel(exynos, 0x82, PCIE_PHY_TRSV2_RXCDR); - exynos_phy_writel(exynos, 0x82, PCIE_PHY_TRSV3_RXCDR); + exynos_phy_writel(exynos, PCIE_PHY_PLL_BIAS, 0xe7); + exynos_phy_writel(exynos, PCIE_PHY_TRSV0_RXCDR, 0x82); + exynos_phy_writel(exynos, PCIE_PHY_TRSV1_RXCDR, 0x82); + exynos_phy_writel(exynos, PCIE_PHY_TRSV2_RXCDR, 0x82); + exynos_phy_writel(exynos, PCIE_PHY_TRSV3_RXCDR, 0x82); /* change TX Pre-emphasis Level Control for lanes */ - exynos_phy_writel(exynos, 0x39, PCIE_PHY_TRSV0_EMP_LVL); - exynos_phy_writel(exynos, 0x39, PCIE_PHY_TRSV1_EMP_LVL); - exynos_phy_writel(exynos, 0x39, PCIE_PHY_TRSV2_EMP_LVL); - exynos_phy_writel(exynos, 0x39, PCIE_PHY_TRSV3_EMP_LVL); + exynos_phy_writel(exynos, PCIE_PHY_TRSV0_EMP_LVL, 0x39); + exynos_phy_writel(exynos, PCIE_PHY_TRSV1_EMP_LVL, 0x39); + exynos_phy_writel(exynos, PCIE_PHY_TRSV2_EMP_LVL, 0x39); + exynos_phy_writel(exynos, PCIE_PHY_TRSV3_EMP_LVL, 0x39); /* set LVCC */ - exynos_phy_writel(exynos, 0x20, PCIE_PHY_TRSV0_LVCC); - exynos_phy_writel(exynos, 0xa0, PCIE_PHY_TRSV1_LVCC); - exynos_phy_writel(exynos, 0xa0, PCIE_PHY_TRSV2_LVCC); - exynos_phy_writel(exynos, 0xa0, PCIE_PHY_TRSV3_LVCC); + exynos_phy_writel(exynos, PCIE_PHY_TRSV0_LVCC, 0x20); + exynos_phy_writel(exynos, PCIE_PHY_TRSV1_LVCC, 0xa0); + exynos_phy_writel(exynos, PCIE_PHY_TRSV2_LVCC, 0xa0); + exynos_phy_writel(exynos, PCIE_PHY_TRSV3_LVCC, 0xa0); } static void exynos_pcie_assert_reset(struct exynos_pcie *exynos)