xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ARM: OMAP: clock: split plat/clkdev_omap.h into OMAP1/2 files

Browse Source 
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>
This commit is contained in:
Paul Walmsley
2012-09-27 10:33:35 -06:00
committed by Tony Lindgren
parent a135eaae52
commit e10dd62ffc
11 changed files with 59 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/mach-omap1/clock.c
View File

@@ -24,7 +24,6 @@
#include <plat/cpu.h> #include <plat/cpu.h>
#include <plat/usb.h> #include <plat/usb.h>
#include <plat/clkdev_omap.h>
#include <mach/hardware.h> #include <mach/hardware.h>

25
arch/arm/mach-omap1/clock.h
View File

@@ -16,9 +16,34 @@
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/list.h> #include <linux/list.h>
#include <linux/clkdev.h>
struct module; struct module;
struct clk; 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 */ /* Temporary, needed during the common clock framework conversion */
#define __clk_get_name(clk) (clk->name) #define __clk_get_name(clk) (clk->name)
#define __clk_get_parent(clk) (clk->parent) #define __clk_get_parent(clk) (clk->parent)

1
arch/arm/mach-omap1/clock_data.c
View File

@@ -23,7 +23,6 @@
#include <asm/mach-types.h> /* for machine_is_* */ #include <asm/mach-types.h> /* for machine_is_* */
#include <plat/cpu.h> #include <plat/cpu.h>
#include <plat/clkdev_omap.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include <mach/usb.h> /* for OTG_BASE */ #include <mach/usb.h> /* for OTG_BASE */

2
arch/arm/mach-omap1/opp_data.c
View File

@@ -10,7 +10,7 @@
* published by the Free Software Foundation. * published by the Free Software Foundation.
*/ */
#include <plat/clkdev_omap.h> #include "clock.h"
#include "opp.h" #include "opp.h"
/*------------------------------------------------------------------------- /*-------------------------------------------------------------------------

33
arch/arm/mach-omap2/clock.h
View File

@@ -19,6 +19,39 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/list.h> #include <linux/list.h>
#include <linux/clkdev.h>
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_242X (1 << 0)
#define CK_243X (1 << 1) /* 243x, 253x */
#define CK_3430ES1 (1 << 2) /* 34xxES1 only */
#define CK_3430ES2PLUS (1 << 3) /* 34xxES2, ES3, non-Sitara 35xx only */
#define CK_AM35XX (1 << 4) /* Sitara AM35xx */
#define CK_36XX (1 << 5) /* 36xx/37xx-specific clocks */
#define CK_443X (1 << 6)
#define CK_TI816X (1 << 7)
#define CK_446X (1 << 8)
#define CK_AM33XX (1 << 9) /* AM33xx specific clocks */
#define CK_34XX (CK_3430ES1 | CK_3430ES2PLUS)
#define CK_3XXX (CK_34XX | CK_AM35XX | CK_36XX)
struct module; struct module;
struct clk; struct clk;
struct clockdomain; struct clockdomain;

2
arch/arm/mach-omap2/clock2420_data.c
View File

@@ -18,8 +18,6 @@
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/list.h> #include <linux/list.h>
#include <plat/clkdev_omap.h>
#include "soc.h" #include "soc.h"
#include "iomap.h" #include "iomap.h"
#include "clock.h" #include "clock.h"

2
arch/arm/mach-omap2/clock2430_data.c
View File

@@ -17,8 +17,6 @@
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/list.h> #include <linux/list.h>
#include <plat/clkdev_omap.h>
#include "soc.h" #include "soc.h"
#include "iomap.h" #include "iomap.h"
#include "clock.h" #include "clock.h"

1
arch/arm/mach-omap2/clock33xx_data.c
View File

@@ -17,7 +17,6 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/list.h> #include <linux/list.h>
#include <linux/clk.h> #include <linux/clk.h>
#include <plat/clkdev_omap.h>
#include "am33xx.h" #include "am33xx.h"
#include "iomap.h" #include "iomap.h"

2
arch/arm/mach-omap2/clock3xxx_data.c
View File

@@ -21,8 +21,6 @@
#include <linux/list.h> #include <linux/list.h>
#include <linux/io.h> #include <linux/io.h>
#include <plat/clkdev_omap.h>
#include "soc.h" #include "soc.h"
#include "iomap.h" #include "iomap.h"
#include "clock.h" #include "clock.h"

2
arch/arm/mach-omap2/clock44xx_data.c
View File

@@ -28,8 +28,6 @@
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/io.h> #include <linux/io.h>
#include <plat/clkdev_omap.h>
#include "soc.h" #include "soc.h"
#include "iomap.h" #include "iomap.h"
#include "clock.h" #include "clock.h"

51
arch/arm/plat-omap/include/plat/clkdev_omap.h
View File

@@ -1,51 +0,0 @@
/*
* clkdev <-> OMAP integration
*
* Russell King <linux@arm.linux.org.uk>
*
*/
#ifndef __ARCH_ARM_PLAT_OMAP_INCLUDE_PLAT_CLKDEV_OMAP_H
#define __ARCH_ARM_PLAT_OMAP_INCLUDE_PLAT_CLKDEV_OMAP_H
#include <linux/clkdev.h>
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_242X (1 << 4)
#define CK_243X (1 << 5) /* 243x, 253x */
#define CK_3430ES1 (1 << 6) /* 34xxES1 only */
#define CK_3430ES2PLUS (1 << 7) /* 34xxES2, ES3, non-Sitara 35xx only */
#define CK_AM35XX (1 << 9) /* Sitara AM35xx */
#define CK_36XX (1 << 10) /* 36xx/37xx-specific clocks */
#define CK_443X (1 << 11)
#define CK_TI816X (1 << 12)
#define CK_446X (1 << 13)
#define CK_AM33XX (1 << 14) /* AM33xx specific clocks */
#define CK_1710 (1 << 15) /* 1710 extra for rate selection */
#define CK_34XX (CK_3430ES1 | CK_3430ES2PLUS)
#define CK_3XXX (CK_34XX | CK_AM35XX | CK_36XX)
#endif