diff options
| author | Paul Walmsley <paul@pwsan.com> | 2012-09-27 18:33:35 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-10-19 01:23:30 +0200 |
| commit | e10dd62ffcb2953f80a4ea6ac53cb489ebfe0a79 (patch) | |
| tree | a9b1451b17036bc8fe093c572862321ae8ba9b5e /arch/arm/mach-omap1 | |
| parent | ARM: OMAP: remove plat/clock.h (diff) | |
| download | linux-e10dd62ffcb2953f80a4ea6ac53cb489ebfe0a79.tar.xz linux-e10dd62ffcb2953f80a4ea6ac53cb489ebfe0a79.zip | |
ARM: OMAP: clock: split plat/clkdev_omap.h into OMAP1/2 files
To facilitate the ARM single image work, split
arch/arm/plat-omap/include/plat/clkdev_omap.h into the
arch/arm/mach-omap1/clock.h and arch/arm/mach-omap2/clock.h files.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap1')
| -rw-r--r-- | arch/arm/mach-omap1/clock.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-omap1/clock.h | 25 | ||||
| -rw-r--r-- | arch/arm/mach-omap1/clock_data.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-omap1/opp_data.c | 2 |
4 files changed, 26 insertions, 3 deletions
diff --git a/arch/arm/mach-omap1/clock.c b/arch/arm/mach-omap1/clock.c index 306772c1c23c..4c895ef1d40f 100644 --- a/arch/arm/mach-omap1/clock.c +++ b/arch/arm/mach-omap1/clock.c @@ -24,7 +24,6 @@ #include <plat/cpu.h> #include <plat/usb.h> -#include <plat/clkdev_omap.h> #include <mach/hardware.h> diff --git a/arch/arm/mach-omap1/clock.h b/arch/arm/mach-omap1/clock.h index 155ddd922c17..1e4918a3a5ee 100644 --- a/arch/arm/mach-omap1/clock.h +++ b/arch/arm/mach-omap1/clock.h @@ -16,9 +16,34 @@ #include <linux/clk.h> #include <linux/list.h> +#include <linux/clkdev.h> + struct module; struct clk; +struct omap_clk { + u16 cpu; + struct clk_lookup lk; +}; + +#define CLK(dev, con, ck, cp) \ + { \ + .cpu = cp, \ + .lk = { \ + .dev_id = dev, \ + .con_id = con, \ + .clk = ck, \ + }, \ + } + +/* Platform flags for the clkdev-OMAP integration code */ +#define CK_310 (1 << 0) +#define CK_7XX (1 << 1) /* 7xx, 850 */ +#define CK_1510 (1 << 2) +#define CK_16XX (1 << 3) /* 16xx, 17xx, 5912 */ +#define CK_1710 (1 << 4) /* 1710 extra for rate selection */ + + /* Temporary, needed during the common clock framework conversion */ #define __clk_get_name(clk) (clk->name) #define __clk_get_parent(clk) (clk->parent) diff --git a/arch/arm/mach-omap1/clock_data.c b/arch/arm/mach-omap1/clock_data.c index 8f4ae755010d..c78fb913ee64 100644 --- a/arch/arm/mach-omap1/clock_data.c +++ b/arch/arm/mach-omap1/clock_data.c @@ -23,7 +23,6 @@ #include <asm/mach-types.h> /* for machine_is_* */ #include <plat/cpu.h> -#include <plat/clkdev_omap.h> #include <mach/hardware.h> #include <mach/usb.h> /* for OTG_BASE */ diff --git a/arch/arm/mach-omap1/opp_data.c b/arch/arm/mach-omap1/opp_data.c index 9cd4ddb51397..8dcebe6d8882 100644 --- a/arch/arm/mach-omap1/opp_data.c +++ b/arch/arm/mach-omap1/opp_data.c @@ -10,7 +10,7 @@ * published by the Free Software Foundation. */ -#include <plat/clkdev_omap.h> +#include "clock.h" #include "opp.h" /*------------------------------------------------------------------------- |