diff options
Diffstat (limited to 'arch/arm/mach-pxa/pxa320.c')
-rw-r--r-- | arch/arm/mach-pxa/pxa320.c | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/arch/arm/mach-pxa/pxa320.c b/arch/arm/mach-pxa/pxa320.c index 74128eb8f8d0..c557c23a1efe 100644 --- a/arch/arm/mach-pxa/pxa320.c +++ b/arch/arm/mach-pxa/pxa320.c | |||
@@ -15,11 +15,17 @@ | |||
15 | 15 | ||
16 | #include <linux/module.h> | 16 | #include <linux/module.h> |
17 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
18 | #include <linux/platform_device.h> | ||
18 | 19 | ||
19 | #include <asm/hardware.h> | 20 | #include <asm/hardware.h> |
20 | #include <asm/arch/mfp.h> | 21 | #include <asm/arch/mfp.h> |
22 | #include <asm/arch/pxa3xx-regs.h> | ||
21 | #include <asm/arch/mfp-pxa320.h> | 23 | #include <asm/arch/mfp-pxa320.h> |
22 | 24 | ||
25 | #include "generic.h" | ||
26 | #include "devices.h" | ||
27 | #include "clock.h" | ||
28 | |||
23 | static struct pxa3xx_mfp_addr_map pxa320_mfp_addr_map[] __initdata = { | 29 | static struct pxa3xx_mfp_addr_map pxa320_mfp_addr_map[] __initdata = { |
24 | 30 | ||
25 | MFP_ADDR_X(GPIO0, GPIO4, 0x0124), | 31 | MFP_ADDR_X(GPIO0, GPIO4, 0x0124), |
@@ -74,16 +80,17 @@ static struct pxa3xx_mfp_addr_map pxa320_mfp_addr_map[] __initdata = { | |||
74 | MFP_ADDR_END, | 80 | MFP_ADDR_END, |
75 | }; | 81 | }; |
76 | 82 | ||
77 | static void __init pxa320_init_mfp(void) | 83 | static struct clk pxa320_clks[] = { |
78 | { | 84 | PXA3xx_CKEN("NANDCLK", NAND, 104000000, 0, &pxa3xx_device_nand.dev), |
79 | pxa3xx_init_mfp(); | 85 | }; |
80 | pxa3xx_mfp_init_addr(pxa320_mfp_addr_map); | ||
81 | } | ||
82 | 86 | ||
83 | static int __init pxa320_init(void) | 87 | static int __init pxa320_init(void) |
84 | { | 88 | { |
85 | if (cpu_is_pxa320()) | 89 | if (cpu_is_pxa320()) { |
86 | pxa320_init_mfp(); | 90 | pxa3xx_init_mfp(); |
91 | pxa3xx_mfp_init_addr(pxa320_mfp_addr_map); | ||
92 | clks_register(ARRAY_AND_SIZE(pxa320_clks)); | ||
93 | } | ||
87 | 94 | ||
88 | return 0; | 95 | return 0; |
89 | } | 96 | } |