diff options
author | Ye.Li <B37916@freescale.com> | 2014-09-09 16:20:56 +0800 |
---|---|---|
committer | Ye.Li <B37916@freescale.com> | 2014-09-10 09:49:30 +0800 |
commit | e36a66415f63621417c7fa1c7865ef5b56dca547 (patch) | |
tree | 00a2eab2006c1ada9396aba5afaf93c9730d701f /drivers/usb | |
parent | aa76a7e472e34bc59554f9932d611b1047d24590 (diff) | |
download | u-boot-imx-e36a66415f63621417c7fa1c7865ef5b56dca547.zip u-boot-imx-e36a66415f63621417c7fa1c7865ef5b56dca547.tar.gz u-boot-imx-e36a66415f63621417c7fa1c7865ef5b56dca547.tar.bz2 |
ENGR00330792 imx: mx6: Merge anatop registers to CCM structure
THe anatop registers structure is duplicated with CCM structure at
PLL fields.
Since we are suggested not to use the name "anatop" any longer, merge
the anatop registers to the CCM structure "mxc_ccm_reg" and use CCM
to replace anatop.
Signed-off-by: Ye.Li <B37916@freescale.com>
Diffstat (limited to 'drivers/usb')
-rw-r--r-- | drivers/usb/host/ehci-mx6.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/usb/host/ehci-mx6.c b/drivers/usb/host/ehci-mx6.c index a316d92..005cf36 100644 --- a/drivers/usb/host/ehci-mx6.c +++ b/drivers/usb/host/ehci-mx6.c @@ -11,7 +11,7 @@ #include <linux/compiler.h> #include <usb/ehci-fsl.h> #include <asm/io.h> -#include <asm/arch/imx-regs.h> +#include <asm/arch/crm_regs.h> #include <asm/arch/clock.h> #include <asm/imx-common/iomux-v3.h> @@ -72,22 +72,22 @@ static void usb_internal_phy_clock_gate(int index, int on) static void usb_power_config(int index) { - struct anatop_regs __iomem *anatop = - (struct anatop_regs __iomem *)ANATOP_BASE_ADDR; + struct mxc_ccm_reg __iomem *ccm_regs = + (struct mxc_ccm_reg __iomem *)CCM_BASE_ADDR; void __iomem *chrg_detect; void __iomem *pll_480_ctrl_clr; void __iomem *pll_480_ctrl_set; switch (index) { case 0: - chrg_detect = &anatop->usb1_chrg_detect; - pll_480_ctrl_clr = &anatop->usb1_pll_480_ctrl_clr; - pll_480_ctrl_set = &anatop->usb1_pll_480_ctrl_set; + chrg_detect = &ccm_regs->usb1_chrg_detect; + pll_480_ctrl_clr = &ccm_regs->analog_usb1_pll_480_ctrl_clr; + pll_480_ctrl_set = &ccm_regs->analog_usb1_pll_480_ctrl_set; break; case 1: - chrg_detect = &anatop->usb2_chrg_detect; - pll_480_ctrl_clr = &anatop->usb2_pll_480_ctrl_clr; - pll_480_ctrl_set = &anatop->usb2_pll_480_ctrl_set; + chrg_detect = &ccm_regs->usb2_chrg_detect; + pll_480_ctrl_clr = &ccm_regs->analog_usb2_pll_480_ctrl_clr; + pll_480_ctrl_set = &ccm_regs->analog_usb2_pll_480_ctrl_set; break; default: return; |