diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-08-02 11:14:17 +0200 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2010-08-12 11:28:03 +0200 |
| commit | 3b16bb539c558cd523ea380653d4bf24a8c9e833 (patch) | |
| tree | a1a8f7304ff1e6257e29015df9ab5e901aa0e759 | |
| parent | 789133b7b4dd4915550733af5dc005ca89121c73 (diff) | |
| download | kernel_samsung_smdk4412-3b16bb539c558cd523ea380653d4bf24a8c9e833.zip kernel_samsung_smdk4412-3b16bb539c558cd523ea380653d4bf24a8c9e833.tar.gz kernel_samsung_smdk4412-3b16bb539c558cd523ea380653d4bf24a8c9e833.tar.bz2 | |
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 fecf38a..b0778dc 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, } EXPORT_SYMBOL(mc13783_reg_rmw); +int mc13783_get_flags(struct mc13783 *mc13783) +{ + return mc13783->flags; +} +EXPORT_SYMBOL(mc13783_get_flags); + int mc13783_irq_mask(struct mc13783 *mc13783, int irq) { int ret; diff --git a/include/linux/mfd/mc13783.h b/include/linux/mfd/mc13783.h index 4a894f6..0fa44fb 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); int mc13783_reg_rmw(struct mc13783 *mc13783, unsigned int offset, u32 mask, u32 val); +int mc13783_get_flags(struct mc13783 *mc13783); + int mc13783_irq_request(struct mc13783 *mc13783, int irq, irq_handler_t handler, const char *name, void *dev); int mc13783_irq_request_nounmask(struct mc13783 *mc13783, int irq, |