diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-09-15 16:14:33 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-09-15 16:14:33 -0700 |
| commit | 23618f7faa8fdac93d4823d0372f4101d642b8b1 (patch) | |
| tree | 9cdc7fb633ec7c0f24eee93a968bb799f45608e2 /arch/arm/plat-omap | |
| parent | ceb1c532ba6220900e61ec7073a9234661efa450 (diff) | |
| parent | ee7fbba63e334481049a7939b8071160824447d3 (diff) | |
| download | kernel_samsung_smdk4412-23618f7faa8fdac93d4823d0372f4101d642b8b1.zip kernel_samsung_smdk4412-23618f7faa8fdac93d4823d0372f4101d642b8b1.tar.gz kernel_samsung_smdk4412-23618f7faa8fdac93d4823d0372f4101d642b8b1.tar.bz2 | |
Merge branch 'for_3.2/voltage-cleanup' of git://gitorious.org/khilman/linux-omap-pm into voltage
Diffstat (limited to 'arch/arm/plat-omap')
| -rw-r--r-- | arch/arm/plat-omap/include/plat/omap_hwmod.h | 1 | ||||
| -rw-r--r-- | arch/arm/plat-omap/include/plat/voltage.h | 20 |
2 files changed, 20 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/include/plat/omap_hwmod.h b/arch/arm/plat-omap/include/plat/omap_hwmod.h index 9115aed..5419f1a 100644 --- a/arch/arm/plat-omap/include/plat/omap_hwmod.h +++ b/arch/arm/plat-omap/include/plat/omap_hwmod.h @@ -525,7 +525,6 @@ struct omap_hwmod { char *clkdm_name; struct clockdomain *clkdm; char *vdd_name; - struct voltagedomain *voltdm; struct omap_hwmod_ocp_if **masters; /* connect to *_IA */ struct omap_hwmod_ocp_if **slaves; /* connect to *_TA */ void *dev_attr; diff --git a/arch/arm/plat-omap/include/plat/voltage.h b/arch/arm/plat-omap/include/plat/voltage.h new file mode 100644 index 0000000..0a6a482 --- /dev/null +++ b/arch/arm/plat-omap/include/plat/voltage.h @@ -0,0 +1,20 @@ +/* + * OMAP Voltage Management Routines + * + * Copyright (C) 2011, Texas Instruments, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#ifndef __ARCH_ARM_OMAP_VOLTAGE_H +#define __ARCH_ARM_OMAP_VOLTAGE_H + +struct voltagedomain; + +struct voltagedomain *voltdm_lookup(const char *name); +int voltdm_scale(struct voltagedomain *voltdm, unsigned long target_volt); +unsigned long voltdm_get_voltage(struct voltagedomain *voltdm); + +#endif |