[ARM] Move asm/hardware/clock.h to linux/clk.h

This is needs to be visible to other architectures using the AMBA
bus and peripherals.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

authored by

Russell King and committed by

Russell King 20 years ago f8ce2547 de1d815f

+36 -38

34 changed files

expand all collapse all

arch

arm

mach-aaec2000

clock.c

mach-integrator

clock.c

mach-omap1

board-palmte.c

clock.c

serial.c

mach-omap2

clock.c

serial.c

timer-gp.c

mach-realview

clock.c

mach-s3c2410

clock.c

s3c2440-clock.c

s3c2440.c

time.c

mach-versatile

clock.c

plat-omap

clock.c

common.c

cpu-omap.c

gpio.c

mcbsp.c

ocpi.c

drivers

char

s3c2410-rtc.c

watchdog

s3c2410_wdt.c

i2c

busses

i2c-s3c2410.c

input

serio

ambakmi.c

mmc

mmci.c

mtd

nand

s3c2410.c

serial

amba-pl011.c

s3c2410.c

usb

host

ohci-omap.c

ohci-s3c2410.c

video

amba-clcd.c

s3c2410fb.c

include

asm-arm

arch-omap

system.h

linux

clk.h

+1 -1

arch/arm/mach-aaec2000/clock.c

reviewed

··· 15 15 #include <linux/errno.h> 16 16 #include <linux/err.h> 17 17 #include <linux/string.h> 18 18 + #include <linux/clk.h> 18 19 19 20 #include <asm/semaphore.h> 20 20 - #include <asm/hardware/clock.h> 21 21 22 22 #include "clock.h" 23 23

+1 -1

arch/arm/mach-integrator/clock.c

reviewed

··· 14 14 #include <linux/errno.h> 15 15 #include <linux/err.h> 16 16 #include <linux/string.h> 17 17 + #include <linux/clk.h> 17 18 18 19 #include <asm/semaphore.h> 19 19 - #include <asm/hardware/clock.h> 20 20 #include <asm/hardware/icst525.h> 21 21 22 22 #include "clock.h"

+1 -1

arch/arm/mach-omap1/board-palmte.c

reviewed

··· 19 19 #include <linux/init.h> 20 20 #include <linux/platform_device.h> 21 21 #include <linux/notifier.h> 22 22 + #include <linux/clk.h> 22 23 23 24 #include <asm/hardware.h> 24 25 #include <asm/mach-types.h> ··· 31 30 #include <asm/arch/usb.h> 32 31 #include <asm/arch/board.h> 33 32 #include <asm/arch/common.h> 34 34 - #include <asm/hardware/clock.h> 35 33 36 34 static void __init omap_generic_init_irq(void) 37 35 {

+1 -1

arch/arm/mach-omap1/clock.c

reviewed

··· 16 16 #include <linux/list.h> 17 17 #include <linux/errno.h> 18 18 #include <linux/err.h> 19 19 + #include <linux/clk.h> 19 20 20 21 #include <asm/io.h> 21 21 - #include <asm/hardware/clock.h> 22 22 23 23 #include <asm/arch/usb.h> 24 24 #include <asm/arch/clock.h>

+1 -1

arch/arm/mach-omap1/serial.c

reviewed

··· 17 17 #include <linux/tty.h> 18 18 #include <linux/serial_8250.h> 19 19 #include <linux/serial_reg.h> 20 20 + #include <linux/clk.h> 20 21 21 22 #include <asm/io.h> 22 23 #include <asm/mach-types.h> 23 23 - #include <asm/hardware/clock.h> 24 24 25 25 #include <asm/arch/board.h> 26 26 #include <asm/arch/mux.h>

+1 -1

arch/arm/mach-omap2/clock.c

reviewed

··· 22 22 #include <linux/list.h> 23 23 #include <linux/errno.h> 24 24 #include <linux/delay.h> 25 25 + #include <linux/clk.h> 25 26 26 27 #include <asm/io.h> 27 28 28 28 - #include <asm/hardware/clock.h> 29 29 #include <asm/arch/clock.h> 30 30 #include <asm/arch/sram.h> 31 31 #include <asm/arch/prcm.h>

+1 -1

arch/arm/mach-omap2/serial.c

reviewed

··· 16 16 #include <linux/init.h> 17 17 #include <linux/serial_8250.h> 18 18 #include <linux/serial_reg.h> 19 19 + #include <linux/clk.h> 19 20 20 21 #include <asm/io.h> 21 21 - #include <asm/hardware/clock.h> 22 22 23 23 #include <asm/arch/common.h> 24 24 #include <asm/arch/board.h>

+2 -1

arch/arm/mach-omap2/timer-gp.c

reviewed

