Skip to content

L
linux
Commit fec316d6 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Samuel Ortiz
Browse files
Options

mfd: Provide a generic version of mc13xxx adc_do_conversion 

This is needed to convert the touch driver away from using struct mc13783.

Note this patch drops MC13783_ADC0_ADREFMODE. This is unused and doesn't
exist on mc13892.
Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent f3ca0782
Hide whitespace changes
Inline Side-by-side
Showing with 81 additions and 62 deletions
drivers/mfd/mc13xxx-core.c
View file @ fec316d6
...@@ -26,12 +26,12 @@ struct mc13xxx { ...@@ -26,12 +26,12 @@ struct mc13xxx {
irq_handler_t irqhandler[MC13XXX_NUM_IRQ]; irq_handler_t irqhandler[MC13XXX_NUM_IRQ];
void *irqdata[MC13XXX_NUM_IRQ]; void *irqdata[MC13XXX_NUM_IRQ];
int adcflags;
}; };
struct mc13783 { struct mc13783 {
struct mc13xxx mc13xxx; struct mc13xxx mc13xxx;
int adcflags;
}; };
struct mc13xxx *mc13783_to_mc13xxx(struct mc13783 *mc13783) struct mc13xxx *mc13783_to_mc13xxx(struct mc13783 *mc13783)
...@@ -136,14 +136,14 @@ EXPORT_SYMBOL(mc13783_to_mc13xxx); ...@@ -136,14 +136,14 @@ EXPORT_SYMBOL(mc13783_to_mc13xxx);
#define MC13XXX_REVISION_FAB (0x03 << 11) #define MC13XXX_REVISION_FAB (0x03 << 11)
#define MC13XXX_REVISION_ICIDCODE (0x3f << 13) #define MC13XXX_REVISION_ICIDCODE (0x3f << 13)
#define MC13783_ADC1 44 #define MC13XXX_ADC1 44
#define MC13783_ADC1_ADEN (1 << 0) #define MC13XXX_ADC1_ADEN (1 << 0)
#define MC13783_ADC1_RAND (1 << 1) #define MC13XXX_ADC1_RAND (1 << 1)
#define MC13783_ADC1_ADSEL (1 << 3) #define MC13XXX_ADC1_ADSEL (1 << 3)
#define MC13783_ADC1_ASC (1 << 20) #define MC13XXX_ADC1_ASC (1 << 20)
#define MC13783_ADC1_ADTRIGIGN (1 << 21) #define MC13XXX_ADC1_ADTRIGIGN (1 << 21)
#define MC13783_ADC2 45 #define MC13XXX_ADC2 45
#define MC13XXX_NUMREGS 0x3f #define MC13XXX_NUMREGS 0x3f
...@@ -569,15 +569,15 @@ int mc13xxx_get_flags(struct mc13xxx *mc13xxx) ...@@ -569,15 +569,15 @@ int mc13xxx_get_flags(struct mc13xxx *mc13xxx)
} }
EXPORT_SYMBOL(mc13xxx_get_flags); EXPORT_SYMBOL(mc13xxx_get_flags);
#define MC13783_ADC1_CHAN0_SHIFT 5 #define MC13XXX_ADC1_CHAN0_SHIFT 5
#define MC13783_ADC1_CHAN1_SHIFT 8 #define MC13XXX_ADC1_CHAN1_SHIFT 8
struct mc13xxx_adcdone_data { struct mc13xxx_adcdone_data {
struct mc13xxx *mc13xxx; struct mc13xxx *mc13xxx;
struct completion done; struct completion done;
}; };
static irqreturn_t mc13783_handler_adcdone(int irq, void *data) static irqreturn_t mc13xxx_handler_adcdone(int irq, void *data)
{ {
struct mc13xxx_adcdone_data *adcdone_data = data; struct mc13xxx_adcdone_data *adcdone_data = data;
...@@ -588,12 +588,11 @@ static irqreturn_t mc13783_handler_adcdone(int irq, void *data) ...@@ -588,12 +588,11 @@ static irqreturn_t mc13783_handler_adcdone(int irq, void *data)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
#define MC13783_ADC_WORKING (1 << 0) #define MC13XXX_ADC_WORKING (1 << 0)
int mc13783_adc_do_conversion(struct mc13783 *mc13783, unsigned int mode, int mc13xxx_adc_do_conversion(struct mc13xxx *mc13xxx, unsigned int mode,
unsigned int channel, unsigned int *sample) unsigned int channel, unsigned int *sample)
{ {
struct mc13xxx *mc13xxx = &mc13783->mc13xxx;
u32 adc0, adc1, old_adc0; u32 adc0, adc1, old_adc0;
int i, ret; int i, ret;
struct mc13xxx_adcdone_data adcdone_data = { struct mc13xxx_adcdone_data adcdone_data = {
...@@ -605,51 +604,51 @@ int mc13783_adc_do_conversion(struct mc13783 *mc13783, unsigned int mode, ...@@ -605,51 +604,51 @@ int mc13783_adc_do_conversion(struct mc13783 *mc13783, unsigned int mode,
mc13xxx_lock(mc13xxx); mc13xxx_lock(mc13xxx);
if (mc13783->adcflags & MC13783_ADC_WORKING) { if (mc13xxx->adcflags & MC13XXX_ADC_WORKING) {
ret = -EBUSY; ret = -EBUSY;
goto out; goto out;
} }
mc13783->adcflags |= MC13783_ADC_WORKING; mc13xxx->adcflags |= MC13XXX_ADC_WORKING;
mc13xxx_reg_read(mc13xxx, MC13783_ADC0, &old_adc0); mc13xxx_reg_read(mc13xxx, MC13XXX_ADC0, &old_adc0);
adc0 = MC13783_ADC0_ADINC1 | MC13783_ADC0_ADINC2; adc0 = MC13XXX_ADC0_ADINC1 | MC13XXX_ADC0_ADINC2;
adc1 = MC13783_ADC1_ADEN | MC13783_ADC1_ADTRIGIGN | MC13783_ADC1_ASC; adc1 = MC13XXX_ADC1_ADEN | MC13XXX_ADC1_ADTRIGIGN | MC13XXX_ADC1_ASC;
if (channel > 7) if (channel > 7)
adc1 |= MC13783_ADC1_ADSEL; adc1 |= MC13XXX_ADC1_ADSEL;
switch (mode) { switch (mode) {
case MC13783_ADC_MODE_TS: case MC13XXX_ADC_MODE_TS:
adc0 |= MC13783_ADC0_ADREFEN | MC13783_ADC0_TSMOD0 | adc0 |= MC13XXX_ADC0_ADREFEN | MC13XXX_ADC0_TSMOD0 |
MC13783_ADC0_TSMOD1; MC13XXX_ADC0_TSMOD1;
adc1 |= 4 << MC13783_ADC1_CHAN1_SHIFT; adc1 |= 4 << MC13XXX_ADC1_CHAN1_SHIFT;
break; break;
case MC13783_ADC_MODE_SINGLE_CHAN: case MC13XXX_ADC_MODE_SINGLE_CHAN:
adc0 |= old_adc0 & MC13783_ADC0_TSMOD_MASK; adc0 |= old_adc0 & MC13XXX_ADC0_TSMOD_MASK;
adc1 |= (channel & 0x7) << MC13783_ADC1_CHAN0_SHIFT; adc1 |= (channel & 0x7) << MC13XXX_ADC1_CHAN0_SHIFT;
adc1 |= MC13783_ADC1_RAND; adc1 |= MC13XXX_ADC1_RAND;
break; break;
case MC13783_ADC_MODE_MULT_CHAN: case MC13XXX_ADC_MODE_MULT_CHAN:
adc0 |= old_adc0 & MC13783_ADC0_TSMOD_MASK; adc0 |= old_adc0 & MC13XXX_ADC0_TSMOD_MASK;
adc1 |= 4 << MC13783_ADC1_CHAN1_SHIFT; adc1 |= 4 << MC13XXX_ADC1_CHAN1_SHIFT;
break; break;
default: default:
mc13783_unlock(mc13783); mc13xxx_unlock(mc13xxx);
return -EINVAL; return -EINVAL;
} }
dev_dbg(&mc13783->mc13xxx.spidev->dev, "%s: request irq\n", __func__); dev_dbg(&mc13xxx->spidev->dev, "%s: request irq\n", __func__);
mc13xxx_irq_request(mc13xxx, MC13783_IRQ_ADCDONE, mc13xxx_irq_request(mc13xxx, MC13XXX_IRQ_ADCDONE,
mc13783_handler_adcdone, __func__, &adcdone_data); mc13xxx_handler_adcdone, __func__, &adcdone_data);
mc13xxx_irq_ack(mc13xxx, MC13783_IRQ_ADCDONE); mc13xxx_irq_ack(mc13xxx, MC13XXX_IRQ_ADCDONE);
mc13xxx_reg_write(mc13xxx, MC13783_ADC0, adc0); mc13xxx_reg_write(mc13xxx, MC13XXX_ADC0, adc0);
mc13xxx_reg_write(mc13xxx, MC13783_ADC1, adc1); mc13xxx_reg_write(mc13xxx, MC13XXX_ADC1, adc1);
mc13xxx_unlock(mc13xxx); mc13xxx_unlock(mc13xxx);
...@@ -660,27 +659,27 @@ int mc13783_adc_do_conversion(struct mc13783 *mc13783, unsigned int mode, ...@@ -660,27 +659,27 @@ int mc13783_adc_do_conversion(struct mc13783 *mc13783, unsigned int mode,
mc13xxx_lock(mc13xxx); mc13xxx_lock(mc13xxx);
mc13xxx_irq_free(mc13xxx, MC13783_IRQ_ADCDONE, &adcdone_data); mc13xxx_irq_free(mc13xxx, MC13XXX_IRQ_ADCDONE, &adcdone_data);
if (ret > 0) if (ret > 0)
for (i = 0; i < 4; ++i) { for (i = 0; i < 4; ++i) {
ret = mc13xxx_reg_read(mc13xxx, ret = mc13xxx_reg_read(mc13xxx,
MC13783_ADC2, &sample[i]); MC13XXX_ADC2, &sample[i]);
if (ret) if (ret)
break; break;
} }
if (mode == MC13783_ADC_MODE_TS) if (mode == MC13XXX_ADC_MODE_TS)
/* restore TSMOD */ /* restore TSMOD */
mc13xxx_reg_write(mc13xxx, MC13783_ADC0, old_adc0); mc13xxx_reg_write(mc13xxx, MC13XXX_ADC0, old_adc0);
mc13783->adcflags &= ~MC13783_ADC_WORKING; mc13xxx->adcflags &= ~MC13XXX_ADC_WORKING;
out: out:
mc13xxx_unlock(mc13xxx); mc13xxx_unlock(mc13xxx);
return ret; return ret;
} }
EXPORT_SYMBOL_GPL(mc13783_adc_do_conversion); EXPORT_SYMBOL_GPL(mc13xxx_adc_do_conversion);
static int mc13xxx_add_subdevice_pdata(struct mc13xxx *mc13xxx, static int mc13xxx_add_subdevice_pdata(struct mc13xxx *mc13xxx,
const char *format, void *pdata, size_t pdata_size) const char *format, void *pdata, size_t pdata_size)
......
include/linux/mfd/mc13783.h
View file @ fec316d6
...@@ -89,18 +89,15 @@ static inline int mc13783_irq_ack(struct mc13783 *mc13783, int irq) ...@@ -89,18 +89,15 @@ static inline int mc13783_irq_ack(struct mc13783 *mc13783, int irq)
return mc13xxx_irq_ack(mc13783_to_mc13xxx(mc13783), irq); return mc13xxx_irq_ack(mc13783_to_mc13xxx(mc13783), irq);
} }
#define MC13783_ADC0 43 #define MC13783_ADC0 MC13XXX_ADC0
#define MC13783_ADC0_ADREFEN (1 << 10) #define MC13783_ADC0_ADREFEN MC13XXX_ADC0_ADREFEN
#define MC13783_ADC0_ADREFMODE (1 << 11) #define MC13783_ADC0_TSMOD0 MC13XXX_ADC0_TSMOD0
#define MC13783_ADC0_TSMOD0 (1 << 12) #define MC13783_ADC0_TSMOD1 MC13XXX_ADC0_TSMOD1
#define MC13783_ADC0_TSMOD1 (1 << 13) #define MC13783_ADC0_TSMOD2 MC13XXX_ADC0_TSMOD2
#define MC13783_ADC0_TSMOD2 (1 << 14) #define MC13783_ADC0_ADINC1 MC13XXX_ADC0_ADINC1
#define MC13783_ADC0_ADINC1 (1 << 16) #define MC13783_ADC0_ADINC2 MC13XXX_ADC0_ADINC2
#define MC13783_ADC0_ADINC2 (1 << 17)
#define MC13783_ADC0_TSMOD_MASK MC13XXX_ADC0_TSMOD_MASK
#define MC13783_ADC0_TSMOD_MASK (MC13783_ADC0_TSMOD0 | \
MC13783_ADC0_TSMOD1 | \
MC13783_ADC0_TSMOD2)
#define mc13783_regulator_init_data mc13xxx_regulator_init_data #define mc13783_regulator_init_data mc13xxx_regulator_init_data
#define mc13783_regulator_platform_data mc13xxx_regulator_platform_data #define mc13783_regulator_platform_data mc13xxx_regulator_platform_data
...@@ -115,12 +112,16 @@ static inline int mc13783_irq_ack(struct mc13783 *mc13783, int irq) ...@@ -115,12 +112,16 @@ static inline int mc13783_irq_ack(struct mc13783 *mc13783, int irq)
#define MC13783_USE_REGULATOR MC13XXX_USE_REGULATOR #define MC13783_USE_REGULATOR MC13XXX_USE_REGULATOR
#define MC13783_USE_LED MC13XXX_USE_LED #define MC13783_USE_LED MC13XXX_USE_LED
#define MC13783_ADC_MODE_TS 1 #define MC13783_ADC_MODE_TS MC13XXX_ADC_MODE_TS
#define MC13783_ADC_MODE_SINGLE_CHAN 2 #define MC13783_ADC_MODE_SINGLE_CHAN MC13XXX_ADC_MODE_SINGLE_CHAN
#define MC13783_ADC_MODE_MULT_CHAN 3 #define MC13783_ADC_MODE_MULT_CHAN MC13XXX_ADC_MODE_MULT_CHAN
int mc13783_adc_do_conversion(struct mc13783 *mc13783, unsigned int mode, static inline int mc13783_adc_do_conversion(struct mc13783 *mc13783,
unsigned int channel, unsigned int *sample); unsigned int mode, unsigned int channel, unsigned int *sample)
{
return mc13xxx_adc_do_conversion(mc13783_to_mc13xxx(mc13783), mode,
channel, sample);
}
#define MC13783_REG_SW1A 0 #define MC13783_REG_SW1A 0
......
include/linux/mfd/mc13xxx.h
View file @ fec316d6
...@@ -37,6 +37,9 @@ int mc13xxx_irq_ack(struct mc13xxx *mc13xxx, int irq); ...@@ -37,6 +37,9 @@ int mc13xxx_irq_ack(struct mc13xxx *mc13xxx, int irq);
int mc13xxx_get_flags(struct mc13xxx *mc13xxx); int mc13xxx_get_flags(struct mc13xxx *mc13xxx);
int mc13xxx_adc_do_conversion(struct mc13xxx *mc13xxx,
unsigned int mode, unsigned int channel, unsigned int *sample);
#define MC13XXX_IRQ_ADCDONE 0 #define MC13XXX_IRQ_ADCDONE 0
#define MC13XXX_IRQ_ADCBISDONE 1 #define MC13XXX_IRQ_ADCBISDONE 1
#define MC13XXX_IRQ_TS 2 #define MC13XXX_IRQ_TS 2
...@@ -150,4 +153,20 @@ struct mc13xxx_platform_data { ...@@ -150,4 +153,20 @@ struct mc13xxx_platform_data {
struct mc13xxx_leds_platform_data *leds; struct mc13xxx_leds_platform_data *leds;
}; };
#define MC13XXX_ADC_MODE_TS 1
#define MC13XXX_ADC_MODE_SINGLE_CHAN 2
#define MC13XXX_ADC_MODE_MULT_CHAN 3
#define MC13XXX_ADC0 43
#define MC13XXX_ADC0_ADREFEN (1 << 10)
#define MC13XXX_ADC0_TSMOD0 (1 << 12)
#define MC13XXX_ADC0_TSMOD1 (1 << 13)
#define MC13XXX_ADC0_TSMOD2 (1 << 14)
#define MC13XXX_ADC0_ADINC1 (1 << 16)
#define MC13XXX_ADC0_ADINC2 (1 << 17)
#define MC13XXX_ADC0_TSMOD_MASK (MC13XXX_ADC0_TSMOD0 | \
MC13XXX_ADC0_TSMOD1 | \
MC13XXX_ADC0_TSMOD2)
#endif /* ifndef __LINUX_MFD_MC13XXX_H */ #endif /* ifndef __LINUX_MFD_MC13XXX_H */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7