diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-08-02 05:14:17 -0400 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2010-08-12 05:28:03 -0400 |
commit | 3b16bb539c558cd523ea380653d4bf24a8c9e833 (patch) | |
tree | a1a8f7304ff1e6257e29015df9ab5e901aa0e759 | |
parent | 789133b7b4dd4915550733af5dc005ca89121c73 (diff) |
mfd: New mc13783 function exposing flags
This is needed for the mc13783-adc driver to decide if a touch screen is
connected. If so some channels are not available as generic hwmon inputs.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
-rw-r--r-- | drivers/mfd/mc13783-core.c | 6 | ||||
-rw-r--r-- | include/linux/mfd/mc13783.h | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/drivers/mfd/mc13783-core.c b/drivers/mfd/mc13783-core.c index fecf38a4f025..b0778dcca917 100644 --- a/drivers/mfd/mc13783-core.c +++ b/drivers/mfd/mc13783-core.c | |||
@@ -226,6 +226,12 @@ int mc13783_reg_rmw(struct mc13783 *mc13783, unsigned int offset, | |||
226 | } | 226 | } |
227 | EXPORT_SYMBOL(mc13783_reg_rmw); | 227 | EXPORT_SYMBOL(mc13783_reg_rmw); |
228 | 228 | ||
229 | int mc13783_get_flags(struct mc13783 *mc13783) | ||
230 | { | ||
231 | return mc13783->flags; | ||
232 | } | ||
233 | EXPORT_SYMBOL(mc13783_get_flags); | ||
234 | |||
229 | int mc13783_irq_mask(struct mc13783 *mc13783, int irq) | 235 | int mc13783_irq_mask(struct mc13783 *mc13783, int irq) |
230 | { | 236 | { |
231 | int ret; | 237 | int ret; |
diff --git a/include/linux/mfd/mc13783.h b/include/linux/mfd/mc13783.h index 4a894f688549..0fa44fb8dd26 100644 --- a/include/linux/mfd/mc13783.h +++ b/include/linux/mfd/mc13783.h | |||
@@ -21,6 +21,8 @@ int mc13783_reg_write(struct mc13783 *mc13783, unsigned int offset, u32 val); | |||
21 | int mc13783_reg_rmw(struct mc13783 *mc13783, unsigned int offset, | 21 | int mc13783_reg_rmw(struct mc13783 *mc13783, unsigned int offset, |
22 | u32 mask, u32 val); | 22 | u32 mask, u32 val); |
23 | 23 | ||
24 | int mc13783_get_flags(struct mc13783 *mc13783); | ||
25 | |||
24 | int mc13783_irq_request(struct mc13783 *mc13783, int irq, | 26 | int mc13783_irq_request(struct mc13783 *mc13783, int irq, |
25 | irq_handler_t handler, const char *name, void *dev); | 27 | irq_handler_t handler, const char *name, void *dev); |
26 | int mc13783_irq_request_nounmask(struct mc13783 *mc13783, int irq, | 28 | int mc13783_irq_request_nounmask(struct mc13783 *mc13783, int irq, |