From: Tony Lindgren <tony@atomide.com>
Date: Mon, 16 Jan 2006 22:30:08 +0000 (-0800)
Subject: ARM: OMAP: Replace clock.h with clk.h
X-Git-Tag: v2.6.16-omap1~135
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=517df76f9295ac1865494476e8b531c65232dc5a;p=linux-2.6-omap-h63xx.git

ARM: OMAP: Replace clock.h with clk.h

Replace clock.h with clk.h
---

diff --git a/arch/arm/mach-omap2/memory.c b/arch/arm/mach-omap2/memory.c
index bd02353d9c3..1d925d69fc3 100644
--- a/arch/arm/mach-omap2/memory.c
+++ b/arch/arm/mach-omap2/memory.c
@@ -21,10 +21,10 @@
 #include <linux/list.h>
 #include <linux/errno.h>
 #include <linux/delay.h>
+#include <linux/clk.h>
 
 #include <asm/io.h>
 
-#include <asm/hardware/clock.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/sram.h>
 
diff --git a/arch/arm/mach-omap2/prcm.c b/arch/arm/mach-omap2/prcm.c
index 857fc883d70..8893479dc7e 100644
--- a/arch/arm/mach-omap2/prcm.c
+++ b/arch/arm/mach-omap2/prcm.c
@@ -16,7 +16,7 @@
 #include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
-#include <asm/hardware/clock.h>
+#include <linux/clk.h>
 
 #include "prcm-regs.h"
 
diff --git a/arch/arm/plat-omap/clock.c b/arch/arm/plat-omap/clock.c
index a2ccfc84ee6..7b242a125ac 100644
--- a/arch/arm/plat-omap/clock.c
+++ b/arch/arm/plat-omap/clock.c
@@ -34,7 +34,7 @@ DEFINE_SPINLOCK(clockfw_lock);
 static struct clk_functions *arch_clock;
 
 /*-------------------------------------------------------------------------
- * Standard clock functions defined in asm/hardware/clock.h
+ * Standard clock functions defined in include/linux/clk.h
  *-------------------------------------------------------------------------*/
 
 struct clk * clk_get(struct device *dev, const char *id)
@@ -113,7 +113,7 @@ void clk_put(struct clk *clk)
 EXPORT_SYMBOL(clk_put);
 
 /*-------------------------------------------------------------------------
- * Optional clock functions defined in asm/hardware/clock.h
+ * Optional clock functions defined in include/linux/clk.h
  *-------------------------------------------------------------------------*/
 
 long clk_round_rate(struct clk *clk, unsigned long rate)
diff --git a/arch/arm/plat-omap/dsp/dsp_common.c b/arch/arm/plat-omap/dsp/dsp_common.c
index 0c22a6b237d..a866ee7280b 100644
--- a/arch/arm/plat-omap/dsp/dsp_common.c
+++ b/arch/arm/plat-omap/dsp/dsp_common.c
@@ -30,12 +30,12 @@
 #include <linux/sched.h>
 #include <linux/delay.h>
 #include <linux/mm.h>
+#include <linux/clk.h>
 #include <asm/io.h>
 #include <asm/tlbflush.h>
 #include <asm/irq.h>
 #include <asm/arch/dsp.h>
 #include <asm/arch/tc.h>
-#include <asm/hardware/clock.h>
 #include "dsp_common.h"
 
 struct clk *dsp_ck_handle;
diff --git a/arch/arm/plat-omap/dsp/dsp_ctl.c b/arch/arm/plat-omap/dsp/dsp_ctl.c
index 5738d143b73..fbe2f5ca699 100644
--- a/arch/arm/plat-omap/dsp/dsp_ctl.c
+++ b/arch/arm/plat-omap/dsp/dsp_ctl.c
@@ -34,10 +34,10 @@
 #include <linux/sched.h>
 #include <linux/delay.h>
 #include <linux/platform_device.h>
+#include <linux/clk.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
 #include <asm/ioctls.h>
-#include <asm/hardware/clock.h>
 #include <asm/arch/dsp.h>
 #include "hardware_dsp.h"
 #include "dsp.h"
