diff options
author | Eric Miao <eric.miao@marvell.com> | 2008-05-11 21:25:37 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-09 16:38:32 -0400 |
commit | 7c3ada4f7cc76fa3912683da83eccf7886fca1b1 (patch) | |
tree | 95890207a32e16faef781007c133b1ec96b8f640 /arch/arm/mach-pxa/pxa300.c | |
parent | 7a2c5cb0e2cafd5c3d07df1db8de183283a3b1ac (diff) |
[ARM] pxa: move pxa310 specific MMC3 clk out of generic pxa3xx.c
Signed-off-by: Eric Miao <eric.miao@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-pxa/pxa300.c')
-rw-r--r-- | arch/arm/mach-pxa/pxa300.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/pxa300.c b/arch/arm/mach-pxa/pxa300.c index 0a0d3877f212..a0db6fa7c323 100644 --- a/arch/arm/mach-pxa/pxa300.c +++ b/arch/arm/mach-pxa/pxa300.c | |||
@@ -15,10 +15,16 @@ | |||
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> |
21 | #include <asm/arch/pxa3xx-regs.h> | ||
20 | #include <asm/arch/mfp-pxa300.h> | 22 | #include <asm/arch/mfp-pxa300.h> |
21 | 23 | ||
24 | #include "generic.h" | ||
25 | #include "devices.h" | ||
26 | #include "clock.h" | ||
27 | |||
22 | static struct pxa3xx_mfp_addr_map pxa300_mfp_addr_map[] __initdata = { | 28 | static struct pxa3xx_mfp_addr_map pxa300_mfp_addr_map[] __initdata = { |
23 | 29 | ||
24 | MFP_ADDR_X(GPIO0, GPIO2, 0x00b4), | 30 | MFP_ADDR_X(GPIO0, GPIO2, 0x00b4), |
@@ -79,6 +85,10 @@ static struct pxa3xx_mfp_addr_map pxa310_mfp_addr_map[] __initdata = { | |||
79 | MFP_ADDR_END, | 85 | MFP_ADDR_END, |
80 | }; | 86 | }; |
81 | 87 | ||
88 | static struct clk pxa310_clks[] = { | ||
89 | PXA3xx_CKEN("MMCCLK", MMC3, 19500000, 0, &pxa3xx_device_mci3.dev), | ||
90 | }; | ||
91 | |||
82 | static int __init pxa300_init(void) | 92 | static int __init pxa300_init(void) |
83 | { | 93 | { |
84 | if (cpu_is_pxa300() || cpu_is_pxa310()) { | 94 | if (cpu_is_pxa300() || cpu_is_pxa310()) { |
@@ -86,8 +96,10 @@ static int __init pxa300_init(void) | |||
86 | pxa3xx_mfp_init_addr(pxa300_mfp_addr_map); | 96 | pxa3xx_mfp_init_addr(pxa300_mfp_addr_map); |
87 | } | 97 | } |
88 | 98 | ||
89 | if (cpu_is_pxa310()) | 99 | if (cpu_is_pxa310()) { |
90 | pxa3xx_mfp_init_addr(pxa310_mfp_addr_map); | 100 | pxa3xx_mfp_init_addr(pxa310_mfp_addr_map); |
101 | clks_register(ARRAY_AND_SIZE(pxa310_clks)); | ||
102 | } | ||
91 | 103 | ||
92 | return 0; | 104 | return 0; |
93 | } | 105 | } |