aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/pxa300.c
diff options
context:
space:
mode:
authorEric Miao <eric.miao@marvell.com>2008-06-02 03:22:03 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-07-09 16:38:32 -0400
commit9ae819a819b4dfc60ac13dd1f1e1a7eaa3d4a6cb (patch)
tree1a10d64da2440c7a7f0f33cb4e044e056879a632 /arch/arm/mach-pxa/pxa300.c
parent7c3ada4f7cc76fa3912683da83eccf7886fca1b1 (diff)
[ARM] pxa: add pxa3xx NAND device and clock sources
A pxa3xx_set_nand_info() is also introduced to set the PXA3xx NAND driver specific platform_data structure pointer. Signed-off-by: Eric Miao <eric.miao@marvell.com> Cc: Sergey Podstavin <spodstavin@ru.mvista.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.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/pxa300.c b/arch/arm/mach-pxa/pxa300.c
index a0db6fa7c323..da92e9733886 100644
--- a/arch/arm/mach-pxa/pxa300.c
+++ b/arch/arm/mach-pxa/pxa300.c
@@ -85,6 +85,10 @@ static struct pxa3xx_mfp_addr_map pxa310_mfp_addr_map[] __initdata = {
85 MFP_ADDR_END, 85 MFP_ADDR_END,
86}; 86};
87 87
88static struct clk common_clks[] = {
89 PXA3xx_CKEN("NANDCLK", NAND, 156000000, 0, &pxa3xx_device_nand.dev),
90};
91
88static struct clk pxa310_clks[] = { 92static struct clk pxa310_clks[] = {
89 PXA3xx_CKEN("MMCCLK", MMC3, 19500000, 0, &pxa3xx_device_mci3.dev), 93 PXA3xx_CKEN("MMCCLK", MMC3, 19500000, 0, &pxa3xx_device_mci3.dev),
90}; 94};
@@ -94,6 +98,7 @@ static int __init pxa300_init(void)
94 if (cpu_is_pxa300() || cpu_is_pxa310()) { 98 if (cpu_is_pxa300() || cpu_is_pxa310()) {
95 pxa3xx_init_mfp(); 99 pxa3xx_init_mfp();
96 pxa3xx_mfp_init_addr(pxa300_mfp_addr_map); 100 pxa3xx_mfp_init_addr(pxa300_mfp_addr_map);
101 clks_register(ARRAY_AND_SIZE(common_clks));
97 } 102 }
98 103
99 if (cpu_is_pxa310()) { 104 if (cpu_is_pxa310()) {