summaryrefslogtreecommitdiff
path: root/drivers/mfd
diff options
context:
space:
mode:
authorMax Krummenacher <max.oss.09@gmail.com>2014-08-16 21:12:36 +0200
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2017-12-21 14:26:14 +0100
commit67f5b72be73c81cd98c5629bba737aa6fa9fd7a8 (patch)
tree74f6897b2c8baf301ccfe3cc8f14b6e1dedd0dc8 /drivers/mfd
parent56ca491137bbe9d1801945173b4aefaaee71e28c (diff)
stmpe-adc: add temperature channel
read the chips temperature in millikelvin while at it sort the #include directives in alphabetical order. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> (cherry picked from commit ebc892dbbad4686b6abc9359b83dcd5ce12aeeb3) (cherry picked from commit 7435612c3203ed5eca29635fcbd01818185ec0ea)
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/stmpe.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/mfd/stmpe.c b/drivers/mfd/stmpe.c
index 86e72026e548..9e30c48a1664 100644
--- a/drivers/mfd/stmpe.c
+++ b/drivers/mfd/stmpe.c
@@ -469,6 +469,12 @@ static const struct mfd_cell stmpe_ts_cell = {
static struct resource stmpe_adc_resources[] = {
{
+ .name = "STMPE_TEMP_SENS",
+ .start = 0,
+ .end = 0,
+ .flags = IORESOURCE_IRQ,
+ },
+ {
.name = "STMPE_ADC",
.start = 0,
.end = 0,
@@ -519,7 +525,7 @@ static struct stmpe_variant_block stmpe811_blocks[] = {
},
{
.cell = &stmpe_adc_cell,
- .irq = STMPE811_IRQ_ADC,
+ .irq = STMPE811_IRQ_TEMP_SENS,
.block = STMPE_BLOCK_ADC,
},
};