| Message ID | 20180128232919.12639-11-embed3d@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Jan 29, 2018 at 12:29:13AM +0100, Philipp Rossak wrote: > This patch adds support for the A83T ths sensor. > > The A83T supports interrupts. The interrupt is configured to update the > the sensor values every second. > > Signed-off-by: Philipp Rossak <embed3d@gmail.com> > --- > drivers/iio/adc/sun4i-gpadc-iio.c | 38 ++++++++++++++++++++++++++++++++++++++ > include/linux/mfd/sun4i-gpadc.h | 18 ++++++++++++++++++ > 2 files changed, 56 insertions(+) > > diff --git a/drivers/iio/adc/sun4i-gpadc-iio.c b/drivers/iio/adc/sun4i-gpadc-iio.c > index 8196203d65fe..9f7895ba1966 100644 > --- a/drivers/iio/adc/sun4i-gpadc-iio.c > +++ b/drivers/iio/adc/sun4i-gpadc-iio.c > @@ -170,6 +170,40 @@ static const struct gpadc_data sun8i_h3_ths_data = { > SUN8I_H3_THS_TEMP_PERIOD(0x7), > }; > > +static const struct gpadc_data sun8i_a83t_ths_data = { > + .temp_offset = -2724, > + .temp_scale = -70, > + .temp_data = {SUN8I_H3_THS_TDATA0, > + SUN8I_A83T_THS_TDATA1, > + SUN8I_A83T_THS_TDATA2, > + 0}, > + .sample_start = sunxi_ths_sample_start, > + .sample_end = sunxi_ths_sample_end, > + .sensor_count = 3, > + .supports_nvmem = false, > + .support_irq = true, > + .ctrl0_map = SUN4I_GPADC_CTRL0_T_ACQ(0x1f3), > + .ctrl2_map = SUN8I_H3_THS_ACQ1(0x1f3), Where are these values coming from? > + .sensor_en_map = SUN8I_H3_THS_TEMP_SENSE_EN0 | > + SUN8I_A83T_THS_TEMP_SENSE_EN1 | > + SUN8I_A83T_THS_TEMP_SENSE_EN2, > + .filter_map = SUN4I_GPADC_CTRL3_FILTER_EN | > + SUN4I_GPADC_CTRL3_FILTER_TYPE(0x2), > + .irq_clear_map = SUN8I_H3_THS_INTS_ALARM_INT_0 | > + SUN8I_A83T_THS_INTS_ALARM_INT_1 | > + SUN8I_A83T_THS_INTS_ALARM_INT_2 | > + SUN8I_H3_THS_INTS_SHUT_INT_0 | > + SUN8I_A83T_THS_INTS_SHUT_INT_1 | > + SUN8I_A83T_THS_INTS_SHUT_INT_2 | > + SUN8I_H3_THS_INTS_TDATA_IRQ_0 | > + SUN8I_A83T_THS_INTS_TDATA_IRQ_1 | > + SUN8I_A83T_THS_INTS_TDATA_IRQ_2, Do you reall need to clear all these interrupts if you're using only one? Maxime
On 29.01.2018 10:48, Maxime Ripard wrote: > On Mon, Jan 29, 2018 at 12:29:13AM +0100, Philipp Rossak wrote: >> This patch adds support for the A83T ths sensor. >> >> The A83T supports interrupts. The interrupt is configured to update the >> the sensor values every second. >> >> Signed-off-by: Philipp Rossak <embed3d@gmail.com> >> --- >> drivers/iio/adc/sun4i-gpadc-iio.c | 38 ++++++++++++++++++++++++++++++++++++++ >> include/linux/mfd/sun4i-gpadc.h | 18 ++++++++++++++++++ >> 2 files changed, 56 insertions(+) >> >> diff --git a/drivers/iio/adc/sun4i-gpadc-iio.c b/drivers/iio/adc/sun4i-gpadc-iio.c >> index 8196203d65fe..9f7895ba1966 100644 >> --- a/drivers/iio/adc/sun4i-gpadc-iio.c >> +++ b/drivers/iio/adc/sun4i-gpadc-iio.c >> @@ -170,6 +170,40 @@ static const struct gpadc_data sun8i_h3_ths_data = { >> SUN8I_H3_THS_TEMP_PERIOD(0x7), >> }; >> >> +static const struct gpadc_data sun8i_a83t_ths_data = { >> + .temp_offset = -2724, >> + .temp_scale = -70, >> + .temp_data = {SUN8I_H3_THS_TDATA0, >> + SUN8I_A83T_THS_TDATA1, >> + SUN8I_A83T_THS_TDATA2, >> + 0}, >> + .sample_start = sunxi_ths_sample_start, >> + .sample_end = sunxi_ths_sample_end, >> + .sensor_count = 3, >> + .supports_nvmem = false, >> + .support_irq = true, >> + .ctrl0_map = SUN4I_GPADC_CTRL0_T_ACQ(0x1f3), >> + .ctrl2_map = SUN8I_H3_THS_ACQ1(0x1f3), > > Where are these values coming from? > These values are calculated with the formulas from the datasheet and also tested on hardware. These settings seem ok. >> + .sensor_en_map = SUN8I_H3_THS_TEMP_SENSE_EN0 | >> + SUN8I_A83T_THS_TEMP_SENSE_EN1 | >> + SUN8I_A83T_THS_TEMP_SENSE_EN2, >> + .filter_map = SUN4I_GPADC_CTRL3_FILTER_EN | >> + SUN4I_GPADC_CTRL3_FILTER_TYPE(0x2), >> + .irq_clear_map = SUN8I_H3_THS_INTS_ALARM_INT_0 | >> + SUN8I_A83T_THS_INTS_ALARM_INT_1 | >> + SUN8I_A83T_THS_INTS_ALARM_INT_2 | >> + SUN8I_H3_THS_INTS_SHUT_INT_0 | >> + SUN8I_A83T_THS_INTS_SHUT_INT_1 | >> + SUN8I_A83T_THS_INTS_SHUT_INT_2 | >> + SUN8I_H3_THS_INTS_TDATA_IRQ_0 | >> + SUN8I_A83T_THS_INTS_TDATA_IRQ_1 | >> + SUN8I_A83T_THS_INTS_TDATA_IRQ_2, > > Do you reall need to clear all these interrupts if you're using only > one? > No, I don't think so, I will remove them in the next version. > Maxime > Philipp
1;5002;0c On Mon, Jan 29, 2018 at 12:53:48PM +0100, Philipp Rossak wrote: > > > On 29.01.2018 10:48, Maxime Ripard wrote: > > On Mon, Jan 29, 2018 at 12:29:13AM +0100, Philipp Rossak wrote: > > > This patch adds support for the A83T ths sensor. > > > > > > The A83T supports interrupts. The interrupt is configured to update the > > > the sensor values every second. > > > > > > Signed-off-by: Philipp Rossak <embed3d@gmail.com> > > > --- > > > drivers/iio/adc/sun4i-gpadc-iio.c | 38 ++++++++++++++++++++++++++++++++++++++ > > > include/linux/mfd/sun4i-gpadc.h | 18 ++++++++++++++++++ > > > 2 files changed, 56 insertions(+) > > > > > > diff --git a/drivers/iio/adc/sun4i-gpadc-iio.c b/drivers/iio/adc/sun4i-gpadc-iio.c > > > index 8196203d65fe..9f7895ba1966 100644 > > > --- a/drivers/iio/adc/sun4i-gpadc-iio.c > > > +++ b/drivers/iio/adc/sun4i-gpadc-iio.c > > > @@ -170,6 +170,40 @@ static const struct gpadc_data sun8i_h3_ths_data = { > > > SUN8I_H3_THS_TEMP_PERIOD(0x7), > > > }; > > > +static const struct gpadc_data sun8i_a83t_ths_data = { > > > + .temp_offset = -2724, > > > + .temp_scale = -70, > > > + .temp_data = {SUN8I_H3_THS_TDATA0, > > > + SUN8I_A83T_THS_TDATA1, > > > + SUN8I_A83T_THS_TDATA2, > > > + 0}, > > > + .sample_start = sunxi_ths_sample_start, > > > + .sample_end = sunxi_ths_sample_end, > > > + .sensor_count = 3, > > > + .supports_nvmem = false, > > > + .support_irq = true, > > > + .ctrl0_map = SUN4I_GPADC_CTRL0_T_ACQ(0x1f3), > > > + .ctrl2_map = SUN8I_H3_THS_ACQ1(0x1f3), > > > > Where are these values coming from? > > > > These values are calculated with the formulas from the datasheet and also > tested on hardware. These settings seem ok. You should at least put a comment explaining how you got to these values. Maxime
diff --git a/drivers/iio/adc/sun4i-gpadc-iio.c b/drivers/iio/adc/sun4i-gpadc-iio.c index 8196203d65fe..9f7895ba1966 100644 --- a/drivers/iio/adc/sun4i-gpadc-iio.c +++ b/drivers/iio/adc/sun4i-gpadc-iio.c @@ -170,6 +170,40 @@ static const struct gpadc_data sun8i_h3_ths_data = { SUN8I_H3_THS_TEMP_PERIOD(0x7), }; +static const struct gpadc_data sun8i_a83t_ths_data = { + .temp_offset = -2724, + .temp_scale = -70, + .temp_data = {SUN8I_H3_THS_TDATA0, + SUN8I_A83T_THS_TDATA1, + SUN8I_A83T_THS_TDATA2, + 0}, + .sample_start = sunxi_ths_sample_start, + .sample_end = sunxi_ths_sample_end, + .sensor_count = 3, + .supports_nvmem = false, + .support_irq = true, + .ctrl0_map = SUN4I_GPADC_CTRL0_T_ACQ(0x1f3), + .ctrl2_map = SUN8I_H3_THS_ACQ1(0x1f3), + .sensor_en_map = SUN8I_H3_THS_TEMP_SENSE_EN0 | + SUN8I_A83T_THS_TEMP_SENSE_EN1 | + SUN8I_A83T_THS_TEMP_SENSE_EN2, + .filter_map = SUN4I_GPADC_CTRL3_FILTER_EN | + SUN4I_GPADC_CTRL3_FILTER_TYPE(0x2), + .irq_clear_map = SUN8I_H3_THS_INTS_ALARM_INT_0 | + SUN8I_A83T_THS_INTS_ALARM_INT_1 | + SUN8I_A83T_THS_INTS_ALARM_INT_2 | + SUN8I_H3_THS_INTS_SHUT_INT_0 | + SUN8I_A83T_THS_INTS_SHUT_INT_1 | + SUN8I_A83T_THS_INTS_SHUT_INT_2 | + SUN8I_H3_THS_INTS_TDATA_IRQ_0 | + SUN8I_A83T_THS_INTS_TDATA_IRQ_1 | + SUN8I_A83T_THS_INTS_TDATA_IRQ_2, + .irq_control_map = SUN8I_H3_THS_INTC_TDATA_IRQ_EN0 | + SUN8I_A83T_THS_INTC_TDATA_IRQ_EN1 | + SUN8I_A83T_THS_INTC_TDATA_IRQ_EN2 | + SUN8I_H3_THS_TEMP_PERIOD(0x257), +}; + struct sun4i_gpadc_iio { struct iio_dev *indio_dev; struct completion completion; @@ -668,6 +702,10 @@ static const struct of_device_id sun4i_gpadc_of_id[] = { .compatible = "allwinner,sun8i-h3-ths", .data = &sun8i_h3_ths_data, }, + { + .compatible = "allwinner,sun8i-a83t-ths", + .data = &sun8i_a83t_ths_data, + }, { /* sentinel */ } }; diff --git a/include/linux/mfd/sun4i-gpadc.h b/include/linux/mfd/sun4i-gpadc.h index 80b79c31cea3..32f15cc03363 100644 --- a/include/linux/mfd/sun4i-gpadc.h +++ b/include/linux/mfd/sun4i-gpadc.h @@ -99,21 +99,39 @@ #define SUNXI_THS_CDATA_0_1 0x74 #define SUNXI_THS_CDATA_2_3 0x78 #define SUN8I_H3_THS_TDATA0 0x80 +#define SUN8I_A83T_THS_TDATA1 0x84 +#define SUN8I_A83T_THS_TDATA2 0x88 #define SUN8I_H3_THS_ACQ1(x) (GENMASK(31, 16) & ((x) << 16)) #define SUN8I_H3_THS_TEMP_SENSE_EN0 BIT(0) +#define SUN8I_A83T_THS_TEMP_SENSE_EN1 BIT(1) +#define SUN8I_A83T_THS_TEMP_SENSE_EN2 BIT(2) #define SUN8I_H3_THS_TEMP_PERIOD(x) (GENMASK(31, 12) & ((x) << 12)) #define SUN8I_H3_THS_INTS_ALARM_INT_0 BIT(0) +#define SUN8I_A83T_THS_INTS_ALARM_INT_1 BIT(1) +#define SUN8I_A83T_THS_INTS_ALARM_INT_2 BIT(2) #define SUN8I_H3_THS_INTS_SHUT_INT_0 BIT(4) +#define SUN8I_A83T_THS_INTS_SHUT_INT_1 BIT(5) +#define SUN8I_A83T_THS_INTS_SHUT_INT_2 BIT(6) #define SUN8I_H3_THS_INTS_TDATA_IRQ_0 BIT(8) +#define SUN8I_A83T_THS_INTS_TDATA_IRQ_1 BIT(9) +#define SUN8I_A83T_THS_INTS_TDATA_IRQ_2 BIT(10) #define SUN8I_H3_THS_INTS_ALARM_OFF_0 BIT(12) +#define SUN8I_A83T_THS_INTS_ALARM_OFF_1 BIT(13) +#define SUN8I_A83T_THS_INTS_ALARM_OFF_2 BIT(14) #define SUN8I_H3_THS_INTC_ALARM_INT_EN0 BIT(0) +#define SUN8I_A83T_THS_INTC_ALARM_INT_EN1 BIT(1) +#define SUN8I_A83T_THS_INTC_ALARM_INT_EN2 BIT(2) #define SUN8I_H3_THS_INTC_SHUT_INT_EN0 BIT(4) +#define SUN8I_A83T_THS_INTC_SHUT_INT_EN1 BIT(5) +#define SUN8I_A83T_THS_INTC_SHUT_INT_EN2 BIT(6) #define SUN8I_H3_THS_INTC_TDATA_IRQ_EN0 BIT(8) +#define SUN8I_A83T_THS_INTC_TDATA_IRQ_EN1 BIT(9) +#define SUN8I_A83T_THS_INTC_TDATA_IRQ_EN2 BIT(10) #define MAX_SENSOR_COUNT 4
This patch adds support for the A83T ths sensor. The A83T supports interrupts. The interrupt is configured to update the the sensor values every second. Signed-off-by: Philipp Rossak <embed3d@gmail.com> --- drivers/iio/adc/sun4i-gpadc-iio.c | 38 ++++++++++++++++++++++++++++++++++++++ include/linux/mfd/sun4i-gpadc.h | 18 ++++++++++++++++++ 2 files changed, 56 insertions(+)