··· 21 21 #include <linux/time.h> 22 22 #include <linux/interrupt.h> 23 23 #include <linux/err.h> 24 24 + #include <linux/clk.h> 25 25 + 24 26 #include <asm/mach/time.h> 25 27 #include <asm/delay.h> 26 28 #include <asm/io.h> 27 27 - #include <asm/hardware/clock.h> 28 29 29 30 #define OMAP2_GP_TIMER1_BASE 0x48028000 30 31 #define OMAP2_GP_TIMER2_BASE 0x4802a000

+1 -1

arch/arm/mach-realview/clock.c

reviewed

··· 13 13 #include <linux/list.h> 14 14 #include <linux/errno.h> 15 15 #include <linux/err.h> 16 16 + #include <linux/clk.h> 16 17 17 18 #include <asm/semaphore.h> 18 18 - #include <asm/hardware/clock.h> 19 19 #include <asm/hardware/icst307.h> 20 20 21 21 #include "clock.h"

+1 -2

arch/arm/mach-s3c2410/clock.c

reviewed

··· 34 34 #include <linux/err.h> 35 35 #include <linux/platform_device.h> 36 36 #include <linux/sysdev.h> 37 37 - 38 37 #include <linux/interrupt.h> 39 38 #include <linux/ioport.h> 39 39 + #include <linux/clk.h> 40 40 41 41 #include <asm/hardware.h> 42 42 #include <asm/atomic.h> 43 43 #include <asm/irq.h> 44 44 #include <asm/io.h> 45 45 46 46 - #include <asm/hardware/clock.h> 47 46 #include <asm/arch/regs-clock.h> 48 47 49 48 #include "clock.h"

+1 -2

arch/arm/mach-s3c2410/s3c2440-clock.c

reviewed

··· 29 29 #include <linux/err.h> 30 30 #include <linux/device.h> 31 31 #include <linux/sysdev.h> 32 32 - 33 32 #include <linux/interrupt.h> 34 33 #include <linux/ioport.h> 34 34 + #include <linux/clk.h> 35 35 36 36 #include <asm/hardware.h> 37 37 #include <asm/atomic.h> 38 38 #include <asm/irq.h> 39 39 #include <asm/io.h> 40 40 41 41 - #include <asm/hardware/clock.h> 42 41 #include <asm/arch/regs-clock.h> 43 42 44 43 #include "clock.h"

+1 -1

arch/arm/mach-s3c2410/s3c2440.c

reviewed

··· 28 28 #include <linux/init.h> 29 29 #include <linux/platform_device.h> 30 30 #include <linux/sysdev.h> 31 31 + #include <linux/clk.h> 31 32 32 33 #include <asm/mach/arch.h> 33 34 #include <asm/mach/map.h> ··· 37 36 #include <asm/hardware.h> 38 37 #include <asm/io.h> 39 38 #include <asm/irq.h> 40 40 - #include <asm/hardware/clock.h> 41 39 42 40 #include <asm/arch/regs-clock.h> 43 41 #include <asm/arch/regs-serial.h>

+1 -1

arch/arm/mach-s3c2410/time.c

reviewed

··· 24 24 #include <linux/init.h> 25 25 #include <linux/interrupt.h> 26 26 #include <linux/err.h> 27 27 + #include <linux/clk.h> 27 28 28 29 #include <asm/system.h> 29 30 #include <asm/leds.h> ··· 36 35 #include <asm/arch/regs-timer.h> 37 36 #include <asm/arch/regs-irq.h> 38 37 #include <asm/mach/time.h> 39 39 - #include <asm/hardware/clock.h> 40 38 41 39 #include "clock.h" 42 40 #include "cpu.h"

+1 -1

arch/arm/mach-versatile/clock.c

reviewed

+1 -1

arch/arm/plat-omap/clock.c

reviewed

··· 19 19 #include <linux/errno.h> 20 20 #include <linux/err.h> 21 21 #include <linux/string.h> 22 22 + #include <linux/clk.h> 22 23 23 24 #include <asm/io.h> 24 25 #include <asm/semaphore.h> 25 25 - #include <asm/hardware/clock.h> 26 26 27 27 #include <asm/arch/clock.h> 28 28

+1 -1

arch/arm/plat-omap/common.c

reviewed

··· 18 18 #include <linux/tty.h> 19 19 #include <linux/serial_8250.h> 20 20 #include <linux/serial_reg.h> 21 21 + #include <linux/clk.h> 21 22 22 23 #include <asm/hardware.h> 23 24 #include <asm/system.h> 24 25 #include <asm/pgtable.h> 25 26 #include <asm/mach/map.h> 26 26 - #include <asm/hardware/clock.h> 27 27 #include <asm/io.h> 28 28 #include <asm/setup.h> 29 29

+1 -2

arch/arm/plat-omap/cpu-omap.c