diff --git a/arch/arm/plat-omap/dsp/dsp_mem.c b/arch/arm/plat-omap/dsp/dsp_mem.c
index 1bd266933e3..3d2fc16c68a 100644
--- a/arch/arm/plat-omap/dsp/dsp_mem.c
+++ b/arch/arm/plat-omap/dsp/dsp_mem.c
@@ -34,13 +34,13 @@
 #include <linux/interrupt.h>
 #include <linux/delay.h>
 #include <linux/platform_device.h>
+#include <linux/clk.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
 #include <asm/ioctls.h>
 #include <asm/irq.h>
 #include <asm/pgalloc.h>
 #include <asm/pgtable.h>
-#include <asm/hardware/clock.h>
 #include <asm/arch/tc.h>
 #include <asm/arch/dsp.h>
 #include <asm/arch/dsp_common.h>
diff --git a/arch/arm/plat-omap/timer32k.c b/arch/arm/plat-omap/timer32k.c
index 5078d2264e4..6ef5468c31b 100644
--- a/arch/arm/plat-omap/timer32k.c
+++ b/arch/arm/plat-omap/timer32k.c
@@ -41,6 +41,7 @@
 #include <linux/sched.h>
 #include <linux/spinlock.h>
 #include <linux/err.h>
+#include <linux/clk.h>
 
 #include <asm/system.h>
 #include <asm/hardware.h>
@@ -49,7 +50,6 @@
 #include <asm/irq.h>
 #include <asm/mach/irq.h>
 #include <asm/mach/time.h>
-#include <asm/hardware/clock.h>
 
 struct sys_timer omap_timer;
 
diff --git a/drivers/cbus/tahvo-usb.c b/drivers/cbus/tahvo-usb.c
index ff3b9186a42..a7d36797cb3 100644
--- a/drivers/cbus/tahvo-usb.c
+++ b/drivers/cbus/tahvo-usb.c
@@ -37,11 +37,11 @@
 #include <linux/i2c.h>
 #include <linux/workqueue.h>
 #include <linux/kobject_uevent.h>
+#include <linux/clk.h>
 
 #include <asm/irq.h>
 #include <asm/semaphore.h>
 #include <asm/arch/usb.h>
-#include <asm/hardware/clock.h>
 
 #include "cbus.h"
 #include "tahvo.h"
diff --git a/drivers/char/omap-rng.c b/drivers/char/omap-rng.c
index 42a32324de1..cc3290ef70d 100644
--- a/drivers/char/omap-rng.c
+++ b/drivers/char/omap-rng.c
@@ -16,9 +16,9 @@
 #include <linux/init.h>
 #include <linux/random.h>
 #include <linux/err.h>
+#include <linux/clk.h>
 
 #include <asm/io.h>
-#include <asm/hardware/clock.h>
 
 #if defined (CONFIG_ARCH_OMAP16XX)
 #define RNG_BASE		0xfffe5000
diff --git a/drivers/char/watchdog/omap_wdt.c b/drivers/char/watchdog/omap_wdt.c
index 95d483a6782..3580de5b633 100644
--- a/drivers/char/watchdog/omap_wdt.c
+++ b/drivers/char/watchdog/omap_wdt.c
@@ -40,12 +40,12 @@
 #include <linux/err.h>
 #include <linux/platform_device.h>
 #include <linux/moduleparam.h>
+#include <linux/clk.h>
 
 #include <asm/io.h>
 #include <asm/uaccess.h>
 #include <asm/hardware.h>
 #include <asm/bitops.h>
-#include <asm/hardware/clock.h>
 
 #include <asm/arch/prcm.h>
 
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index 3710e657724..fb412559b8a 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -45,9 +45,9 @@
 #include <linux/interrupt.h>
 #include <linux/completion.h>
 #include <linux/platform_device.h>
+#include <linux/clk.h>
 
 #include <asm/io.h>
-#include <asm/hardware/clock.h>
 
 /* ----- global defines ----------------------------------------------- */
 static const char driver_name[] = "i2c_omap";
