ceph: update discussion list address in MAINTAINERS

[safe/jmp/linux-2.6] / arch / arm / mach-pxa / pxa300.c

diff --git a/arch/arm/mach-pxa/pxa300.c b/arch/arm/mach-pxa/pxa300.c
index 5363b13..40bb165 100644 (file)
--- a/arch/arm/mach-pxa/pxa300.c
+++ b/arch/arm/mach-pxa/pxa300.c
@@ -5,7 +5,7 @@
  *
  * Copyright (C) 2007 Marvell Internation Ltd.
  *
- * 2007-08-21: eric miao <eric.y.miao@gmail.com>
+ * 2007-08-21: eric miao <eric.miao@marvell.com>
  *             initial version
  *
  * This program is free software; you can redistribute it and/or modify
@@ -15,16 +15,22 @@
 
 #include <linux/module.h>
 #include <linux/kernel.h>
+#include <linux/platform_device.h>
 
-#include <asm/hardware.h>
-#include <asm/arch/mfp-pxa300.h>
+#include <mach/pxa300.h>
 
-static struct pxa3xx_mfp_addr_map pxa300_mfp_addr_map[] __initdata = {
+#include "generic.h"
+#include "devices.h"
+#include "clock.h"
+
+static struct mfp_addr_map pxa300_mfp_addr_map[] __initdata = {
 
        MFP_ADDR_X(GPIO0,   GPIO2,   0x00b4),
        MFP_ADDR_X(GPIO3,   GPIO26,  0x027c),
-       MFP_ADDR_X(GPIO27,  GPIO127, 0x0400),
-       MFP_ADDR_X(GPIO0_2, GPIO6_2, 0x02ec),
+       MFP_ADDR_X(GPIO27,  GPIO98,  0x0400),
+       MFP_ADDR_X(GPIO99,  GPIO127, 0x0600),
+       MFP_ADDR_X(GPIO0_2, GPIO1_2, 0x0674),
+       MFP_ADDR_X(GPIO2_2, GPIO6_2, 0x02dc),
 
        MFP_ADDR(nBE0, 0x0204),
        MFP_ADDR(nBE1, 0x0208),
@@ -66,7 +72,7 @@ static struct pxa3xx_mfp_addr_map pxa300_mfp_addr_map[] __initdata = {
 };
 
 /* override pxa300 MFP register addresses */
-static struct pxa3xx_mfp_addr_map pxa310_mfp_addr_map[] __initdata = {
+static struct mfp_addr_map pxa310_mfp_addr_map[] __initdata = {
        MFP_ADDR_X(GPIO30,  GPIO98,   0x0418),
        MFP_ADDR_X(GPIO7_2, GPIO12_2, 0x052C),
 
@@ -77,15 +83,32 @@ static struct pxa3xx_mfp_addr_map pxa310_mfp_addr_map[] __initdata = {
        MFP_ADDR_END,
 };
 
+static DEFINE_PXA3_CKEN(common_nand, NAND, 156000000, 0);
+static DEFINE_PXA3_CKEN(gcu, PXA300_GCU, 0, 0);
+
+static struct clk_lookup common_clkregs[] = {
+       INIT_CLKREG(&clk_common_nand, "pxa3xx-nand", NULL),
+       INIT_CLKREG(&clk_gcu, "pxa3xx-gcu", NULL),
+};
+
+static DEFINE_PXA3_CKEN(pxa310_mmc3, MMC3, 19500000, 0);
+
+static struct clk_lookup pxa310_clkregs[] = {
+       INIT_CLKREG(&clk_pxa310_mmc3, "pxa2xx-mci.2", NULL),
+};
+
 static int __init pxa300_init(void)
 {
        if (cpu_is_pxa300() || cpu_is_pxa310()) {
-               pxa3xx_init_mfp();
-               pxa3xx_mfp_init_addr(pxa300_mfp_addr_map);
+               mfp_init_base(io_p2v(MFPR_BASE));
+               mfp_init_addr(pxa300_mfp_addr_map);
+               clkdev_add_table(ARRAY_AND_SIZE(common_clkregs));
        }
 
-       if (cpu_is_pxa310())
-               pxa3xx_mfp_init_addr(pxa310_mfp_addr_map);
+       if (cpu_is_pxa310()) {
+               mfp_init_addr(pxa310_mfp_addr_map);
+               clkdev_add_table(ARRAY_AND_SIZE(pxa310_clkregs));
+       }
 
        return 0;
 }