reviewed

··· 19 19 #include <linux/delay.h> 20 20 #include <linux/init.h> 21 21 #include <linux/err.h> 22 22 + #include <linux/clk.h> 22 23 23 24 #include <asm/hardware.h> 24 25 #include <asm/io.h> 25 26 #include <asm/system.h> 26 26 - 27 27 - #include <asm/hardware/clock.h> 28 27 29 28 /* TODO: Add support for SDRAM timing changes */ 30 29

+1 -1

arch/arm/plat-omap/gpio.c

reviewed

··· 19 19 #include <linux/ptrace.h> 20 20 #include <linux/sysdev.h> 21 21 #include <linux/err.h> 22 22 + #include <linux/clk.h> 22 23 23 24 #include <asm/hardware.h> 24 24 - #include <asm/hardware/clock.h> 25 25 #include <asm/irq.h> 26 26 #include <asm/arch/irqs.h> 27 27 #include <asm/arch/gpio.h>

+1 -2

arch/arm/plat-omap/mcbsp.c

reviewed

··· 19 19 #include <linux/completion.h> 20 20 #include <linux/interrupt.h> 21 21 #include <linux/err.h> 22 22 + #include <linux/clk.h> 22 23 23 24 #include <asm/delay.h> 24 25 #include <asm/io.h> ··· 30 29 #include <asm/arch/irqs.h> 31 30 #include <asm/arch/dsp_common.h> 32 31 #include <asm/arch/mcbsp.h> 33 33 - 34 34 - #include <asm/hardware/clock.h> 35 32 36 33 #ifdef CONFIG_MCBSP_DEBUG 37 34 #define DBG(x...) printk(x)

+1 -1

arch/arm/plat-omap/ocpi.c

reviewed

··· 31 31 #include <linux/init.h> 32 32 #include <linux/spinlock.h> 33 33 #include <linux/err.h> 34 34 + #include <linux/clk.h> 34 35 35 36 #include <asm/io.h> 36 36 - #include <asm/hardware/clock.h> 37 37 #include <asm/hardware.h> 38 38 39 39 #define OCPI_BASE 0xfffec320

+1 -1

drivers/char/s3c2410-rtc.c

reviewed

··· 24 24 #include <linux/interrupt.h> 25 25 #include <linux/rtc.h> 26 26 #include <linux/bcd.h> 27 27 + #include <linux/clk.h> 27 28 28 29 #include <asm/hardware.h> 29 30 #include <asm/uaccess.h> ··· 34 33 35 34 #include <asm/mach/time.h> 36 35 37 37 - #include <asm/hardware/clock.h> 38 36 #include <asm/arch/regs-rtc.h> 39 37 40 38 /* need this for the RTC_AF definitions */

+1 -1

drivers/char/watchdog/s3c2410_wdt.c

reviewed

··· 46 46 #include <linux/init.h> 47 47 #include <linux/platform_device.h> 48 48 #include <linux/interrupt.h> 49 49 + #include <linux/clk.h> 49 50 50 51 #include <asm/uaccess.h> 51 52 #include <asm/io.h> 52 53 53 54 #include <asm/arch/map.h> 54 54 - #include <asm/hardware/clock.h> 55 55 56 56 #undef S3C24XX_VA_WATCHDOG 57 57 #define S3C24XX_VA_WATCHDOG (0)

+1 -1

drivers/i2c/busses/i2c-s3c2410.c

reviewed

··· 34 34 #include <linux/errno.h> 35 35 #include <linux/err.h> 36 36 #include <linux/platform_device.h> 37 37 + #include <linux/clk.h> 37 38 38 39 #include <asm/hardware.h> 39 40 #include <asm/irq.h> 40 41 #include <asm/io.h> 41 42 42 42 - #include <asm/hardware/clock.h> 43 43 #include <asm/arch/regs-gpio.h> 44 44 #include <asm/arch/regs-iic.h> 45 45 #include <asm/arch/iic.h>

+1 -1

drivers/input/serio/ambakmi.c

reviewed

··· 21 21 #include <linux/err.h> 22 22 #include <linux/amba/bus.h> 23 23 #include <linux/amba/kmi.h> 24 24 + #include <linux/clk.h> 24 25 25 26 #include <asm/io.h> 26 27 #include <asm/irq.h> 27 27 - #include <asm/hardware/clock.h> 28 28 29 29 #define KMI_BASE (kmi->base) 30 30

+1 -1

drivers/mmc/mmci.c

reviewed

··· 20 20 #include <linux/mmc/host.h> 21 21 #include <linux/mmc/protocol.h> 22 22 #include <linux/amba/bus.h> 23 23 + #include <linux/clk.h> 23 24 24 25 #include <asm/div64.h> 25 26 #include <asm/io.h> 26 27 #include <asm/scatterlist.h> 27 28 #include <asm/sizes.h> 28 28 - #include <asm/hardware/clock.h> 29 29 #include <asm/mach/mmc.h> 30 30 31 31 #include "mmci.h"

