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 bd02353d9c38cbe9e606617e9b0401bb7ef6306f..1d925d69fc3581505629578cc202549c8eb7c321 100644 (file)
--- 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 857fc883d704834b9c6f4132457d5e206b91b90f..8893479dc7e0262777e7fa612eef298a2958839b 100644 (file)
--- 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 a2ccfc84ee6e65cc37ad86347843e0bbf58ebac9..7b242a125acde14614c74b46316576ed3f57a1fa 100644 (file)
--- 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 0c22a6b237d7a73e8b10bd549001e19b9500d643..a866ee7280bb814ce0ce0063ba26b6f919f754c6 100644 (file)
--- 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 5738d143b736b3b129e7489f9fa0ad592eb6d786..fbe2f5ca699be86cd821ae29638280b02aeb2165 100644 (file)
--- 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 1bd266933e3b5606bc22a961443a7025881ac106..3d2fc16c68ae8dd967d262ab62d3dbbb7fe90979 100644 (file)
--- 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 5078d2264e470cbeb362d46fa40da0b2b933f4ed..6ef5468c31bdcc07f854d778c1fcfd9f6c682076 100644 (file)
--- 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 ff3b9186a42997219889bfe1b883d572b8f7fbc1..a7d36797cb3fca934fa46f70cf41623893792d3e 100644 (file)
--- 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 42a32324de173f991900371a1b3a757a143ee7d0..cc3290ef70d27c4d6b6fb366770a415266d25ef7 100644 (file)
--- 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 95d483a678298c6e1fde55a82ebec4d5ff796c09..3580de5b633969be447e184e1df1d7ffc22bc37d 100644 (file)
--- 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 3710e6577242830c6ba74d478ab44d2a1ffa615a..fb412559b8a1bf7c03e497d58b4daaa80ace19cd 100644 (file)
--- 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 b2798905e2182252722045744a83e23a562e6b58..74198af2a468277cdfcc178be60a5b98e32dee68 100644 (file)
--- 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 b27700c8bbd79d5841cc2d5f383ffe8a4dc7636d..30c204b93ce6ed7fd09298189c1c02315bff31f0 100644 (file)
--- 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 793fe0d10b459cc725d04de62789086759d4de0d..85dc226ecd85d44782000edd260843c6d0c8657b 100644 (file)
--- 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 193542fc56b79cd821632d8d2020a3aea0e9ba7b..5dfe994001a094ec21aac422752631ebd3c8b3bb 100644 (file)
--- 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 8d3e6d1b0d5dc39b8d1a3c17389c3b52fdd29a9b..2b5afd7297a0e7f07d2ca89097cecde8b6788f09 100644 (file)
--- 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 bb8be069c036c6b0212f2d16506f5fb0ccf2d4e6..3ccbcd00fec906712f0938c299b666fc2303c68f 100644 (file)
--- 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 c5551e20814bfcd777cc85c76c48019b88880b2a..25c376dc7ea04c30f63bb6188079f1c530217b07 100644 (file)
--- 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 a288b466f3fffde6e1f0950661fcafe26bb41e7c..d4e959acd6865898911cd489f8f3a446f5ea2ff6 100644 (file)
--- 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 e2145ebd56a1bb000568904570129307bf7e9117..ba26512a504af6e3f2da4fcef63b602c1c26bfb7 100644 (file)
--- 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 42ae7b953303b55f27fd7bc94cda52773a6b8346..05b003f3a94c6e78511fead8eadf40788e297306 100644 (file)
--- 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 41ca0c36cae464a94ae99aa4f8c8dc7c6b7df9af..34c07f86d0bfeb88547cb9af1104e3933605c165 100644 (file)
--- 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 30ac0bd697181f45a387e5eb4b1aa8c28b0cd42a..38b326fbe6c9e30d5071a9548c694cb5a361c2a9 100644 (file)
--- 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"