diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-08-01 17:49:27 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-08-01 17:49:27 +0200 |
| commit | 14977019fc30e37993d8c7193a870df06d0bbe9e (patch) | |
| tree | 7bf43cfc9fd08fd75c403010f13a279ddf60f74a /arch | |
| parent | 24e9538b9cb2328c9fa9b127238d58914df721bb (diff) | |
| parent | e40b05cfc2271dcb8e32e3992c57d6ebd3bbaf8c (diff) | |
| download | barebox-14977019fc30e37993d8c7193a870df06d0bbe9e.tar.gz barebox-14977019fc30e37993d8c7193a870df06d0bbe9e.tar.xz | |
Merge branch 'for-next/imx-misc'
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-imx/include/mach/iim.h | 1 | ||||
| -rw-r--r-- | arch/arm/mach-imx/speed-imx35.c | 8 |
2 files changed, 7 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/include/mach/iim.h b/arch/arm/mach-imx/include/mach/iim.h index b97c742a66..ef7b25d29a 100644 --- a/arch/arm/mach-imx/include/mach/iim.h +++ b/arch/arm/mach-imx/include/mach/iim.h @@ -48,7 +48,6 @@ struct imx_iim_platform_data { #ifdef CONFIG_IMX_IIM int imx_iim_read(unsigned int bank, int offset, void *buf, int count); -int imx_iim_get_mac(unsigned char *mac); #else static inline int imx_iim_read(unsigned int bank, int offset, void *buf, int count) diff --git a/arch/arm/mach-imx/speed-imx35.c b/arch/arm/mach-imx/speed-imx35.c index 684dc14262..6d4236a020 100644 --- a/arch/arm/mach-imx/speed-imx35.c +++ b/arch/arm/mach-imx/speed-imx35.c @@ -97,6 +97,11 @@ static unsigned long get_3_3_div(unsigned long in) return (((in >> 3) & 0x7) + 1) * ((in & 0x7) + 1); } +static unsigned long get_6_div(unsigned long in) +{ + return ((in & 0x3f) + 1); +} + static unsigned long imx_get_ipg_perclk(void) { ulong pdr0 = readl(IMX_CCM_BASE + CCM_PDR0); @@ -165,10 +170,11 @@ unsigned long imx_get_uartclk(void) return imx_get_ppllclk() / div; } +/* mmc0 clk only */ unsigned long imx_get_mmcclk(void) { unsigned long pdr3 = readl(IMX_CCM_BASE + CCM_PDR3); - unsigned long div = get_3_3_div(pdr3); + unsigned long div = get_6_div(pdr3); if (pdr3 & (1 << 6)) return imx_get_armclk() / div; |