+1 -1

drivers/mtd/nand/s3c2410.c

reviewed

··· 53 53 #include <linux/delay.h> 54 54 #include <linux/err.h> 55 55 #include <linux/slab.h> 56 56 + #include <linux/clk.h> 56 57 57 58 #include <linux/mtd/mtd.h> 58 59 #include <linux/mtd/nand.h> ··· 61 60 #include <linux/mtd/partitions.h> 62 61 63 62 #include <asm/io.h> 64 64 - #include <asm/hardware/clock.h> 65 63 66 64 #include <asm/arch/regs-nand.h> 67 65 #include <asm/arch/nand.h>

+1 -1

drivers/serial/amba-pl011.c

reviewed

··· 49 49 #include <linux/serial.h> 50 50 #include <linux/amba/bus.h> 51 51 #include <linux/amba/serial.h> 52 52 + #include <linux/clk.h> 52 53 53 54 #include <asm/io.h> 54 55 #include <asm/sizes.h> 55 55 - #include <asm/hardware/clock.h> 56 56 57 57 #define UART_NR 14 58 58

+1 -1

drivers/serial/s3c2410.c

reviewed

··· 72 72 #include <linux/serial_core.h> 73 73 #include <linux/serial.h> 74 74 #include <linux/delay.h> 75 75 + #include <linux/clk.h> 75 76 76 77 #include <asm/io.h> 77 78 #include <asm/irq.h> 78 79 79 80 #include <asm/hardware.h> 80 80 - #include <asm/hardware/clock.h> 81 81 82 82 #include <asm/arch/regs-serial.h> 83 83 #include <asm/arch/regs-gpio.h>

+1 -1

drivers/usb/host/ohci-omap.c

reviewed

··· 17 17 #include <linux/signal.h> /* SA_INTERRUPT */ 18 18 #include <linux/jiffies.h> 19 19 #include <linux/platform_device.h> 20 20 + #include <linux/clk.h> 20 21 21 22 #include <asm/hardware.h> 22 23 #include <asm/io.h> ··· 28 27 #include <asm/arch/gpio.h> 29 28 #include <asm/arch/fpga.h> 30 29 #include <asm/arch/usb.h> 31 31 - #include <asm/hardware/clock.h> 32 30 33 31 34 32 /* OMAP-1510 OHCI has its own MMU for DMA */

+1 -1

drivers/usb/host/ohci-s3c2410.c

reviewed

··· 20 20 */ 21 21 22 22 #include <linux/platform_device.h> 23 23 + #include <linux/clk.h> 23 24 24 25 #include <asm/hardware.h> 25 25 - #include <asm/hardware/clock.h> 26 26 #include <asm/arch/usb-control.h> 27 27 28 28 #define valid_port(idx) ((idx) == 1 || (idx) == 2)

+1 -1

drivers/video/amba-clcd.c

reviewed

··· 23 23 #include <linux/list.h> 24 24 #include <linux/amba/bus.h> 25 25 #include <linux/amba/clcd.h> 26 26 + #include <linux/clk.h> 26 27 27 28 #include <asm/sizes.h> 28 28 - #include <asm/hardware/clock.h> 29 29 30 30 #define to_clcd(info) container_of(info, struct clcd_fb, fb) 31 31

+1 -1

drivers/video/s3c2410fb.c

reviewed

··· 87 87 #include <linux/workqueue.h> 88 88 #include <linux/wait.h> 89 89 #include <linux/platform_device.h> 90 90 + #include <linux/clk.h> 90 91 91 92 #include <asm/io.h> 92 93 #include <asm/uaccess.h> ··· 97 96 #include <asm/arch/regs-lcd.h> 98 97 #include <asm/arch/regs-gpio.h> 99 98 #include <asm/arch/fb.h> 100 100 - #include <asm/hardware/clock.h> 101 99 102 100 #ifdef CONFIG_PM 103 101 #include <linux/pm.h>

+2 -1

include/asm-arm/arch-omap/system.h

reviewed

··· 5 5 #ifndef __ASM_ARCH_SYSTEM_H 6 6 #define __ASM_ARCH_SYSTEM_H 7 7 #include <linux/config.h> 8 8 + #include <linux/clk.h> 9 9 + 8 10 #include <asm/mach-types.h> 9 9 - #include <asm/hardware/clock.h> 10 11 #include <asm/hardware.h> 11 12 #include <asm/arch/prcm.h> 12 13

+1 -1

include/asm-arm/hardware/clock.h include/linux/clk.h

reviewed