diff --git a/drivers/media/video/omap/omap16xxcam.c b/drivers/media/video/omap/omap16xxcam.c
index b2798905e21..74198af2a46 100644
--- a/drivers/media/video/omap/omap16xxcam.c
+++ b/drivers/media/video/omap/omap16xxcam.c
@@ -27,6 +27,7 @@
 #include <linux/device.h>
 #include <linux/dma-mapping.h>
 #include <linux/interrupt.h>
+#include <linux/clk.h>
 
 #include <asm/arch/irqs.h>
 #include <asm/arch/dma.h>
@@ -34,7 +35,6 @@
 #include <asm/io.h>
 #include <asm/scatterlist.h>
 #include <asm/mach-types.h>
-#include <asm/hardware/clock.h>
 
 #include "omap16xxcam.h"
 #include "camera_hw_if.h"
diff --git a/drivers/mmc/omap.c b/drivers/mmc/omap.c
index b27700c8bbd..30c204b93ce 100644
--- a/drivers/mmc/omap.c
+++ b/drivers/mmc/omap.c
@@ -31,6 +31,7 @@
 #include <linux/mmc/host.h>
 #include <linux/mmc/protocol.h>
 #include <linux/mmc/card.h>
+#include <linux/clk.h>
 
 #include <asm/io.h>
 #include <asm/irq.h>
@@ -45,8 +46,6 @@
 #include <asm/arch/tps65010.h>
 #include <asm/arch/menelaus.h>
 
-#include <asm/hardware/clock.h>
-
 #include "omap.h"
 
 #define DRIVER_NAME "mmci-omap"
diff --git a/drivers/mtd/nand/omap-hw.c b/drivers/mtd/nand/omap-hw.c
index 793fe0d10b4..85dc226ecd8 100644
--- a/drivers/mtd/nand/omap-hw.c
+++ b/drivers/mtd/nand/omap-hw.c
@@ -42,12 +42,12 @@
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/dma-mapping.h>
+#include <linux/clk.h>
 
 #include <asm/io.h>
 
 #include <asm/arch/board.h>
 #include <asm/arch/dma.h>
-#include <asm/hardware/clock.h>
 
 #define NAND_BASE		0xfffbcc00
 #define NND_REVISION		0x00
diff --git a/drivers/ssi/omap-tsc2101.c b/drivers/ssi/omap-tsc2101.c
index 193542fc56b..5dfe994001a 100644
--- a/drivers/ssi/omap-tsc2101.c
+++ b/drivers/ssi/omap-tsc2101.c
@@ -23,13 +23,13 @@
 #include <linux/sched.h>
 #include <linux/errno.h>
 #include <linux/delay.h>
+#include <linux/clk.h>
 
 #include <asm/system.h>
 #include <asm/irq.h>
 #include <asm/io.h>
 #include <asm/mach-types.h>
 #include <asm/hardware.h>
-#include <asm/hardware/clock.h>
 
 #include <asm/arch/mux.h>
 #include <asm/arch/io.h>
diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/omap_udc.c
index 8d3e6d1b0d5..2b5afd7297a 100644
--- a/drivers/usb/gadget/omap_udc.c
+++ b/drivers/usb/gadget/omap_udc.c
@@ -43,6 +43,7 @@
 #include <linux/usb_gadget.h>
 #include <linux/usb_otg.h>
 #include <linux/dma-mapping.h>
+#include <linux/clk.h>
 
 #include <asm/byteorder.h>
 #include <asm/io.h>
@@ -50,7 +51,6 @@
 #include <asm/system.h>
 #include <asm/unaligned.h>
 #include <asm/mach-types.h>
-#include <asm/hardware/clock.h>
 
 #include <asm/arch/dma.h>
 #include <asm/arch/usb.h>
diff --git a/drivers/video/omap/dispc.c b/drivers/video/omap/dispc.c
index bb8be069c03..3ccbcd00fec 100644
--- a/drivers/video/omap/dispc.c
+++ b/drivers/video/omap/dispc.c
@@ -23,13 +23,12 @@
 
 #include <linux/kernel.h>
 #include <linux/dma-mapping.h>
