From patchwork Thu Apr 7 10:24:47 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Basheer, Mansoor Ahamed" X-Patchwork-Id: 90155 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 8444AB6F71 for ; Thu, 7 Apr 2011 20:25:10 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751576Ab1DGKZI (ORCPT ); Thu, 7 Apr 2011 06:25:08 -0400 Received: from bear.ext.ti.com ([192.94.94.41]:45564 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751220Ab1DGKZH (ORCPT ); Thu, 7 Apr 2011 06:25:07 -0400 Received: from dbdp31.itg.ti.com ([172.24.170.98]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id p37AOpRA027680 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 7 Apr 2011 05:24:53 -0500 Received: from psplinux052.india.ti.com (localhost [127.0.0.1]) by dbdp31.itg.ti.com (8.13.8/8.13.8) with ESMTP id p37AOlIl013031; Thu, 7 Apr 2011 15:54:48 +0530 (IST) Received: from psplinux052.india.ti.com (localhost [127.0.0.1]) by psplinux052.india.ti.com (8.13.1/8.13.1) with ESMTP id p37AOlmK003668; Thu, 7 Apr 2011 15:54:47 +0530 Received: (from a0393537@localhost) by psplinux052.india.ti.com (8.13.1/8.13.1/Submit) id p37AOlYS003665; Thu, 7 Apr 2011 15:54:47 +0530 From: "Basheer, Mansoor Ahamed" To: linux-omap@vger.kernel.org Cc: tony@atomide.com, linux-arm-kernel@lists.arm.linux.org.uk, linux-ide@vger.kernel.org, Mansoor Ahamed Subject: [PATCH] OMAP: TI816X: Add SATA support Date: Thu, 7 Apr 2011 15:54:47 +0530 Message-Id: <1302171887-3598-1-git-send-email-mansoor.ahamed@ti.com> X-Mailer: git-send-email 1.6.2.4 Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org From: Mansoor Ahamed Add support for SATA controller on the TI816X devices. TI816X supports 1 HBA with 2 ports (dedicated DMA). This is a Gen 2 HBA with 3Gbps support. It supports Port Multiplier but only in Command Based Switching mode. The patch adds required platform resource and SATA controller initialization routine. The PHY configuration in this patch is courtesy of the work done by Zegeye Alemu and Swaminathan from TI. While testing this patch, enable port multiplier support if you are actually using one. Reason for this behaviour is discussed here: http://patchwork.ozlabs.org/patch/78163/ Signed-off-by: Basheer, Mansoor Ahamed --- This patch depends on patch "TI816X: clock: Add clock data" from Hemant Pedanekar arch/arm/mach-omap2/devices.c | 126 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 126 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index d478f53..9c33022 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c @@ -16,6 +16,8 @@ #include #include #include +#include +#include #include #include @@ -100,6 +102,129 @@ static int __init omap4_l3_init(void) } postcore_initcall(omap4_l3_init); +#if defined(CONFIG_SATA_AHCI_PLATFORM) || \ + defined(CONFIG_SATA_AHCI_PLATFORM_MODULE) + +static struct ahci_platform_data omap_sata_pdata; +static u64 omap_sata_dmamask = DMA_BIT_MASK(32); +static struct clk *omap_sata_clk; + +/* SATA PHY control register offsets */ +#define SATA_P0PHYCR_REG 0x178 +#define SATA_P1PHYCR_REG 0x1F8 + +#define SATA_PHY_ENPLL(x) ((x) << 0) +#define SATA_PHY_MPY(x) ((x) << 1) +#define SATA_PHY_LB(x) ((x) << 5) +#define SATA_PHY_CLKBYP(x) ((x) << 7) +#define SATA_PHY_RXINVPAIR(x) ((x) << 9) +#define SATA_PHY_LBK(x) ((x) << 10) +#define SATA_PHY_RXLOS(x) ((x) << 12) +#define SATA_PHY_RXCDR(x) ((x) << 13) +#define SATA_PHY_RXEQ(x) ((x) << 16) +#define SATA_PHY_RXENOC(x) ((x) << 20) +#define SATA_PHY_TXINVPAIR(x) ((x) << 21) +#define SATA_PHY_TXCM(x) ((x) << 22) +#define SATA_PHY_TXSWING(x) ((x) << 23) +#define SATA_PHY_TXDE(x) ((x) << 27) + +#define TI816X_SATA_BASE 0x4A140000 + +static int ti816x_ahci_plat_init(struct device *dev, void __iomem *base) +{ + unsigned int phy_val; + int ret; + + omap_sata_clk = clk_get(dev, NULL); + if (IS_ERR(omap_sata_clk)) { + pr_err("ahci : Failed to get SATA clock\n"); + return PTR_ERR(omap_sata_clk); + } + + if (!base) { + pr_err("ahci : SATA reg space not mapped, PHY enable failed\n"); + ret = -ENOMEM; + goto err; + } + + ret = clk_enable(omap_sata_clk); + if (ret) { + pr_err("ahci : Clock enable failed\n"); + goto err; + } + + phy_val = SATA_PHY_ENPLL(1) | + SATA_PHY_MPY(8) | + SATA_PHY_LB(0) | + SATA_PHY_CLKBYP(0) | + SATA_PHY_RXINVPAIR(0) | + SATA_PHY_LBK(0) | + SATA_PHY_RXLOS(1) | + SATA_PHY_RXCDR(4) | + SATA_PHY_RXEQ(1) | + SATA_PHY_RXENOC(1) | + SATA_PHY_TXINVPAIR(0) | + SATA_PHY_TXCM(0) | + SATA_PHY_TXSWING(7) | + SATA_PHY_TXDE(0); + + writel(phy_val, base + SATA_P0PHYCR_REG); + writel(phy_val, base + SATA_P1PHYCR_REG); + + return 0; +err: + clk_put(omap_sata_clk); + return ret; +} + +static void ti816x_ahci_plat_exit(struct device *dev) +{ + clk_disable(omap_sata_clk); + clk_put(omap_sata_clk); +} + +/* resources will be filled by soc specific init routine */ +static struct resource omap_ahci_resources[] = { + { + .flags = IORESOURCE_MEM, + }, + { + .flags = IORESOURCE_IRQ, + } +}; + +static struct platform_device omap_ahci_device = { + .name = "ahci", + .dev = { + .platform_data = &omap_sata_pdata, + .coherent_dma_mask = DMA_BIT_MASK(32), + .dma_mask = &omap_sata_dmamask, + }, + .num_resources = ARRAY_SIZE(omap_ahci_resources), + .resource = omap_ahci_resources, +}; + +static void ti816x_ahci_init(void) +{ + /* fixup platform device info for TI816X */ + omap_ahci_resources[0].start = TI816X_SATA_BASE; + omap_ahci_resources[0].end = TI816X_SATA_BASE + 0x10fff; + omap_ahci_resources[1].start = 16; /* SATA IRQ */ + omap_sata_pdata.init = ti816x_ahci_plat_init; + omap_sata_pdata.exit = ti816x_ahci_plat_exit; +} + +static inline void omap_init_ahci(void) +{ + if (cpu_is_ti816x()) { + ti816x_ahci_init(); + platform_device_register(&omap_ahci_device); + } +} +#else +static inline void omap_init_ahci(void) {} +#endif + #if defined(CONFIG_VIDEO_OMAP2) || defined(CONFIG_VIDEO_OMAP2_MODULE) static struct resource cam_resources[] = { @@ -667,6 +792,7 @@ static int __init omap2_init_devices(void) * please keep these calls, and their implementations above, * in alphabetical order so they're easier to sort through. */ + omap_init_ahci(); omap_init_audio(); omap_init_camera(); omap_init_mbox();