diff options
| author | guoyin.chen <guoyin.chen@freescale.com> | 2013-02-27 13:32:17 +0800 |
|---|---|---|
| committer | guoyin.chen <guoyin.chen@freescale.com> | 2013-02-27 13:32:17 +0800 |
| commit | 66c3a24a57bd9e721f5d0d45924c3c250bb37770 (patch) | |
| tree | 5c467232e149c887a847cedb1cf762a6a6940924 /arch/arm/mach-mx6/board-mx6q_sabresd.c | |
| parent | 57ee456c6db3bb07b4725b234ac0a4aefd1c80e1 (diff) | |
| parent | 85b80e70a92ad66b86dc0a1636c59145b9fbf39c (diff) | |
Merge remote-tracking branch 'fsl-linux-sdk/imx_3.0.35' into imx_3.0.35_android
Conflicts:
arch/arm/mach-mx6/Makefile
arch/arm/mach-mx6/board-mx6dl_hdmidongle.h
arch/arm/mach-mx6/board-mx6q_hdmidongle.c
arch/arm/mach-mx6/board-mx6q_hdmidongle.h
arch/arm/mach-mx6/board-mx6q_sabreauto.c
arch/arm/mach-mx6/board-mx6q_sabrelite.c
drivers/media/video/mxc/capture/csi_v4l2_capture.c
drivers/media/video/mxc/capture/ipu_csi_enc.c
drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.c
drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c
drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.h
drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal.h
drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_compiler.h
drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_enum.h
drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_options.h
drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.c
drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_driver.c
drivers/mxc/vpu/mxc_vpu.c
drivers/usb/gadget/arcotg_udc.c
drivers/video/mxc/mxc_ipuv3_fb.c
drivers/video/mxc_hdmi.c
include/linux/mxcfb.h
sound/soc/imx/imx-wm8962.c
Diffstat (limited to 'arch/arm/mach-mx6/board-mx6q_sabresd.c')
| -rw-r--r-- | arch/arm/mach-mx6/board-mx6q_sabresd.c | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/arch/arm/mach-mx6/board-mx6q_sabresd.c b/arch/arm/mach-mx6/board-mx6q_sabresd.c index eca696637de0..183f1b9afe42 100644 --- a/arch/arm/mach-mx6/board-mx6q_sabresd.c +++ b/arch/arm/mach-mx6/board-mx6q_sabresd.c @@ -1172,11 +1172,22 @@ static int mx6q_sabresd_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); @@ -1184,6 +1195,7 @@ put_sata_clk: return ret; } +#ifdef CONFIG_SATA_AHCI_PLATFORM static void mx6q_sabresd_sata_exit(struct device *dev) { clk_disable(sata_clk); @@ -1194,6 +1206,7 @@ static struct ahci_platform_data mx6q_sabresd_sata_data = { .init = mx6q_sabresd_sata_init, .exit = mx6q_sabresd_sata_exit, }; +#endif static void mx6q_sabresd_flexcan0_switch(int enable) { @@ -1861,8 +1874,14 @@ static void __init mx6_sabresd_board_init(void) imx_add_viv_gpu(&imx6_gpu_data, &imx6q_gpu_pdata); imx6q_sabresd_init_usb(); /* SATA is not supported by MX6DL/Solo */ - if (cpu_is_mx6q()) + if (cpu_is_mx6q()) { +#ifdef CONFIG_SATA_AHCI_PLATFORM imx6q_add_ahci(0, &mx6q_sabresd_sata_data); +#else + mx6q_sabresd_sata_init(NULL, + (void __iomem *)ioremap(MX6Q_SATA_BASE_ADDR, SZ_4K)); +#endif + } imx6q_add_vpu(); imx6q_init_audio(); platform_device_register(&sabresd_vmmc_reg_devices); |