diff options
author | Pantelis Antoniou <panto@antoniou-consulting.com> | 2012-10-13 09:37:24 -0400 |
---|---|---|
committer | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2013-06-12 12:50:20 -0400 |
commit | 24d5c82f8227d4dedf177df3f062eb35db15aaf6 (patch) | |
tree | cf0c88f77864ec2c467adbaf53e9ddd3c4cb57a2 /include/linux | |
parent | c80df483f61d0464224dc4386ced470c7275d78f (diff) |
mfd: ti_tscadc: deal with partial activation
Fix the mfd device in the case where a subdevice might not be activated.
Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/mfd/ti_am335x_tscadc.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/include/linux/mfd/ti_am335x_tscadc.h b/include/linux/mfd/ti_am335x_tscadc.h index e36ae4184917..fe54ba4a3b2f 100644 --- a/include/linux/mfd/ti_am335x_tscadc.h +++ b/include/linux/mfd/ti_am335x_tscadc.h | |||
@@ -120,11 +120,6 @@ | |||
120 | 120 | ||
121 | #define TSCADC_CELLS 2 | 121 | #define TSCADC_CELLS 2 |
122 | 122 | ||
123 | enum tscadc_cells { | ||
124 | TSC_CELL, | ||
125 | ADC_CELL, | ||
126 | }; | ||
127 | |||
128 | struct mfd_tscadc_board { | 123 | struct mfd_tscadc_board { |
129 | struct tsc_data *tsc_init; | 124 | struct tsc_data *tsc_init; |
130 | struct adc_data *adc_init; | 125 | struct adc_data *adc_init; |
@@ -135,6 +130,9 @@ struct ti_tscadc_dev { | |||
135 | struct regmap *regmap_tscadc; | 130 | struct regmap *regmap_tscadc; |
136 | void __iomem *tscadc_base; | 131 | void __iomem *tscadc_base; |
137 | int irq; | 132 | int irq; |
133 | int used_cells; /* 1-2 */ | ||
134 | int tsc_cell; /* -1 if not used */ | ||
135 | int adc_cell; /* -1 if not used */ | ||
138 | struct mfd_cell cells[TSCADC_CELLS]; | 136 | struct mfd_cell cells[TSCADC_CELLS]; |
139 | u32 reg_se_cache; | 137 | u32 reg_se_cache; |
140 | spinlock_t reg_lock; | 138 | spinlock_t reg_lock; |