MLK-9961-4 arm:imx6x: Change PLL1 clock management.

[karo-tx-linux.git] / arch / arm / mach-imx / imx6sx_low_power_idle.S

diff --git a/arch/arm/mach-imx/imx6sx_low_power_idle.S b/arch/arm/mach-imx/imx6sx_low_power_idle.S
index dd0a22086c5b72ce0b1658b9a0b9adbd80bb6827..796e9fd6d71ccab6b41275e1915c7a26a00221d2 100644 (file)
--- a/arch/arm/mach-imx/imx6sx_low_power_idle.S
+++ b/arch/arm/mach-imx/imx6sx_low_power_idle.S
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Freescale Semiconductor, Inc. All Rights Reserved.
+ * Copyright (C) 2014-2015 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
@@ -90,13 +90,6 @@
 
        ccm_do_wait
 
-       ldr     r10, [r0, #PM_INFO_MX6Q_ANATOP_V_OFFSET]
-
-       /* enable PLL1 bypass output */
-       ldr     r7, [r10]
-       orr     r7, r7, #0x12000
-       str     r7, [r10]
-
        ldr     r10, [r0, #PM_INFO_MX6Q_CCM_V_OFFSET]
 
        /* set pll1_sw to from pll1 main */
@@ -203,11 +196,6 @@
        ldreq   r10, [r0, #PM_INFO_MX6Q_ANATOP_V_OFFSET]
        ldrne   r10, [r0, #PM_INFO_MX6Q_ANATOP_P_OFFSET]
 
-       /* disable PLL1 bypass output */
-       ldr     r7, [r10]
-       bic     r7, r7, #0x12000
-       str     r7, [r10]
-
        .endm
 
        .macro  anatop_enter_idle