diff options
| author | Benoît Thébaudeau <benoit.thebaudeau@advansee.com> | 2012-09-27 10:21:00 +0000 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-10-15 11:54:10 -0700 |
| commit | 1f5e4ee0b9e06a129a6a1b117d77c77189c18542 (patch) | |
| tree | c91d5ab5ace414429e70ccef2cacfde2d497a779 /arch/arm/cpu | |
| parent | 846b38981f8014cc6562f3b89bef4c87cbc8ca2a (diff) | |
| download | u-boot-imx-1f5e4ee0b9e06a129a6a1b117d77c77189c18542.zip u-boot-imx-1f5e4ee0b9e06a129a6a1b117d77c77189c18542.tar.gz u-boot-imx-1f5e4ee0b9e06a129a6a1b117d77c77189c18542.tar.bz2 | |
mx5: Use explicit clock gate names
Use clock gate definitions having names showing clearly the gated clock instead
of names giving only a register field index.
Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
Cc: Stefano Babic <sbabic@denx.de>
Diffstat (limited to 'arch/arm/cpu')
| -rw-r--r-- | arch/arm/cpu/armv7/mx5/clock.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/arch/arm/cpu/armv7/mx5/clock.c b/arch/arm/cpu/armv7/mx5/clock.c index 8b0af3b..cba5d1b 100644 --- a/arch/arm/cpu/armv7/mx5/clock.c +++ b/arch/arm/cpu/armv7/mx5/clock.c @@ -102,9 +102,9 @@ void set_usboh3_clk(void) void enable_usboh3_clk(unsigned char enable) { if (enable) - setbits_le32(&mxc_ccm->CCGR2, 1 << MXC_CCM_CCGR2_CG14_OFFSET); + setbits_le32(&mxc_ccm->CCGR2, MXC_CCM_CCGR2_USBOH3_60M(1)); else - clrbits_le32(&mxc_ccm->CCGR2, 1 << MXC_CCM_CCGR2_CG14_OFFSET); + clrbits_le32(&mxc_ccm->CCGR2, MXC_CCM_CCGR2_USBOH3_60M(1)); } #ifdef CONFIG_I2C_MXC @@ -115,7 +115,8 @@ int enable_i2c_clk(unsigned char enable, unsigned i2c_num) if (i2c_num > 2) return -EINVAL; - mask = MXC_CCM_CCGR_CG_MASK << ((i2c_num + 9) << 1); + mask = MXC_CCM_CCGR_CG_MASK << + (MXC_CCM_CCGR1_I2C1_OFFSET + (i2c_num << 1)); if (enable) setbits_le32(&mxc_ccm->CCGR1, mask); else @@ -132,9 +133,9 @@ void set_usb_phy1_clk(void) void enable_usb_phy1_clk(unsigned char enable) { if (enable) - setbits_le32(&mxc_ccm->CCGR4, 1 << MXC_CCM_CCGR4_CG5_OFFSET); + setbits_le32(&mxc_ccm->CCGR4, MXC_CCM_CCGR4_USB_PHY1(1)); else - clrbits_le32(&mxc_ccm->CCGR4, 1 << MXC_CCM_CCGR4_CG5_OFFSET); + clrbits_le32(&mxc_ccm->CCGR4, MXC_CCM_CCGR4_USB_PHY1(1)); } void set_usb_phy2_clk(void) @@ -145,9 +146,9 @@ void set_usb_phy2_clk(void) void enable_usb_phy2_clk(unsigned char enable) { if (enable) - setbits_le32(&mxc_ccm->CCGR4, 1 << MXC_CCM_CCGR4_CG6_OFFSET); + setbits_le32(&mxc_ccm->CCGR4, MXC_CCM_CCGR4_USB_PHY2(1)); else - clrbits_le32(&mxc_ccm->CCGR4, 1 << MXC_CCM_CCGR4_CG6_OFFSET); + clrbits_le32(&mxc_ccm->CCGR4, MXC_CCM_CCGR4_USB_PHY2(1)); } /* |