diff options
author | Paul Walmsley <paul@pwsan.com> | 2012-09-27 12:33:35 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-10-18 19:23:30 -0400 |
commit | e10dd62ffcb2953f80a4ea6ac53cb489ebfe0a79 (patch) | |
tree | a9b1451b17036bc8fe093c572862321ae8ba9b5e /arch | |
parent | a135eaae524acba1509a3b19c97fae556e4da7cd (diff) |
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')
-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 | ||||
-rw-r--r-- | arch/arm/mach-omap2/clock.h | 33 | ||||
-rw-r--r-- | arch/arm/mach-omap2/clock2420_data.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-omap2/clock2430_data.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-omap2/clock33xx_data.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-omap2/clock3xxx_data.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-omap2/clock44xx_data.c | 2 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/plat/clkdev_omap.h | 51 |
11 files changed, 59 insertions, 63 deletions
diff --git a/arch/arm/mach-omap1/clock.c b/arch/arm/mach-omap1/clock.c index 306772c1c23..4c895ef1d40 100644 --- a/arch/arm/mach-omap1/clock.c +++ b/arch/arm/mach-omap1/clock.c | |||
@@ -24,7 +24,6 @@ | |||
24 | 24 | ||
25 | #include <plat/cpu.h> | 25 | #include <plat/cpu.h> |
26 | #include <plat/usb.h> | 26 | #include <plat/usb.h> |
27 | #include <plat/clkdev_omap.h> | ||
28 | 27 | ||
29 | #include <mach/hardware.h> | 28 | #include <mach/hardware.h> |
30 | 29 | ||
diff --git a/arch/arm/mach-omap1/clock.h b/arch/arm/mach-omap1/clock.h index 155ddd922c1..1e4918a3a5e 100644 --- a/arch/arm/mach-omap1/clock.h +++ b/arch/arm/mach-omap1/clock.h | |||
@@ -16,9 +16,34 @@ | |||
16 | #include <linux/clk.h> | 16 | #include <linux/clk.h> |
17 | #include <linux/list.h> | 17 | #include <linux/list.h> |
18 | 18 | ||
19 | #include <linux/clkdev.h> | ||
20 | |||
19 | struct module; | 21 | struct module; |
20 | struct clk; | 22 | struct clk; |
21 | 23 | ||
24 | struct omap_clk { | ||
25 | u16 cpu; | ||
26 | struct clk_lookup lk; | ||
27 | }; | ||
28 | |||
29 | #define CLK(dev, con, ck, cp) \ | ||
30 | { \ | ||
31 | .cpu = cp, \ | ||
32 | .lk = { \ | ||
33 | .dev_id = dev, \ | ||
34 | .con_id = con, \ | ||
35 | .clk = ck, \ | ||
36 | }, \ | ||
37 | } | ||
38 | |||
39 | /* Platform flags for the clkdev-OMAP integration code */ | ||
40 | #define CK_310 (1 << 0) | ||
41 | #define CK_7XX (1 << 1) /* 7xx, 850 */ | ||
42 | #define CK_1510 (1 << 2) | ||
43 | #define CK_16XX (1 << 3) /* 16xx, 17xx, 5912 */ | ||
44 | #define CK_1710 (1 << 4) /* 1710 extra for rate selection */ | ||
45 | |||
46 | |||
22 | /* Temporary, needed during the common clock framework conversion */ | 47 | /* Temporary, needed during the common clock framework conversion */ |
23 | #define __clk_get_name(clk) (clk->name) | 48 | #define __clk_get_name(clk) (clk->name) |
24 | #define __clk_get_parent(clk) (clk->parent) | 49 | #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 8f4ae755010..c78fb913ee6 100644 --- a/arch/arm/mach-omap1/clock_data.c +++ b/arch/arm/mach-omap1/clock_data.c | |||
@@ -23,7 +23,6 @@ | |||
23 | #include <asm/mach-types.h> /* for machine_is_* */ | 23 | #include <asm/mach-types.h> /* for machine_is_* */ |
24 | 24 | ||
25 | #include <plat/cpu.h> | 25 | #include <plat/cpu.h> |
26 | #include <plat/clkdev_omap.h> | ||
27 | 26 | ||
28 | #include <mach/hardware.h> | 27 | #include <mach/hardware.h> |
29 | #include <mach/usb.h> /* for OTG_BASE */ | 28 | #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 9cd4ddb5139..8dcebe6d888 100644 --- a/arch/arm/mach-omap1/opp_data.c +++ b/arch/arm/mach-omap1/opp_data.c | |||
@@ -10,7 +10,7 @@ | |||
10 | * published by the Free Software Foundation. | 10 | * published by the Free Software Foundation. |
11 | */ | 11 | */ |
12 | 12 | ||
13 | #include <plat/clkdev_omap.h> | 13 | #include "clock.h" |
14 | #include "opp.h" | 14 | #include "opp.h" |
15 | 15 | ||
16 | /*------------------------------------------------------------------------- | 16 | /*------------------------------------------------------------------------- |
diff --git a/arch/arm/mach-omap2/clock.h b/arch/arm/mach-omap2/clock.h index c3bf8c2e431..cfba1ffe5cc 100644 --- a/arch/arm/mach-omap2/clock.h +++ b/arch/arm/mach-omap2/clock.h | |||
@@ -19,6 +19,39 @@ | |||
19 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
20 | #include <linux/list.h> | 20 | #include <linux/list.h> |
21 | 21 | ||
22 | #include <linux/clkdev.h> | ||
23 | |||
24 | struct omap_clk { | ||
25 | u16 cpu; | ||
26 | struct clk_lookup lk; | ||
27 | }; | ||
28 | |||
29 | #define CLK(dev, con, ck, cp) \ | ||
30 | { \ | ||
31 | .cpu = cp, \ | ||
32 | .lk = { \ | ||
33 | .dev_id = dev, \ | ||
34 | .con_id = con, \ | ||
35 | .clk = ck, \ | ||
36 | }, \ | ||
37 | } | ||
38 | |||
39 | /* Platform flags for the clkdev-OMAP integration code */ | ||
40 | #define CK_242X (1 << 0) | ||
41 | #define CK_243X (1 << 1) /* 243x, 253x */ | ||
42 | #define CK_3430ES1 (1 << 2) /* 34xxES1 only */ | ||
43 | #define CK_3430ES2PLUS (1 << 3) /* 34xxES2, ES3, non-Sitara 35xx only */ | ||
44 | #define CK_AM35XX (1 << 4) /* Sitara AM35xx */ | ||
45 | #define CK_36XX (1 << 5) /* 36xx/37xx-specific clocks */ | ||
46 | #define CK_443X (1 << 6) | ||
47 | #define CK_TI816X (1 << 7) | ||
48 | #define CK_446X (1 << 8) | ||
49 | #define CK_AM33XX (1 << 9) /* AM33xx specific clocks */ | ||
50 | |||
51 | |||
52 | #define CK_34XX (CK_3430ES1 | CK_3430ES2PLUS) | ||
53 | #define CK_3XXX (CK_34XX | CK_AM35XX | CK_36XX) | ||
54 | |||
22 | struct module; | 55 | struct module; |
23 | struct clk; | 56 | struct clk; |
24 | struct clockdomain; | 57 | struct clockdomain; |
diff --git a/arch/arm/mach-omap2/clock2420_data.c b/arch/arm/mach-omap2/clock2420_data.c index 5be7405f232..ff47a6c2611 100644 --- a/arch/arm/mach-omap2/clock2420_data.c +++ b/arch/arm/mach-omap2/clock2420_data.c | |||
@@ -18,8 +18,6 @@ | |||
18 | #include <linux/clk.h> | 18 | #include <linux/clk.h> |
19 | #include <linux/list.h> | 19 | #include <linux/list.h> |
20 | 20 | ||
21 | #include <plat/clkdev_omap.h> | ||
22 | |||
23 | #include "soc.h" | 21 | #include "soc.h" |
24 | #include "iomap.h" | 22 | #include "iomap.h" |
25 | #include "clock.h" | 23 | #include "clock.h" |
diff --git a/arch/arm/mach-omap2/clock2430_data.c b/arch/arm/mach-omap2/clock2430_data.c index 17f110de88e..cab8e9c52d6 100644 --- a/arch/arm/mach-omap2/clock2430_data.c +++ b/arch/arm/mach-omap2/clock2430_data.c | |||
@@ -17,8 +17,6 @@ | |||
17 | #include <linux/clk.h> | 17 | #include <linux/clk.h> |
18 | #include <linux/list.h> | 18 | #include <linux/list.h> |
19 | 19 | ||
20 | #include <plat/clkdev_omap.h> | ||
21 | |||
22 | #include "soc.h" | 20 | #include "soc.h" |
23 | #include "iomap.h" | 21 | #include "iomap.h" |
24 | #include "clock.h" | 22 | #include "clock.h" |
diff --git a/arch/arm/mach-omap2/clock33xx_data.c b/arch/arm/mach-omap2/clock33xx_data.c index 3491b1769d4..26b06a90820 100644 --- a/arch/arm/mach-omap2/clock33xx_data.c +++ b/arch/arm/mach-omap2/clock33xx_data.c | |||
@@ -17,7 +17,6 @@ | |||
17 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
18 | #include <linux/list.h> | 18 | #include <linux/list.h> |
19 | #include <linux/clk.h> | 19 | #include <linux/clk.h> |
20 | #include <plat/clkdev_omap.h> | ||
21 | 20 | ||
22 | #include "am33xx.h" | 21 | #include "am33xx.h" |
23 | #include "iomap.h" | 22 | #include "iomap.h" |
diff --git a/arch/arm/mach-omap2/clock3xxx_data.c b/arch/arm/mach-omap2/clock3xxx_data.c index e75d0c8f830..a02d158568e 100644 --- a/arch/arm/mach-omap2/clock3xxx_data.c +++ b/arch/arm/mach-omap2/clock3xxx_data.c | |||
@@ -21,8 +21,6 @@ | |||
21 | #include <linux/list.h> | 21 | #include <linux/list.h> |
22 | #include <linux/io.h> | 22 | #include <linux/io.h> |
23 | 23 | ||
24 | #include <plat/clkdev_omap.h> | ||
25 | |||
26 | #include "soc.h" | 24 | #include "soc.h" |
27 | #include "iomap.h" | 25 | #include "iomap.h" |
28 | #include "clock.h" | 26 | #include "clock.h" |
diff --git a/arch/arm/mach-omap2/clock44xx_data.c b/arch/arm/mach-omap2/clock44xx_data.c index c2450a64736..a66eeae3bc5 100644 --- a/arch/arm/mach-omap2/clock44xx_data.c +++ b/arch/arm/mach-omap2/clock44xx_data.c | |||
@@ -28,8 +28,6 @@ | |||
28 | #include <linux/clk.h> | 28 | #include <linux/clk.h> |
29 | #include <linux/io.h> | 29 | #include <linux/io.h> |
30 | 30 | ||
31 | #include <plat/clkdev_omap.h> | ||
32 | |||
33 | #include "soc.h" | 31 | #include "soc.h" |
34 | #include "iomap.h" | 32 | #include "iomap.h" |
35 | #include "clock.h" | 33 | #include "clock.h" |
diff --git a/arch/arm/plat-omap/include/plat/clkdev_omap.h b/arch/arm/plat-omap/include/plat/clkdev_omap.h deleted file mode 100644 index 025d85a3ee8..00000000000 --- a/arch/arm/plat-omap/include/plat/clkdev_omap.h +++ /dev/null | |||
@@ -1,51 +0,0 @@ | |||
1 | /* | ||
2 | * clkdev <-> OMAP integration | ||
3 | * | ||
4 | * Russell King <linux@arm.linux.org.uk> | ||
5 | * | ||
6 | */ | ||
7 | |||
8 | #ifndef __ARCH_ARM_PLAT_OMAP_INCLUDE_PLAT_CLKDEV_OMAP_H | ||
9 | #define __ARCH_ARM_PLAT_OMAP_INCLUDE_PLAT_CLKDEV_OMAP_H | ||
10 | |||
11 | #include <linux/clkdev.h> | ||
12 | |||
13 | struct omap_clk { | ||
14 | u16 cpu; | ||
15 | struct clk_lookup lk; | ||
16 | }; | ||
17 | |||
18 | #define CLK(dev, con, ck, cp) \ | ||
19 | { \ | ||
20 | .cpu = cp, \ | ||
21 | .lk = { \ | ||
22 | .dev_id = dev, \ | ||
23 | .con_id = con, \ | ||
24 | .clk = ck, \ | ||
25 | }, \ | ||
26 | } | ||
27 | |||
28 | /* Platform flags for the clkdev-OMAP integration code */ | ||
29 | #define CK_310 (1 << 0) | ||
30 | #define CK_7XX (1 << 1) /* 7xx, 850 */ | ||
31 | #define CK_1510 (1 << 2) | ||
32 | #define CK_16XX (1 << 3) /* 16xx, 17xx, 5912 */ | ||
33 | #define CK_242X (1 << 4) | ||
34 | #define CK_243X (1 << 5) /* 243x, 253x */ | ||
35 | #define CK_3430ES1 (1 << 6) /* 34xxES1 only */ | ||
36 | #define CK_3430ES2PLUS (1 << 7) /* 34xxES2, ES3, non-Sitara 35xx only */ | ||
37 | #define CK_AM35XX (1 << 9) /* Sitara AM35xx */ | ||
38 | #define CK_36XX (1 << 10) /* 36xx/37xx-specific clocks */ | ||
39 | #define CK_443X (1 << 11) | ||
40 | #define CK_TI816X (1 << 12) | ||
41 | #define CK_446X (1 << 13) | ||
42 | #define CK_AM33XX (1 << 14) /* AM33xx specific clocks */ | ||
43 | #define CK_1710 (1 << 15) /* 1710 extra for rate selection */ | ||
44 | |||
45 | |||
46 | #define CK_34XX (CK_3430ES1 | CK_3430ES2PLUS) | ||
47 | #define CK_3XXX (CK_34XX | CK_AM35XX | CK_36XX) | ||
48 | |||
49 | |||
50 | #endif | ||
51 | |||