From patchwork Fri Oct 7 16:36:24 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 9366815 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 9658E60752 for ; Fri, 7 Oct 2016 16:36:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8798C29773 for ; Fri, 7 Oct 2016 16:36:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7C3D02977A; Fri, 7 Oct 2016 16:36:35 +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 1BE6D29773 for ; Fri, 7 Oct 2016 16:36:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S941142AbcJGQge (ORCPT ); Fri, 7 Oct 2016 12:36:34 -0400 Received: from mail.kernel.org ([198.145.29.136]:54766 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S941018AbcJGQgd (ORCPT ); Fri, 7 Oct 2016 12:36:33 -0400 Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C915220131; Fri, 7 Oct 2016 16:36:26 +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 C012D2013D; Fri, 7 Oct 2016 16:36:25 +0000 (UTC) Subject: [PATCH 7/8] PCI: exynos: Swap order of exynos_blk_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:24 -0500 Message-ID: <20161007163623.25314.27460.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_blk_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 | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 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 463cbd6..4fb3ce7 100644 --- a/drivers/pci/host/pci-exynos.c +++ b/drivers/pci/host/pci-exynos.c @@ -127,7 +127,7 @@ static u32 exynos_blk_readl(struct exynos_pcie *exynos, u32 reg) return readl(exynos->block_base + reg); } -static void exynos_blk_writel(struct exynos_pcie *exynos, u32 val, u32 reg) +static void exynos_blk_writel(struct exynos_pcie *exynos, u32 reg, u32 val) { writel(val, exynos->block_base + reg); } @@ -186,23 +186,23 @@ static void exynos_pcie_deassert_core_reset(struct exynos_pcie *exynos) exynos_elb_writel(exynos, PCIE_NONSTICKY_RESET, 1); exynos_elb_writel(exynos, PCIE_APP_INIT_RESET, 1); exynos_elb_writel(exynos, PCIE_APP_INIT_RESET, 0); - exynos_blk_writel(exynos, 1, PCIE_PHY_MAC_RESET); + exynos_blk_writel(exynos, PCIE_PHY_MAC_RESET, 1); } static void exynos_pcie_assert_phy_reset(struct exynos_pcie *exynos) { - exynos_blk_writel(exynos, 0, PCIE_PHY_MAC_RESET); - exynos_blk_writel(exynos, 1, PCIE_PHY_GLOBAL_RESET); + exynos_blk_writel(exynos, PCIE_PHY_MAC_RESET, 0); + exynos_blk_writel(exynos, PCIE_PHY_GLOBAL_RESET, 1); } static void exynos_pcie_deassert_phy_reset(struct exynos_pcie *exynos) { - exynos_blk_writel(exynos, 0, PCIE_PHY_GLOBAL_RESET); + exynos_blk_writel(exynos, PCIE_PHY_GLOBAL_RESET, 0); exynos_elb_writel(exynos, PCIE_PWR_RESET, 1); - exynos_blk_writel(exynos, 0, PCIE_PHY_COMMON_RESET); - exynos_blk_writel(exynos, 0, PCIE_PHY_CMN_REG); - exynos_blk_writel(exynos, 0, PCIE_PHY_TRSVREG_RESET); - exynos_blk_writel(exynos, 0, PCIE_PHY_TRSV_RESET); + exynos_blk_writel(exynos, PCIE_PHY_COMMON_RESET, 0); + exynos_blk_writel(exynos, PCIE_PHY_CMN_REG, 0); + exynos_blk_writel(exynos, PCIE_PHY_TRSVREG_RESET, 0); + exynos_blk_writel(exynos, PCIE_PHY_TRSV_RESET, 0); } static void exynos_pcie_power_on_phy(struct exynos_pcie *exynos) @@ -319,9 +319,9 @@ static int exynos_pcie_establish_link(struct exynos_pcie *exynos) exynos_pcie_init_phy(exynos); /* pulse for common reset */ - exynos_blk_writel(exynos, 1, PCIE_PHY_COMMON_RESET); + exynos_blk_writel(exynos, PCIE_PHY_COMMON_RESET, 1); udelay(500); - exynos_blk_writel(exynos, 0, PCIE_PHY_COMMON_RESET); + exynos_blk_writel(exynos, PCIE_PHY_COMMON_RESET, 0); exynos_pcie_deassert_core_reset(exynos); dw_pcie_setup_rc(pp);