git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
[pandora-kernel.git]
/
arch
/
arm
/
plat-omap
/
include
/
mach
/
clockdomain.h
diff --git
a/arch/arm/plat-omap/include/mach/clockdomain.h
b/arch/arm/plat-omap/include/mach/clockdomain.h
index
1f51f01
..
b9d0dd2
100644
(file)
--- a/
arch/arm/plat-omap/include/mach/clockdomain.h
+++ b/
arch/arm/plat-omap/include/mach/clockdomain.h
@@
-1,5
+1,5
@@
/*
/*
- *
linux/include/asm-arm/arch-omap
/clockdomain.h
+ *
arch/arm/plat-omap/include/mach
/clockdomain.h
*
* OMAP2/3 clockdomain framework functions
*
*
* OMAP2/3 clockdomain framework functions
*
@@
-48,11
+48,13
@@
*/
struct clkdm_pwrdm_autodep {
*/
struct clkdm_pwrdm_autodep {
- /* Name of the powerdomain to add a wkdep/sleepdep on */
- const char *pwrdm_name;
+ union {
+ /* Name of the powerdomain to add a wkdep/sleepdep on */
+ const char *name;
- /* Powerdomain pointer (looked up at clkdm_init() time) */
- struct powerdomain *pwrdm;
+ /* Powerdomain pointer (looked up at clkdm_init() time) */
+ struct powerdomain *ptr;
+ } pwrdm;
/* OMAP chip types that this clockdomain dep is valid on */
const struct omap_chip_id omap_chip;
/* OMAP chip types that this clockdomain dep is valid on */
const struct omap_chip_id omap_chip;
@@
-64,8
+66,13
@@
struct clockdomain {
/* Clockdomain name */
const char *name;
/* Clockdomain name */
const char *name;
- /* Powerdomain enclosing this clockdomain */
- const char *pwrdm_name;
+ union {
+ /* Powerdomain enclosing this clockdomain */
+ const char *name;
+
+ /* Powerdomain pointer assigned at clkdm_register() */
+ struct powerdomain *ptr;
+ } pwrdm;
/* CLKTRCTRL/AUTOSTATE field mask in CM_CLKSTCTRL reg */
const u16 clktrctrl_mask;
/* CLKTRCTRL/AUTOSTATE field mask in CM_CLKSTCTRL reg */
const u16 clktrctrl_mask;
@@
-79,9
+86,6
@@
struct clockdomain {
/* Usecount tracking */
atomic_t usecount;
/* Usecount tracking */
atomic_t usecount;
- /* Powerdomain pointer assigned at clkdm_register() */
- struct powerdomain *pwrdm;
-
struct list_head node;
};
struct list_head node;
};