+#include <linux/clk.h>
 
 #include <asm/io.h>
 
 #include <asm/arch/omapfb.h>
 
-#include <asm/hardware/clock.h>
-
 #include "dispc.h"
 
 /* #define OMAPFB_DBG	2 */
diff --git a/drivers/video/omap/lcdc.c b/drivers/video/omap/lcdc.c
index c5551e20814..25c376dc7ea 100644
--- a/drivers/video/omap/lcdc.c
+++ b/drivers/video/omap/lcdc.c
@@ -30,12 +30,12 @@
 #include <linux/mm.h>
 #include <linux/fb.h>
 #include <linux/dma-mapping.h>
+#include <linux/clk.h>
 
 #include <asm/arch/dma.h>
 #include <asm/arch/omapfb.h>
 
 #include <asm/mach-types.h>
-#include <asm/hardware/clock.h>
 
 /* #define OMAPFB_DBG 2 */
 
diff --git a/drivers/video/omap/rfbi.c b/drivers/video/omap/rfbi.c
index a288b466f3f..d4e959acd68 100644
--- a/drivers/video/omap/rfbi.c
+++ b/drivers/video/omap/rfbi.c
@@ -27,9 +27,9 @@
 #include <linux/i2c.h>
 #include <linux/err.h>
 #include <linux/interrupt.h>
+#include <linux/clk.h>
 
 #include <asm/io.h>
-#include <asm/hardware/clock.h>
 
 #include <asm/arch/omapfb.h>
 
diff --git a/drivers/video/omap/sossi.c b/drivers/video/omap/sossi.c
index e2145ebd56a..ba26512a504 100644
--- a/drivers/video/omap/sossi.c
+++ b/drivers/video/omap/sossi.c
@@ -24,7 +24,8 @@
 #include <linux/config.h>
 #include <linux/module.h>
 #include <linux/mm.h>
-#include <asm/hardware/clock.h>
+#include <linux/clk.h>
+
 #include <asm/io.h>
 
 #include "sossi.h"
diff --git a/include/asm-arm/arch-omap/pm.h b/include/asm-arm/arch-omap/pm.h
index 42ae7b95330..05b003f3a94 100644
--- a/include/asm-arm/arch-omap/pm.h
+++ b/include/asm-arm/arch-omap/pm.h
@@ -113,7 +113,7 @@
 
 #ifndef __ASSEMBLER__
 
-#include <asm/hardware/clock.h>
+#include <linux/clk.h>
 
 extern void prevent_idle_sleep(void);
 extern void allow_idle_sleep(void);
diff --git a/sound/arm/omap-aic23.c b/sound/arm/omap-aic23.c
index 41ca0c36cae..34c07f86d0b 100644
--- a/sound/arm/omap-aic23.c
+++ b/sound/arm/omap-aic23.c
@@ -48,6 +48,7 @@
 #include <linux/ioctl.h>
 #include <linux/delay.h>
 #include <linux/slab.h>
+#include <linux/clk.h>
 
 #ifdef CONFIG_PM
 #include <linux/pm.h>
@@ -57,7 +58,6 @@
 #include <asm/mach-types.h>
 #include <asm/arch/dma.h>
 #include <asm/arch/aic23.h>
-#include <asm/hardware/clock.h>
 #include <asm/arch/mcbsp.h>
 
 #include <sound/core.h>
diff --git a/sound/oss/omap-audio-aic23.c b/sound/oss/omap-audio-aic23.c
index 30ac0bd6971..38b326fbe6c 100644
--- a/sound/oss/omap-audio-aic23.c
+++ b/sound/oss/omap-audio-aic23.c
@@ -37,6 +37,7 @@
 #include <linux/errno.h>
 #include <linux/sound.h>
 #include <linux/soundcard.h>
+#include <linux/clk.h>
 
 #include <asm/uaccess.h>
 #include <asm/hardware.h>
@@ -47,8 +48,6 @@
 #include <asm/arch/fpga.h>
 #include <asm/arch/aic23.h>
 
-#include <asm/hardware/clock.h>
-
 #include "omap-audio.h"
 #include "omap-audio-dma-intfc.h"