openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'imx6q/fixes' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes

This commit is contained in:
Arnd Bergmann 2011-11-23 20:00:00 +00:00
parent c2735391fb f475058f48
commit 33e1e10a58
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arch/arm/mach-imx/clock-imx6q.c
View File

@ -1953,14 +1953,17 @@ static struct map_desc imx6q_clock_desc[] = {
imx_map_entry(MX6Q, ANATOP, MT_DEVICE), imx_map_entry(MX6Q, ANATOP, MT_DEVICE),
}; };
void __init imx6q_clock_map_io(void)
{
iotable_init(imx6q_clock_desc, ARRAY_SIZE(imx6q_clock_desc));
}
int __init mx6q_clocks_init(void) int __init mx6q_clocks_init(void)
{ {
struct device_node *np; struct device_node *np;
void __iomem *base; void __iomem *base;
int i, irq; int i, irq;
iotable_init(imx6q_clock_desc, ARRAY_SIZE(imx6q_clock_desc));
/* retrieve the freqency of fixed clocks from device tree */ /* retrieve the freqency of fixed clocks from device tree */
for_each_compatible_node(np, NULL, "fixed-clock") { for_each_compatible_node(np, NULL, "fixed-clock") {
u32 rate; u32 rate;

1
arch/arm/mach-imx/mach-imx6q.c
View File

@ -34,6 +34,7 @@ static void __init imx6q_map_io(void)
{ {
imx_lluart_map_io(); imx_lluart_map_io();
imx_scu_map_io(); imx_scu_map_io();
imx6q_clock_map_io();
} }
static void __init imx6q_gpio_add_irq_domain(struct device_node *np, static void __init imx6q_gpio_add_irq_domain(struct device_node *np,

1
arch/arm/plat-mxc/include/mach/common.h
View File

@ -133,4 +133,5 @@ extern void imx53_qsb_common_init(void);
extern void imx53_smd_common_init(void); extern void imx53_smd_common_init(void);
extern int imx6q_set_lpm(enum mxc_cpu_pwr_mode mode); extern int imx6q_set_lpm(enum mxc_cpu_pwr_mode mode);
extern void imx6q_pm_init(void); extern void imx6q_pm_init(void);
extern void imx6q_clock_map_io(void);
#endif #endif