summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorSoeren Moch <smoch@web.de>2014-11-27 10:11:41 +0100
committerStefano Babic <sbabic@denx.de>2014-12-01 10:20:19 +0100
commitdd1c8f1b5fb63a682fce62a53464108d8587b0a2 (patch)
tree7292a7f3b4a7f845cffa229c6c1a653d63994323 /arch/arm
parentf8bbd7f7b0c6eb3accc30deab9aafb2c50f9ee9a (diff)
downloadblackbird-obmc-uboot-dd1c8f1b5fb63a682fce62a53464108d8587b0a2.tar.gz
blackbird-obmc-uboot-dd1c8f1b5fb63a682fce62a53464108d8587b0a2.zip
sata: fix reset_sata for dwc_ahsata
- fix crash when sata device is not initialized - remove disable_sata_clock() since it is not clear which clock for which device should be disabled here - call disable_sata_clock() for mx6 in preboot_os instead Signed-off-by: Soeren Moch <smoch@web.de> Acked-by: Nikita Kiryanov <nikita@compulab.co.il> Tested-by: Nikita Kiryanov <nikita@compulab.co.il>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/imx-common/cpu.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/imx-common/cpu.c b/arch/arm/imx-common/cpu.c
index b58df7da6f..28ccd29594 100644
--- a/arch/arm/imx-common/cpu.c
+++ b/arch/arm/imx-common/cpu.c
@@ -206,6 +206,9 @@ void arch_preboot_os(void)
{
#if defined(CONFIG_CMD_SATA)
sata_stop();
+#if defined(CONFIG_MX6)
+ disable_sata_clock();
+#endif
#endif
#if defined(CONFIG_VIDEO_IPUV3)
/* disable video before launching O/S */
OpenPOWER on IntegriCloud