summaryrefslogtreecommitdiffstats
path: root/include/linux/mfd
diff options
context:
space:
mode:
authorPeter Ujfalusi <peter.ujfalusi@ti.com>2011-07-04 10:28:28 +0300
committerPeter Ujfalusi <peter.ujfalusi@ti.com>2011-07-07 14:23:46 +0300
commitcfb7a33bea259d2d72a64adcb3de28532170dc25 (patch)
treec7faae49b5bf6f5396207591ffde2dd1f3d724e8 /include/linux/mfd
parent753621c2155bd49bff7d5d3844b3ddc203e44a06 (diff)
downloadop-kernel-dev-cfb7a33bea259d2d72a64adcb3de28532170dc25.zip
op-kernel-dev-cfb7a33bea259d2d72a64adcb3de28532170dc25.tar.gz
MFD: twl6040: Remove enum for PLL tracking
There is no need to have two different types for tracking the selected PLL. Use only the defines, when dealing with the PLLs. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Acked-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'include/linux/mfd')
-rw-r--r--include/linux/mfd/twl6040.h17
1 files changed, 6 insertions, 11 deletions
diff --git a/include/linux/mfd/twl6040.h b/include/linux/mfd/twl6040.h
index df890a2..4c806f6 100644
--- a/include/linux/mfd/twl6040.h
+++ b/include/linux/mfd/twl6040.h
@@ -165,9 +165,6 @@
#define TWL6040_RESETSPLIT 0x04
#define TWL6040_INTCLRMODE 0x08
-#define TWL6040_SYSCLK_SEL_LPPLL 1
-#define TWL6040_SYSCLK_SEL_HPPLL 2
-
/* STATUS (0x2E) fields */
#define TWL6040_PLUGCOMP 0x02
@@ -188,11 +185,9 @@
#define TWL6040_IRQ_VIB 4
#define TWL6040_IRQ_READY 5
-enum twl6040_pll_id {
- TWL6040_NOPLL_ID,
- TWL6040_LPPLL_ID,
- TWL6040_HPPLL_ID,
-};
+/* PLL selection */
+#define TWL6040_SYSCLK_SEL_LPPLL 0
+#define TWL6040_SYSCLK_SEL_HPPLL 1
struct twl6040 {
struct device *dev;
@@ -206,7 +201,7 @@ struct twl6040 {
int power_count;
int rev;
- enum twl6040_pll_id pll;
+ int pll;
unsigned int sysclk;
unsigned int irq;
@@ -223,9 +218,9 @@ int twl6040_set_bits(struct twl6040 *twl6040, unsigned int reg,
int twl6040_clear_bits(struct twl6040 *twl6040, unsigned int reg,
u8 mask);
int twl6040_power(struct twl6040 *twl6040, int on);
-int twl6040_set_pll(struct twl6040 *twl6040, enum twl6040_pll_id id,
+int twl6040_set_pll(struct twl6040 *twl6040, int pll_id,
unsigned int freq_in, unsigned int freq_out);
-enum twl6040_pll_id twl6040_get_pll(struct twl6040 *twl6040);
+int twl6040_get_pll(struct twl6040 *twl6040);
unsigned int twl6040_get_sysclk(struct twl6040 *twl6040);
int twl6040_irq_init(struct twl6040 *twl6040);
void twl6040_irq_exit(struct twl6040 *twl6040);
OpenPOWER on IntegriCloud