1 files changed, 48 insertions, 5 deletions

diff --git a/arch/arm/mach-w90x900/w90p910.c b/arch/arm/mach-w90x900/w90p910.c
index 2bcbaa681b99..1c97e4930b7a 100644
--- a/arch/arm/mach-w90x900/w90p910.c
+++ b/arch/arm/mach-w90x900/w90p910.c
@@ -3,8 +3,7 @@
  *
  * Based on linux/arch/arm/plat-s3c24xx/s3c244x.c by Ben Dooks
  *
- * Copyright (c) 2008 Nuvoton technology corporation
- * All rights reserved.
+ * Copyright (c) 2008 Nuvoton technology corporation.
  *
  * Wan ZongShun <mcuos.com@gmail.com>
  *
@@ -12,8 +11,7 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation;version 2 of the License.
  *
  */
 
@@ -36,6 +34,7 @@
 #include <mach/regs-serial.h>
 
 #include "cpu.h"
+#include "clock.h"
 
 /* Initial IO mappings */
 
@@ -45,9 +44,52 @@ static struct map_desc w90p910_iodesc[] __initdata = {
         IODESC_ENT(UART),
         IODESC_ENT(TIMER),
         IODESC_ENT(EBI),
+        IODESC_ENT(USBEHCIHOST),
+        IODESC_ENT(USBOHCIHOST),
+        IODESC_ENT(ADC),
+        IODESC_ENT(RTC),
+        IODESC_ENT(KPI),
+        IODESC_ENT(USBDEV),
         /*IODESC_ENT(LCD),*/
 };
 
+/* Initial clock declarations. */
+static DEFINE_CLK(lcd, 0);
+static DEFINE_CLK(audio, 1);
+static DEFINE_CLK(fmi, 4);
+static DEFINE_CLK(dmac, 5);
+static DEFINE_CLK(atapi, 6);
+static DEFINE_CLK(emc, 7);
+static DEFINE_CLK(usbd, 8);
+static DEFINE_CLK(usbh, 9);
+static DEFINE_CLK(g2d, 10);;
+static DEFINE_CLK(pwm, 18);
+static DEFINE_CLK(ps2, 24);
+static DEFINE_CLK(kpi, 25);
+static DEFINE_CLK(wdt, 26);
+static DEFINE_CLK(gdma, 27);
+static DEFINE_CLK(adc, 28);
+static DEFINE_CLK(usi, 29);
+
+static struct clk_lookup w90p910_clkregs[] = {
+        DEF_CLKLOOK(&clk_lcd, "w90p910-lcd", NULL),
+        DEF_CLKLOOK(&clk_audio, "w90p910-audio", NULL),
+        DEF_CLKLOOK(&clk_fmi, "w90p910-fmi", NULL),
+        DEF_CLKLOOK(&clk_dmac, "w90p910-dmac", NULL),
+        DEF_CLKLOOK(&clk_atapi, "w90p910-atapi", NULL),
+        DEF_CLKLOOK(&clk_emc, "w90p910-emc", NULL),
+        DEF_CLKLOOK(&clk_usbd, "w90p910-usbd", NULL),
+        DEF_CLKLOOK(&clk_usbh, "w90p910-usbh", NULL),
+        DEF_CLKLOOK(&clk_g2d, "w90p910-g2d", NULL),
+        DEF_CLKLOOK(&clk_pwm, "w90p910-pwm", NULL),
+        DEF_CLKLOOK(&clk_ps2, "w90p910-ps2", NULL),
+        DEF_CLKLOOK(&clk_kpi, "w90p910-kpi", NULL),
+        DEF_CLKLOOK(&clk_wdt, "w90p910-wdt", NULL),
+        DEF_CLKLOOK(&clk_gdma, "w90p910-gdma", NULL),
+        DEF_CLKLOOK(&clk_adc, "w90p910-adc", NULL),
+        DEF_CLKLOOK(&clk_usi, "w90p910-usi", NULL),
+};
+
 /* Initial serial platform data */
 
 struct plat_serial8250_port w90p910_uart_data[] = {
@@ -77,8 +119,9 @@ void __init w90p910_map_io(struct map_desc *mach_desc, int mach_size)
 
 /*Init W90P910 clock*/
 
-void __init w90p910_init_clocks(int xtal)
+void __init w90p910_init_clocks(void)
 {
+        clks_register(w90p910_clkregs, ARRAY_SIZE(w90p910_clkregs));
 }
 
 static int __init w90p910_init_cpu(void)