From patchwork Wed Jan 22 19:04:38 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 3525451 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 3D3DBC02DC for ; Wed, 22 Jan 2014 20:24:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4C6F02017B for ; Wed, 22 Jan 2014 20:24:00 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 22BC12017A for ; Wed, 22 Jan 2014 20:23:59 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1W63B3-00033H-NR; Wed, 22 Jan 2014 19:09:30 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1W63AO-0000d7-Qp; Wed, 22 Jan 2014 19:08:48 +0000 Received: from mx1.redhat.com ([209.132.183.28]) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1W6377-0000Fi-Kd for linux-arm-kernel@lists.infradead.org; Wed, 22 Jan 2014 19:05:37 +0000 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s0MJ51k4025823 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 22 Jan 2014 14:05:01 -0500 Received: from shalem.localdomain.com (vpn1-5-1.ams2.redhat.com [10.36.5.1]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s0MJ4oFd029525; Wed, 22 Jan 2014 14:04:59 -0500 From: Hans de Goede To: Tejun Heo Subject: [PATCH v5 03/14] ahci-platform: Pass ahci_host_priv ptr to ahci_platform_data init method Date: Wed, 22 Jan 2014 20:04:38 +0100 Message-Id: <1390417489-5354-4-git-send-email-hdegoede@redhat.com> In-Reply-To: <1390417489-5354-1-git-send-email-hdegoede@redhat.com> References: <1390417489-5354-1-git-send-email-hdegoede@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140122_140525_844825_A1C3FA5A X-CRM114-Status: GOOD ( 16.83 ) X-Spam-Score: -7.5 (-------) Cc: devicetree , Hans de Goede , linux-ide@vger.kernel.org, Oliver Schinagl , Richard Zhu , linux-sunxi@googlegroups.com, Maxime Ripard , linux-arm-kernel@lists.infradead.org, Roger Quadros X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.8 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Some ahci_platform_data->init methods need access to the ahci_host_priv data. When calling ahci_platform_data->init the ata_host has not been allocated yet, so access to ahci_host_priv through the dev argument is not possible. Signed-off-by: Hans de Goede --- arch/arm/mach-davinci/devices-da8xx.c | 5 +++-- arch/arm/mach-spear/spear1340.c | 2 +- drivers/ata/ahci_imx.c | 12 ++++++------ drivers/ata/ahci_platform.c | 2 +- include/linux/ahci_platform.h | 3 ++- 5 files changed, 13 insertions(+), 11 deletions(-) diff --git a/arch/arm/mach-davinci/devices-da8xx.c b/arch/arm/mach-davinci/devices-da8xx.c index 78829c5..28e7c4c 100644 --- a/arch/arm/mach-davinci/devices-da8xx.c +++ b/arch/arm/mach-davinci/devices-da8xx.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -1061,7 +1062,7 @@ static unsigned long da850_sata_xtal[] = { KHZ_TO_HZ(60000), }; -static int da850_sata_init(struct device *dev, void __iomem *addr) +static int da850_sata_init(struct device *dev, struct ahci_host_priv *hpriv) { int i, ret; unsigned int val; @@ -1096,7 +1097,7 @@ static int da850_sata_init(struct device *dev, void __iomem *addr) SATA_PHY_TXSWING(3) | SATA_PHY_ENPLL(1); - __raw_writel(val, addr + SATA_P0PHYCR_REG); + __raw_writel(val, hpriv->mmio + SATA_P0PHYCR_REG); return 0; diff --git a/arch/arm/mach-spear/spear1340.c b/arch/arm/mach-spear/spear1340.c index 3fb6834..9e2f3ac 100644 --- a/arch/arm/mach-spear/spear1340.c +++ b/arch/arm/mach-spear/spear1340.c @@ -77,7 +77,7 @@ SPEAR1340_MIPHY_PLL_RATIO_TOP(25)) /* SATA device registration */ -static int sata_miphy_init(struct device *dev, void __iomem *addr) +static int sata_miphy_init(struct device *dev, struct ahci_host_priv *hpriv) { writel(SPEAR1340_SATA_CFG_VAL, SPEAR1340_PCIE_SATA_CFG); writel(SPEAR1340_PCIE_SATA_MIPHY_CFG_SATA_25M_CRYSTAL_CLK, diff --git a/drivers/ata/ahci_imx.c b/drivers/ata/ahci_imx.c index 3e23e99..49fa0ca 100644 --- a/drivers/ata/ahci_imx.c +++ b/drivers/ata/ahci_imx.c @@ -91,7 +91,7 @@ static const struct ata_port_info ahci_imx_port_info = { .port_ops = &ahci_imx_ops, }; -static int imx6q_sata_init(struct device *dev, void __iomem *mmio) +static int imx6q_sata_init(struct device *dev, struct ahci_host_priv *hpriv) { int ret = 0; unsigned int reg_val; @@ -145,19 +145,19 @@ static int imx6q_sata_init(struct device *dev, void __iomem *mmio) * Implement the port0. * Get the ahb clock rate, and configure the TIMER1MS register. */ - reg_val = readl(mmio + HOST_CAP); + reg_val = readl(hpriv->mmio + HOST_CAP); if (!(reg_val & HOST_CAP_SSS)) { reg_val |= HOST_CAP_SSS; - writel(reg_val, mmio + HOST_CAP); + writel(reg_val, hpriv->mmio + HOST_CAP); } - reg_val = readl(mmio + HOST_PORTS_IMPL); + reg_val = readl(hpriv->mmio + HOST_PORTS_IMPL); if (!(reg_val & 0x1)) { reg_val |= 0x1; - writel(reg_val, mmio + HOST_PORTS_IMPL); + writel(reg_val, hpriv->mmio + HOST_PORTS_IMPL); } reg_val = clk_get_rate(imxpriv->ahb_clk) / 1000; - writel(reg_val, mmio + HOST_TIMER1MS); + writel(reg_val, hpriv->mmio + HOST_TIMER1MS); return 0; } diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c index 4b231ba..434ab89 100644 --- a/drivers/ata/ahci_platform.c +++ b/drivers/ata/ahci_platform.c @@ -149,7 +149,7 @@ static int ahci_probe(struct platform_device *pdev) * returned successfully. */ if (pdata && pdata->init) { - rc = pdata->init(dev, hpriv->mmio); + rc = pdata->init(dev, hpriv); if (rc) goto disable_unprepare_clk; } diff --git a/include/linux/ahci_platform.h b/include/linux/ahci_platform.h index 73a2500..737fe38 100644 --- a/include/linux/ahci_platform.h +++ b/include/linux/ahci_platform.h @@ -19,9 +19,10 @@ struct device; struct ata_port_info; +struct ahci_host_priv; struct ahci_platform_data { - int (*init)(struct device *dev, void __iomem *addr); + int (*init)(struct device *dev, struct ahci_host_priv *hpriv); void (*exit)(struct device *dev); int (*suspend)(struct device *dev); int (*resume)(struct device *dev);