projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.denx.de/u-boot-dm
[oweals/u-boot.git]
/
arch
/
arm
/
cpu
/
armv7
/
mx5
/
clock.c
diff --git
a/arch/arm/cpu/armv7/mx5/clock.c
b/arch/arm/cpu/armv7/mx5/clock.c
index fbbb365cb600942e9a8d7ff095b135c48dfd7345..bf52f0d19e546e0b98b2717b25618c4c6711e92b 100644
(file)
--- a/
arch/arm/cpu/armv7/mx5/clock.c
+++ b/
arch/arm/cpu/armv7/mx5/clock.c
@@
-85,7
+85,7
@@
void set_usboh3_clk(void)
MXC_CCM_CSCDR1_USBOH3_CLK_PODF(1));
}
MXC_CCM_CSCDR1_USBOH3_CLK_PODF(1));
}
-void enable_usboh3_clk(
unsigned char
enable)
+void enable_usboh3_clk(
bool
enable)
{
unsigned int cg = enable ? MXC_CCM_CCGR_CG_ON : MXC_CCM_CCGR_CG_OFF;
{
unsigned int cg = enable ? MXC_CCM_CCGR_CG_ON : MXC_CCM_CCGR_CG_OFF;
@@
-94,7
+94,7
@@
void enable_usboh3_clk(unsigned char enable)
MXC_CCM_CCGR2_USBOH3_60M(cg));
}
MXC_CCM_CCGR2_USBOH3_60M(cg));
}
-#ifdef CONFIG_I2C_MXC
+#ifdef CONFIG_
SYS_
I2C_MXC
/* i2c_num can be from 0, to 1 for i.MX51 and 2 for i.MX53 */
int enable_i2c_clk(unsigned char enable, unsigned i2c_num)
{
/* i2c_num can be from 0, to 1 for i.MX51 and 2 for i.MX53 */
int enable_i2c_clk(unsigned char enable, unsigned i2c_num)
{
@@
-122,7
+122,7
@@
void set_usb_phy_clk(void)
}
#if defined(CONFIG_MX51)
}
#if defined(CONFIG_MX51)
-void enable_usb_phy1_clk(
unsigned char
enable)
+void enable_usb_phy1_clk(
bool
enable)
{
unsigned int cg = enable ? MXC_CCM_CCGR_CG_ON : MXC_CCM_CCGR_CG_OFF;
{
unsigned int cg = enable ? MXC_CCM_CCGR_CG_ON : MXC_CCM_CCGR_CG_OFF;
@@
-131,12
+131,12
@@
void enable_usb_phy1_clk(unsigned char enable)
MXC_CCM_CCGR2_USB_PHY(cg));
}
MXC_CCM_CCGR2_USB_PHY(cg));
}
-void enable_usb_phy2_clk(
unsigned char
enable)
+void enable_usb_phy2_clk(
bool
enable)
{
/* i.MX51 has a single USB PHY clock, so do nothing here. */
}
#elif defined(CONFIG_MX53)
{
/* i.MX51 has a single USB PHY clock, so do nothing here. */
}
#elif defined(CONFIG_MX53)
-void enable_usb_phy1_clk(
unsigned char
enable)
+void enable_usb_phy1_clk(
bool
enable)
{
unsigned int cg = enable ? MXC_CCM_CCGR_CG_ON : MXC_CCM_CCGR_CG_OFF;
{
unsigned int cg = enable ? MXC_CCM_CCGR_CG_ON : MXC_CCM_CCGR_CG_OFF;
@@
-145,7
+145,7
@@
void enable_usb_phy1_clk(unsigned char enable)
MXC_CCM_CCGR4_USB_PHY1(cg));
}
MXC_CCM_CCGR4_USB_PHY1(cg));
}
-void enable_usb_phy2_clk(
unsigned char
enable)
+void enable_usb_phy2_clk(
bool
enable)
{
unsigned int cg = enable ? MXC_CCM_CCGR_CG_ON : MXC_CCM_CCGR_CG_OFF;
{
unsigned int cg = enable ? MXC_CCM_CCGR_CG_ON : MXC_CCM_CCGR_CG_OFF;
@@
-749,6
+749,18
@@
void enable_nfc_clk(unsigned char enable)
MXC_CCM_CCGR5_EMI_ENFC(cg));
}
MXC_CCM_CCGR5_EMI_ENFC(cg));
}
+#ifdef CONFIG_FSL_IIM
+void enable_efuse_prog_supply(bool enable)
+{
+ if (enable)
+ setbits_le32(&mxc_ccm->cgpr,
+ MXC_CCM_CGPR_EFUSE_PROG_SUPPLY_GATE);
+ else
+ clrbits_le32(&mxc_ccm->cgpr,
+ MXC_CCM_CGPR_EFUSE_PROG_SUPPLY_GATE);
+}
+#endif
+
/* Config main_bus_clock for periphs */
static int config_periph_clk(u32 ref, u32 freq)
{
/* Config main_bus_clock for periphs */
static int config_periph_clk(u32 ref, u32 freq)
{