diff options
Diffstat (limited to 'arch/arm/mach-mx6/board-mx6q_arm2.c')
| -rw-r--r-- | arch/arm/mach-mx6/board-mx6q_arm2.c | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/arch/arm/mach-mx6/board-mx6q_arm2.c b/arch/arm/mach-mx6/board-mx6q_arm2.c index 85f938951fb0..b1c8eaa16535 100644 --- a/arch/arm/mach-mx6/board-mx6q_arm2.c +++ b/arch/arm/mach-mx6/board-mx6q_arm2.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011-2012 Freescale Semiconductor, Inc. All Rights Reserved. + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -1307,11 +1307,22 @@ static int mx6_arm2_sata_init(struct device *dev, void __iomem *addr) tmpdata = clk_get_rate(clk) / 1000; clk_put(clk); +#ifdef CONFIG_SATA_AHCI_PLATFORM ret = sata_init(addr, tmpdata); if (ret == 0) return ret; +#else + usleep_range(1000, 2000); + /* AHCI PHY enter into PDDQ mode if the AHCI module is not enabled */ + tmpdata = readl(addr + PORT_PHY_CTL); + writel(tmpdata | PORT_PHY_CTL_PDDQ_LOC, addr + PORT_PHY_CTL); + pr_info("No AHCI save PWR: PDDQ %s\n", ((readl(addr + PORT_PHY_CTL) + >> 20) & 1) ? "enabled" : "disabled"); +#endif release_sata_clk: + /* disable SATA_PHY PLL */ + writel((readl(IOMUXC_GPR13) & ~0x2), IOMUXC_GPR13); clk_disable(sata_clk); put_sata_clk: clk_put(sata_clk); @@ -1322,6 +1333,7 @@ put_sata_clk: return ret; } +#ifdef CONFIG_SATA_AHCI_PLATFORM static void mx6_arm2_sata_exit(struct device *dev) { clk_disable(sata_clk); @@ -1337,6 +1349,7 @@ static struct ahci_platform_data mx6_arm2_sata_data = { .init = mx6_arm2_sata_init, .exit = mx6_arm2_sata_exit, }; +#endif static struct imx_asrc_platform_data imx_asrc_data = { .channel_bits = 4, @@ -2157,8 +2170,14 @@ static void __init mx6_arm2_init(void) imx6q_add_sdhci_usdhc_imx(3, &mx6_arm2_sd4_data); imx6q_add_sdhci_usdhc_imx(2, &mx6_arm2_sd3_data); imx_add_viv_gpu(&imx6_gpu_data, &imx6_gpu_pdata); - if (cpu_is_mx6q()) + if (cpu_is_mx6q()) { +#ifdef CONFIG_SATA_AHCI_PLATFORM imx6q_add_ahci(0, &mx6_arm2_sata_data); +#else + mx6_arm2_sata_init(NULL, + (void __iomem *)ioremap(MX6Q_SATA_BASE_ADDR, SZ_4K)); +#endif + } imx6q_add_vpu(); mx6_arm2_init_usb(); mx6_arm2_init_audio(); |