iio:adc:ad7280a Cleanup and proposed staging graduation.
Subsystems (5)
Jonathan Cameron
maintainerv3 cover iio:adc:ad7280a Cleanup and proposed staging graduation.
From: Jonathan Cameron <[email protected]>
Changes since v2:
All in response to Marcelo Schmitt doing a really detailed review and testing against the QEMU model.
- Moved elements of patch 2 to patch 5 to avoid missing defines.
- Patch 6: Amend ordering to avoid updated software cached values until the hardware write has succeeded.
- Patch 12 Fixed wrong callbacks in no_irq case
- Patch 14: Changed all numeric properties to u32 to avoid needing to specify bit depth in dts.
- Patch 14: Typo fix.
- Patch 15: New Patch to drop the handling of partial aux alert channels as it is buggy (and always was). Anyone wanting to bring this back will hopefully have hardware to test as it will be fiddly.
- Patch 15 (old number, now 16). Update dt bindings to drop the adi,temp-alert-last-chan given new patch 15 drops the support.
- New Patch 18: Change cb_mask software cache to not include the offset of 2 and instead apply that only when writing the registers.
- New Patch 19: More conservative timings to allow 105 degree Centigrade operation.
- Patch 20 is moving the new code so obviously all the above apply to that as well!
Hi All,
This one proved an interesting diversion.
Work done against a somewhat hacked up QEMU emulation of 3 daisy chained ad7280a devices (18 channels). Note that the emulation isn't complete but does do chaining, CRC, and readout of channels etc in a fashion that worked with the original driver (up to the bug in patch 1) and continues to work with the updated version. I've not intention to upstream the emulation (as would need to make it more completed and flexible), but happy to share it with anyone who is interested.
I briefly flirted with posting a patch to just drop the driver entirely, but the part is still available and it looked like fun + isn't going to greatly impact maintainability of the subsystem long term so is low cost even if it becomes unavailable sometime soon.
There are lots of things we could do after this set to improved the driver and make things more flexible, but it should basically 'just work'
Anyhow, as normal for staging graduations, last patch has rename detection turned off so that people can easily see what I am proposing we move out of staging.
All comments welcome and thanks to Marcelo for reviewing this beast!
Thanks,
Jonathan
Jonathan Cameron (20):
staging:iio:adc:ad7280a: Fix handing of device address bit reversing. staging:iio:adc:ad7280a: Register define cleanup. staging:iio:adc:ad7280a: rename _read() to _read_reg() staging:iio:adc:ad7280a: Split buff[2] into tx and rx parts staging:iio:adc:ad7280a: Use bitfield ops to managed fields in
transfers.
staging:iio:adc:ad7280a: Switch to standard event control staging:iio:adc:ad7280a: Standardize extended ABI naming staging:iio:adc:ad7280a: Drop unused timestamp channel. staging:iio:adc:ad7280a: Trivial comment formatting cleanup staging:iio:adc:ad7280a: Make oversampling_ratio a runtime control staging:iio:adc:ad7280a: Cleanup includes staging:iio:ad7280a: Reflect optionality of irq in ABI staging:iio:adc:ad7280a: Use a local dev pointer to avoid &spi->dev staging:iio:adc:ad7280a: Use device properties to replace platform
data.
staging:iio:adc:ad7280a: Drop buggy support for early termination of
AUX alert.
dt-bindings:iio:adc:ad7280a: Add binding
iio:adc:ad7280a: Document ABI for cell balance switches staging:iio:adc:ad7280a: Remove shift from cb_mask state cache. staging:iio:adc:ad7280a: Use more conservative delays to allow 105C
operation.
iio:adc:ad7280a: Move out of staging
.../ABI/testing/sysfs-bus-iio-adc-ad7280a | 13 + .../bindings/iio/adc/adi,ad7280a.yaml | 77 ++ drivers/iio/adc/Kconfig | 11 + drivers/iio/adc/Makefile | 1 + drivers/iio/adc/ad7280a.c | 1111 +++++++++++++++++ drivers/staging/iio/adc/Kconfig | 11 - drivers/staging/iio/adc/Makefile | 1 - drivers/staging/iio/adc/ad7280a.c | 1044 ---------------- drivers/staging/iio/adc/ad7280a.h | 37 - 9 files changed, 1213 insertions(+), 1093 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-adc-ad7280a create mode 100644 Documentation/devicetree/bindings/iio/adc/adi,ad7280a.yaml create mode 100644 drivers/iio/adc/ad7280a.c delete mode 100644 drivers/staging/iio/adc/ad7280a.c delete mode 100644 drivers/staging/iio/adc/ad7280a.h
Signature · 1 line
2.35.1
Jonathan Cameron
maintainerPATCH v3 1/20 staging:iio:adc:ad7280a: Fix handing of device address bit reversing.
From: Jonathan Cameron <[email protected]>
The bit reversal was wrong for bits 1 and 3 of the 5 bits. Result is driver failure to probe if you have more than 2 daisy-chained devices. Discovered via QEMU based device emulation.
Fixes tag is for when this moved from a macro to a function, but it was broken before that.
Signed-off-by Jonathan Cameron <[email protected]>
Fixes 065a7c0b1fec ("Staging: iio: adc: ad7280a.c: Fixed Macro argument reuse")
Reviewed-by Marcelo Schmitt <[email protected]>
--- drivers/staging/iio/adc/ad7280a.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/iio/adc/ad7280a.c +2 -2
@@ -107,9 +107,9 @@static unsigned int ad7280a_devaddr (unsigned int addr) {return ((addr &0x1 ) <<4 ) | - ((addr &0x2 ) <<3 ) | + ((addr &0x2 ) <<2 ) | (addr &0x4 ) | - ((addr &0x8 ) >>3 ) | + ((addr &0x8 ) >>2 ) | ((addr &0x10 ) >>4 ); }
Signature · 1 line
2.35.1
Jonathan Cameron
maintainerPATCH v3 2/20 staging:iio:adc:ad7280a: Register define cleanup.
In reply to Jonathan CameronFrom: Jonathan Cameron <[email protected]>
1. Postfix register addresses with _REG to distinguish them from fields within the registers
2. Switch to using FIELD_PREP and masks to aid readability.
3. Shorten a few defines to make the lines remain a sensible length.
4. Fix an issue whether where an CTRL_LB field is set in CTRL_HB.
5. Fix wrong AUX1_3_4 which should be AUX_1_3_5 according to table 14 in the datasheet.
Signed-off-by Jonathan Cameron <[email protected]>
Reviewed-by Marcelo Schmitt <[email protected]>
--- drivers/staging/iio/adc/ad7280a.c | 285 ++++++++++++++++-------------- 1 file changed, 154 insertions(+), 131 deletions(-)
drivers/staging/iio/adc/ad7280a.c +154 -131
@@ -11,6 +11,7 @@#include <linux/slab.h> #include <linux/sysfs.h> #include <linux/spi/spi.h> +#include <linux/bitfield.h> #include <linux/err.h> #include <linux/delay.h> #include <linux/interrupt.h>
@@ -23,78 +24,86 @@#include "ad7280a.h" /* Registers */ -#define AD7280A_CELL_VOLTAGE_1 0x0/* D11 to D0, Read only */ -#define AD7280A_CELL_VOLTAGE_2 0x1/* D11 to D0, Read only */ -#define AD7280A_CELL_VOLTAGE_3 0x2/* D11 to D0, Read only */ -#define AD7280A_CELL_VOLTAGE_4 0x3/* D11 to D0, Read only */ -#define AD7280A_CELL_VOLTAGE_5 0x4/* D11 to D0, Read only */ -#define AD7280A_CELL_VOLTAGE_6 0x5/* D11 to D0, Read only */ -#define AD7280A_AUX_ADC_1 0x6/* D11 to D0, Read only */ -#define AD7280A_AUX_ADC_2 0x7/* D11 to D0, Read only */ -#define AD7280A_AUX_ADC_3 0x8/* D11 to D0, Read only */ -#define AD7280A_AUX_ADC_4 0x9/* D11 to D0, Read only */ -#define AD7280A_AUX_ADC_5 0xA/* D11 to D0, Read only */ -#define AD7280A_AUX_ADC_6 0xB/* D11 to D0, Read only */ -#define AD7280A_SELF_TEST 0xC/* D11 to D0, Read only */ -#define AD7280A_CONTROL_HB 0xD/* D15 to D8, Read/write */ -#define AD7280A_CONTROL_LB 0xE/* D7 to D0, Read/write */ -#define AD7280A_CELL_OVERVOLTAGE 0xF/* D7 to D0, Read/write */ -#define AD7280A_CELL_UNDERVOLTAGE 0x10/* D7 to D0, Read/write */ -#define AD7280A_AUX_ADC_OVERVOLTAGE 0x11/* D7 to D0, Read/write */ -#define AD7280A_AUX_ADC_UNDERVOLTAGE 0x12/* D7 to D0, Read/write */ -#define AD7280A_ALERT 0x13/* D7 to D0, Read/write */ -#define AD7280A_CELL_BALANCE 0x14/* D7 to D0, Read/write */ -#define AD7280A_CB1_TIMER 0x15/* D7 to D0, Read/write */ -#define AD7280A_CB2_TIMER 0x16/* D7 to D0, Read/write */ -#define AD7280A_CB3_TIMER 0x17/* D7 to D0, Read/write */ -#define AD7280A_CB4_TIMER 0x18/* D7 to D0, Read/write */ -#define AD7280A_CB5_TIMER 0x19/* D7 to D0, Read/write */ -#define AD7280A_CB6_TIMER 0x1A/* D7 to D0, Read/write */ -#define AD7280A_PD_TIMER 0x1B/* D7 to D0, Read/write */ -#define AD7280A_READ 0x1C/* D7 to D0, Read/write */ -#define AD7280A_CNVST_CONTROL 0x1D/* D7 to D0, Read/write */ - -/* Bits and Masks */ -#define AD7280A_CTRL_HB_CONV_INPUT_ALL 0 -#define AD7280A_CTRL_HB_CONV_INPUT_6CELL_AUX1_3_4 BIT(6) -#define AD7280A_CTRL_HB_CONV_INPUT_6CELL BIT(7) -#define AD7280A_CTRL_HB_CONV_INPUT_SELF_TEST (BIT(7) | BIT(6)) -#define AD7280A_CTRL_HB_CONV_RES_READ_ALL 0 -#define AD7280A_CTRL_HB_CONV_RES_READ_6CELL_AUX1_3_4 BIT(4) -#define AD7280A_CTRL_HB_CONV_RES_READ_6CELL BIT(5) -#define AD7280A_CTRL_HB_CONV_RES_READ_NO (BIT(5) | BIT(4)) -#define AD7280A_CTRL_HB_CONV_START_CNVST 0 -#define AD7280A_CTRL_HB_CONV_START_CS BIT(3) -#define AD7280A_CTRL_HB_CONV_AVG_DIS 0 -#define AD7280A_CTRL_HB_CONV_AVG_2 BIT(1) -#define AD7280A_CTRL_HB_CONV_AVG_4 BIT(2) -#define AD7280A_CTRL_HB_CONV_AVG_8 (BIT(2) | BIT(1)) -#define AD7280A_CTRL_HB_CONV_AVG (x) ((x) << 1) -#define AD7280A_CTRL_HB_PWRDN_SW BIT(0) - -#define AD7280A_CTRL_LB_SWRST BIT(7) -#define AD7280A_CTRL_LB_ACQ_TIME_400ns 0 -#define AD7280A_CTRL_LB_ACQ_TIME_800ns BIT(5) -#define AD7280A_CTRL_LB_ACQ_TIME_1200ns BIT(6) -#define AD7280A_CTRL_LB_ACQ_TIME_1600ns (BIT(6) | BIT(5)) -#define AD7280A_CTRL_LB_ACQ_TIME (x) ((x) << 5) -#define AD7280A_CTRL_LB_MUST_SET BIT(4) -#define AD7280A_CTRL_LB_THERMISTOR_EN BIT(3) -#define AD7280A_CTRL_LB_LOCK_DEV_ADDR BIT(2) -#define AD7280A_CTRL_LB_INC_DEV_ADDR BIT(1) -#define AD7280A_CTRL_LB_DAISY_CHAIN_RB_EN BIT(0) - -#define AD7280A_ALERT_GEN_STATIC_HIGH BIT(6) -#define AD7280A_ALERT_RELAY_SIG_CHAIN_DOWN (BIT(7) | BIT(6)) +#define AD7280A_CELL_VOLTAGE_1_REG 0x0/* D11 to D0, Read only */ +#define AD7280A_CELL_VOLTAGE_2_REG 0x1/* D11 to D0, Read only */ +#define AD7280A_CELL_VOLTAGE_3_REG 0x2/* D11 to D0, Read only */ +#define AD7280A_CELL_VOLTAGE_4_REG 0x3/* D11 to D0, Read only */ +#define AD7280A_CELL_VOLTAGE_5_REG 0x4/* D11 to D0, Read only */ +#define AD7280A_CELL_VOLTAGE_6_REG 0x5/* D11 to D0, Read only */ +#define AD7280A_AUX_ADC_1_REG 0x6/* D11 to D0, Read only */ +#define AD7280A_AUX_ADC_2_REG 0x7/* D11 to D0, Read only */ +#define AD7280A_AUX_ADC_3_REG 0x8/* D11 to D0, Read only */ +#define AD7280A_AUX_ADC_4_REG 0x9/* D11 to D0, Read only */ +#define AD7280A_AUX_ADC_5_REG 0xA/* D11 to D0, Read only */ +#define AD7280A_AUX_ADC_6_REG 0xB/* D11 to D0, Read only */ +#define AD7280A_SELF_TEST_REG 0xC/* D11 to D0, Read only */ + +#define AD7280A_CTRL_HB_REG 0xD/* D15 to D8, Read/write */ +#define AD7280A_CTRL_HB_CONV_INPUT_MSK GENMASK(7, 6) +#define AD7280A_CTRL_HB_CONV_INPUT_ALL 0 +#define AD7280A_CTRL_HB_CONV_INPUT_6CELL_AUX1_3_5 1 +#define AD7280A_CTRL_HB_CONV_INPUT_6CELL 2 +#define AD7280A_CTRL_HB_CONV_INPUT_SELF_TEST 3 +#define AD7280A_CTRL_HB_CONV_RREAD_MSK GENMASK(5, 4) +#define AD7280A_CTRL_HB_CONV_RREAD_ALL 0 +#define AD7280A_CTRL_HB_CONV_RREAD_6CELL_AUX1_3_5 1 +#define AD7280A_CTRL_HB_CONV_RREAD_6CELL 2 +#define AD7280A_CTRL_HB_CONV_RREAD_NO 3 +#define AD7280A_CTRL_HB_CONV_START_MSK BIT(3) +#define AD7280A_CTRL_HB_CONV_START_CNVST 0 +#define AD7280A_CTRL_HB_CONV_START_CS 1 +#define AD7280A_CTRL_HB_CONV_AVG_MSK GENMASK(2, 1) +#define AD7280A_CTRL_HB_CONV_AVG_DIS 0 +#define AD7280A_CTRL_HB_CONV_AVG_2 1 +#define AD7280A_CTRL_HB_CONV_AVG_4 2 +#define AD7280A_CTRL_HB_CONV_AVG_8 3 +#define AD7280A_CTRL_HB_PWRDN_SW BIT(0) + +#define AD7280A_CTRL_LB_REG 0xE/* D7 to D0, Read/write */ +#define AD7280A_CTRL_LB_SWRST_MSK BIT(7) +#define AD7280A_CTRL_LB_ACQ_TIME_MSK GENMASK(6, 5) +#define AD7280A_CTRL_LB_ACQ_TIME_400ns 0 +#define AD7280A_CTRL_LB_ACQ_TIME_800ns 1 +#define AD7280A_CTRL_LB_ACQ_TIME_1200ns 2 +#define AD7280A_CTRL_LB_ACQ_TIME_1600ns 3 +#define AD7280A_CTRL_LB_MUST_SET BIT(4) +#define AD7280A_CTRL_LB_THERMISTOR_MSK BIT(3) +#define AD7280A_CTRL_LB_LOCK_DEV_ADDR_MSK BIT(2) +#define AD7280A_CTRL_LB_INC_DEV_ADDR_MSK BIT(1) +#define AD7280A_CTRL_LB_DAISY_CHAIN_RB_MSK BIT(0) + +#define AD7280A_CELL_OVERVOLTAGE_REG 0xF/* D7 to D0, Read/write */ +#define AD7280A_CELL_UNDERVOLTAGE_REG 0x10/* D7 to D0, Read/write */ +#define AD7280A_AUX_ADC_OVERVOLTAGE_REG 0x11/* D7 to D0, Read/write */ +#define AD7280A_AUX_ADC_UNDERVOLTAGE_REG 0x12/* D7 to D0, Read/write */ + +#define AD7280A_ALERT_REG 0x13/* D7 to D0, Read/write */ +#define AD7280A_ALERT_GEN_STATIC_HIGH BIT(6) +#define AD7280A_ALERT_RELAY_SIG_CHAIN_DOWN (BIT(7) | BIT(6)) + +#define AD7280A_CELL_BALANCE_REG 0x14/* D7 to D0, Read/write */ +#define AD7280A_CB1_TIMER_REG 0x15/* D7 to D0, Read/write */ +#define AD7280A_CB_TIMER_VAL_MSK GENMASK(7, 3) +#define AD7280A_CB2_TIMER_REG 0x16/* D7 to D0, Read/write */ +#define AD7280A_CB3_TIMER_REG 0x17/* D7 to D0, Read/write */ +#define AD7280A_CB4_TIMER_REG 0x18/* D7 to D0, Read/write */ +#define AD7280A_CB5_TIMER_REG 0x19/* D7 to D0, Read/write */ +#define AD7280A_CB6_TIMER_REG 0x1A/* D7 to D0, Read/write */ +#define AD7280A_PD_TIMER_REG 0x1B/* D7 to D0, Read/write */ +#define AD7280A_READ_REG 0x1C/* D7 to D0, Read/write */ +#define AD7280A_READ_ADDR_MSK GENMASK(7, 2) +#define AD7280A_CNVST_CTRL_REG 0x1D/* D7 to D0, Read/write */ + +/* Magic value used to indicate this special case */ #define AD7280A_ALL_CELLS (0xAD << 16)#define AD7280A_MAX_SPI_CLK_HZ 700000/* < 1MHz */ #define AD7280A_MAX_CHAIN 8#define AD7280A_CELLS_PER_DEV 6#define AD7280A_BITS 12 -#define AD7280A_NUM_CH (AD7280A_AUX_ADC_6 - \ - AD7280A_CELL_VOLTAGE_1 + 1) +#define AD7280A_NUM_CH (AD7280A_AUX_ADC_6_REG - \ + AD7280A_CELL_VOLTAGE_1_REG + 1)#define AD7280A_CALC_VOLTAGE_CHAN_NUM (d, c) (((d) * AD7280A_CELLS_PER_DEV) + \ (c))
@@ -222,23 +231,28 @@ static int ad7280_read(struct ad7280_state *st, unsigned int devaddr,unsigned int tmp;/* turns off the read operation on all parts */ - ret =ad7280_write (st,AD7280A_DEVADDR_MASTER ,AD7280A_CONTROL_HB ,1 , -AD7280A_CTRL_HB_CONV_INPUT_ALL | -AD7280A_CTRL_HB_CONV_RES_READ_NO | + ret =ad7280_write (st,AD7280A_DEVADDR_MASTER ,AD7280A_CTRL_HB_REG ,1 , +FIELD_PREP (AD7280A_CTRL_HB_CONV_INPUT_MSK , +AD7280A_CTRL_HB_CONV_INPUT_ALL ) | +FIELD_PREP (AD7280A_CTRL_HB_CONV_RREAD_MSK , +AD7280A_CTRL_HB_CONV_RREAD_NO ) | st->ctrl_hb);if (ret)return ret;/* turns on the read operation on the addressed part */ - ret =ad7280_write (st, devaddr,AD7280A_CONTROL_HB ,0 , -AD7280A_CTRL_HB_CONV_INPUT_ALL | -AD7280A_CTRL_HB_CONV_RES_READ_ALL | + ret =ad7280_write (st, devaddr,AD7280A_CTRL_HB_REG ,0 , +FIELD_PREP (AD7280A_CTRL_HB_CONV_INPUT_MSK , +AD7280A_CTRL_HB_CONV_INPUT_ALL ) | +FIELD_PREP (AD7280A_CTRL_HB_CONV_RREAD_MSK , +AD7280A_CTRL_HB_CONV_RREAD_ALL ) | st->ctrl_hb);if (ret)return ret;/* Set register address on the part to be read from */ - ret =ad7280_write (st, devaddr,AD7280A_READ ,0 , addr <<2 ); + ret =ad7280_write (st, devaddr,AD7280A_READ_REG ,0 , +FIELD_PREP (AD7280A_READ_ADDR_MSK , addr));if (ret)return ret;
@@ -261,21 +275,27 @@ static int ad7280_read_channel(struct ad7280_state *st, unsigned int devaddr,int ret;unsigned int tmp; - ret =ad7280_write (st, devaddr,AD7280A_READ ,0 , addr <<2 ); + ret =ad7280_write (st, devaddr,AD7280A_READ_REG ,0 , +FIELD_PREP (AD7280A_READ_ADDR_MSK , addr));if (ret)return ret; - ret =ad7280_write (st,AD7280A_DEVADDR_MASTER ,AD7280A_CONTROL_HB ,1 , -AD7280A_CTRL_HB_CONV_INPUT_ALL | -AD7280A_CTRL_HB_CONV_RES_READ_NO | + ret =ad7280_write (st,AD7280A_DEVADDR_MASTER ,AD7280A_CTRL_HB_REG ,1 , +FIELD_PREP (AD7280A_CTRL_HB_CONV_INPUT_MSK , +AD7280A_CTRL_HB_CONV_INPUT_ALL ) | +FIELD_PREP (AD7280A_CTRL_HB_CONV_RREAD_MSK , +AD7280A_CTRL_HB_CONV_RREAD_NO ) | st->ctrl_hb);if (ret)return ret; - ret =ad7280_write (st, devaddr,AD7280A_CONTROL_HB ,0 , -AD7280A_CTRL_HB_CONV_INPUT_ALL | -AD7280A_CTRL_HB_CONV_RES_READ_ALL | -AD7280A_CTRL_HB_CONV_START_CS | + ret =ad7280_write (st, devaddr,AD7280A_CTRL_HB_REG ,0 , +FIELD_PREP (AD7280A_CTRL_HB_CONV_INPUT_MSK , +AD7280A_CTRL_HB_CONV_INPUT_ALL ) | +FIELD_PREP (AD7280A_CTRL_HB_CONV_RREAD_MSK , +AD7280A_CTRL_HB_CONV_RREAD_ALL ) | +FIELD_PREP (AD7280A_CTRL_HB_CONV_START_MSK , +AD7280A_CTRL_HB_CONV_START_CS ) | st->ctrl_hb);if (ret)return ret;
@@ -301,15 +321,18 @@ static int ad7280_read_all_channels(struct ad7280_state *st, unsigned int cnt,int i, ret;unsigned int tmp, sum =0 ; - ret =ad7280_write (st,AD7280A_DEVADDR_MASTER ,AD7280A_READ ,1 , -AD7280A_CELL_VOLTAGE_1 <<2 ); + ret =ad7280_write (st,AD7280A_DEVADDR_MASTER ,AD7280A_READ_REG ,1 , +AD7280A_CELL_VOLTAGE_1_REG <<2 );if (ret)return ret; - ret =ad7280_write (st,AD7280A_DEVADDR_MASTER ,AD7280A_CONTROL_HB ,1 , -AD7280A_CTRL_HB_CONV_INPUT_ALL | -AD7280A_CTRL_HB_CONV_RES_READ_ALL | -AD7280A_CTRL_HB_CONV_START_CS | + ret =ad7280_write (st,AD7280A_DEVADDR_MASTER ,AD7280A_CTRL_HB_REG ,1 , +FIELD_PREP (AD7280A_CTRL_HB_CONV_INPUT_MSK , +AD7280A_CTRL_HB_CONV_INPUT_ALL ) | +FIELD_PREP (AD7280A_CTRL_HB_CONV_RREAD_MSK , +AD7280A_CTRL_HB_CONV_RREAD_ALL ) | +FIELD_PREP (AD7280A_CTRL_HB_CONV_START_MSK , +AD7280A_CTRL_HB_CONV_START_CS ) | st->ctrl_hb);if (ret)return ret;
@@ -327,7 +350,7 @@ static int ad7280_read_all_channels(struct ad7280_state *st, unsigned int cnt,if (array) array[i] = tmp;/* only sum cell voltages */ -if (((tmp >>23 ) &0xF ) <=AD7280A_CELL_VOLTAGE_6 ) +if (((tmp >>23 ) &0xF ) <=AD7280A_CELL_VOLTAGE_6_REG ) sum += ((tmp >>11 ) &0xFFF ); }
@@ -338,7 +361,7 @@ static void ad7280_sw_power_down(void *data) {struct ad7280_state *st = data; -ad7280_write (st,AD7280A_DEVADDR_MASTER ,AD7280A_CONTROL_HB ,1 , +ad7280_write (st,AD7280A_DEVADDR_MASTER ,AD7280A_CTRL_HB_REG ,1 ,AD7280A_CTRL_HB_PWRDN_SW | st->ctrl_hb); }
@@ -347,25 +370,26 @@ static int ad7280_chain_setup(struct ad7280_state *st)unsigned int val, n;int ret; - ret =ad7280_write (st,AD7280A_DEVADDR_MASTER ,AD7280A_CONTROL_LB ,1 , -AD7280A_CTRL_LB_DAISY_CHAIN_RB_EN | -AD7280A_CTRL_LB_LOCK_DEV_ADDR | + ret =ad7280_write (st,AD7280A_DEVADDR_MASTER ,AD7280A_CTRL_LB_REG ,1 , +FIELD_PREP (AD7280A_CTRL_LB_DAISY_CHAIN_RB_MSK ,1 ) | +FIELD_PREP (AD7280A_CTRL_LB_LOCK_DEV_ADDR_MSK ,1 ) |AD7280A_CTRL_LB_MUST_SET | -AD7280A_CTRL_LB_SWRST | +FIELD_PREP (AD7280A_CTRL_LB_SWRST_MSK ,1 ) | st->ctrl_lb);if (ret)return ret; - ret =ad7280_write (st,AD7280A_DEVADDR_MASTER ,AD7280A_CONTROL_LB ,1 , -AD7280A_CTRL_LB_DAISY_CHAIN_RB_EN | -AD7280A_CTRL_LB_LOCK_DEV_ADDR | + ret =ad7280_write (st,AD7280A_DEVADDR_MASTER ,AD7280A_CTRL_LB_REG ,1 , +FIELD_PREP (AD7280A_CTRL_LB_DAISY_CHAIN_RB_MSK ,1 ) | +FIELD_PREP (AD7280A_CTRL_LB_LOCK_DEV_ADDR_MSK ,1 ) |AD7280A_CTRL_LB_MUST_SET | +FIELD_PREP (AD7280A_CTRL_LB_SWRST_MSK ,0 ) | st->ctrl_lb);if (ret) goto error_power_down; - ret =ad7280_write (st,AD7280A_DEVADDR_MASTER ,AD7280A_READ ,1 , -AD7280A_CONTROL_LB <<2 ); + ret =ad7280_write (st,AD7280A_DEVADDR_MASTER ,AD7280A_READ_REG ,1 , +FIELD_PREP (AD7280A_READ_ADDR_MSK ,AD7280A_CTRL_LB_REG ));if (ret) goto error_power_down;
@@ -390,7 +414,7 @@ static int ad7280_chain_setup(struct ad7280_state *st) ret = -EFAULT ; error_power_down: -ad7280_write (st,AD7280A_DEVADDR_MASTER ,AD7280A_CONTROL_HB ,1 , +ad7280_write (st,AD7280A_DEVADDR_MASTER ,AD7280A_CTRL_HB_REG ,1 ,AD7280A_CTRL_HB_PWRDN_SW | st->ctrl_hb);return ret;
@@ -434,7 +458,7 @@ static ssize_t ad7280_store_balance_sw(struct device *dev,else st->cb_mask[devaddr] &= ~(1 << (ch +2 )); - ret =ad7280_write (st, devaddr,AD7280A_CELL_BALANCE , + ret =ad7280_write (st, devaddr,AD7280A_CELL_BALANCE_REG ,0 , st->cb_mask[devaddr]);mutex_unlock (&st->lock);
@@ -459,7 +483,7 @@ static ssize_t ad7280_show_balance_timer(struct device *dev,if (ret <0 )return ret; - msecs = (ret >>3 ) *71500 ; + msecs =FIELD_GET (AD7280A_CB_TIMER_VAL_MSK , ret) *71500 ;return sprintf (buf,"%u\n" , msecs); }
@@ -486,8 +510,8 @@ static ssize_t ad7280_store_balance_timer(struct device *dev,mutex_lock (&st->lock); ret =ad7280_write (st, this_attr->address >>8 , - this_attr->address &0xFF , -0 , (val &0x1F ) <<3 ); + this_attr->address &0xFF ,0 , +FIELD_PREP (AD7280A_CB_TIMER_VAL_MSK , val));mutex_unlock (&st->lock);return ret ? ret : len;
@@ -559,10 +583,10 @@ static void ad7280_init_dev_channels(struct ad7280_state *st, int dev, int *cnt)int addr, ch, i;struct iio_chan_spec *chan; -for (ch =AD7280A_CELL_VOLTAGE_1 ; ch <=AD7280A_AUX_ADC_6 ; ch++) { +for (ch =AD7280A_CELL_VOLTAGE_1_REG ; ch <=AD7280A_AUX_ADC_6_REG ; ch++) { chan = &st->channels[*cnt]; -if (ch <AD7280A_AUX_ADC_1 ) { +if (ch <AD7280A_AUX_ADC_1_REG ) { i =AD7280A_CALC_VOLTAGE_CHAN_NUM (dev, ch);ad7280_voltage_channel_init (chan, i); }else {
@@ -634,7 +658,7 @@ static int ad7280_init_dev_attrs(struct ad7280_state *st, int dev, int *cnt)struct iio_dev_attr *iio_attr;struct device *sdev = &st->spi->dev; -for (ch =AD7280A_CELL_VOLTAGE_1 ; ch <=AD7280A_CELL_VOLTAGE_6 ; ch++) { +for (ch =AD7280A_CELL_VOLTAGE_1_REG ; ch <=AD7280A_CELL_VOLTAGE_6_REG ; ch++) { iio_attr = &st->iio_attr[*cnt]; addr =ad7280a_devaddr (dev) <<8 | ch; i = dev *AD7280A_CELLS_PER_DEV + ch;
@@ -647,7 +671,7 @@ static int ad7280_init_dev_attrs(struct ad7280_state *st, int dev, int *cnt) (*cnt)++; iio_attr = &st->iio_attr[*cnt]; - addr =ad7280a_devaddr (dev) <<8 | (AD7280A_CB1_TIMER + ch); + addr =ad7280a_devaddr (dev) <<8 | (AD7280A_CB1_TIMER_REG + ch); ret =ad7280_balance_timer_attr_init (iio_attr, sdev, addr, i);if (ret <0 )
@@ -691,16 +715,16 @@ static ssize_t ad7280_read_channel_config(struct device *dev,unsigned int val;switch (this_attr->address) { -case AD7280A_CELL_OVERVOLTAGE : +case AD7280A_CELL_OVERVOLTAGE_REG : val =1000 + (st->cell_threshhigh *1568 ) /100 ;break ; -case AD7280A_CELL_UNDERVOLTAGE : +case AD7280A_CELL_UNDERVOLTAGE_REG : val =1000 + (st->cell_threshlow *1568 ) /100 ;break ; -case AD7280A_AUX_ADC_OVERVOLTAGE : +case AD7280A_AUX_ADC_OVERVOLTAGE_REG : val = (st->aux_threshhigh *196 ) /10 ;break ; -case AD7280A_AUX_ADC_UNDERVOLTAGE : +case AD7280A_AUX_ADC_UNDERVOLTAGE_REG : val = (st->aux_threshlow *196 ) /10 ;break ;default :
@@ -727,12 +751,12 @@ static ssize_t ad7280_write_channel_config(struct device *dev,return ret;switch (this_attr->address) { -case AD7280A_CELL_OVERVOLTAGE : -case AD7280A_CELL_UNDERVOLTAGE : +case AD7280A_CELL_OVERVOLTAGE_REG : +case AD7280A_CELL_UNDERVOLTAGE_REG : val = ((val -1000 ) *100 ) /1568 ;/* LSB 15.68mV */ break ; -case AD7280A_AUX_ADC_OVERVOLTAGE : -case AD7280A_AUX_ADC_UNDERVOLTAGE : +case AD7280A_AUX_ADC_OVERVOLTAGE_REG : +case AD7280A_AUX_ADC_UNDERVOLTAGE_REG : val = (val *10 ) /196 ;/* LSB 19.6mV */ break ;default :
@@ -743,16 +767,16 @@ static ssize_t ad7280_write_channel_config(struct device *dev,mutex_lock (&st->lock);switch (this_attr->address) { -case AD7280A_CELL_OVERVOLTAGE : +case AD7280A_CELL_OVERVOLTAGE_REG : st->cell_threshhigh = val;break ; -case AD7280A_CELL_UNDERVOLTAGE : +case AD7280A_CELL_UNDERVOLTAGE_REG : st->cell_threshlow = val;break ; -case AD7280A_AUX_ADC_OVERVOLTAGE : +case AD7280A_AUX_ADC_OVERVOLTAGE_REG : st->aux_threshhigh = val;break ; -case AD7280A_AUX_ADC_UNDERVOLTAGE : +case AD7280A_AUX_ADC_UNDERVOLTAGE_REG : st->aux_threshlow = val;break ; }
@@ -781,7 +805,7 @@ static irqreturn_t ad7280_event_handler(int irq, void *private) goto out;for (i =0 ; i < st->scan_cnt; i++) { -if (((channels[i] >>23 ) &0xF ) <=AD7280A_CELL_VOLTAGE_6 ) { +if (((channels[i] >>23 ) &0xF ) <=AD7280A_CELL_VOLTAGE_6_REG ) {if (((channels[i] >>11 ) &0xFFF ) >= st->cell_threshhigh) { u64 tmp = IIO_EVENT_CODE(IIO_VOLTAGE, 1, 0,
@@ -801,7 +825,7 @@ static irqreturn_t ad7280_event_handler(int irq, void *private) } }else {if (((channels[i] >>11 ) &0xFFF ) >= - st->aux_threshhigh) { + st->aux_threshhigh) {u64 tmp =IIO_UNMOD_EVENT_CODE (IIO_TEMP ,0 ,IIO_EV_TYPE_THRESH ,IIO_EV_DIR_RISING );
@@ -833,26 +857,26 @@ static IIO_DEVICE_ATTR_NAMED(in_thresh_low_value,0644 , ad7280_read_channel_config, ad7280_write_channel_config, - AD7280A_CELL_UNDERVOLTAGE); + AD7280A_CELL_UNDERVOLTAGE_REG); static IIO_DEVICE_ATTR_NAMED(in_thresh_high_value, in_voltage-voltage_thresh_high_value,0644 , ad7280_read_channel_config, ad7280_write_channel_config, - AD7280A_CELL_OVERVOLTAGE); + AD7280A_CELL_OVERVOLTAGE_REG); static IIO_DEVICE_ATTR(in_temp_thresh_low_value,0644 , ad7280_read_channel_config, ad7280_write_channel_config, - AD7280A_AUX_ADC_UNDERVOLTAGE); + AD7280A_AUX_ADC_UNDERVOLTAGE_REG); static IIO_DEVICE_ATTR(in_temp_thresh_high_value,0644 , ad7280_read_channel_config, ad7280_write_channel_config, - AD7280A_AUX_ADC_OVERVOLTAGE); + AD7280A_AUX_ADC_OVERVOLTAGE_REG);static struct attribute *ad7280_event_attributes[] = { &iio_dev_attr_in_thresh_low_value.dev_attr.attr,
@@ -892,7 +916,7 @@ static int ad7280_read_raw(struct iio_dev *indio_dev,return IIO_VAL_INT ;case IIO_CHAN_INFO_SCALE : -if ((chan->address &0xFF ) <=AD7280A_CELL_VOLTAGE_6 ) +if ((chan->address &0xFF ) <=AD7280A_CELL_VOLTAGE_6_REG ) *val =4000 ;else *val =5000 ;
@@ -942,10 +966,9 @@ static int ad7280_probe(struct spi_device *spi) st->spi->mode =SPI_MODE_1 ;spi_setup (st->spi); - st->ctrl_lb =AD7280A_CTRL_LB_ACQ_TIME (pdata->acquisition_time &0x3 ); - st->ctrl_hb =AD7280A_CTRL_HB_CONV_AVG (pdata->conversion_averaging - &0x3 ) | (pdata->thermistor_term_en ? -AD7280A_CTRL_LB_THERMISTOR_EN :0 ); + st->ctrl_lb =FIELD_PREP (AD7280A_CTRL_LB_ACQ_TIME_MSK , pdata->acquisition_time) | +FIELD_PREP (AD7280A_CTRL_LB_THERMISTOR_MSK , pdata->thermistor_term_en); + st->ctrl_hb =FIELD_PREP (AD7280A_CTRL_HB_CONV_AVG_MSK , pdata->conversion_averaging); ret =ad7280_chain_setup (st);if (ret <0 )
@@ -998,13 +1021,13 @@ static int ad7280_probe(struct spi_device *spi)if (spi->irq >0 ) { ret =ad7280_write (st,AD7280A_DEVADDR_MASTER , -AD7280A_ALERT ,1 , +AD7280A_ALERT_REG ,1 ,AD7280A_ALERT_RELAY_SIG_CHAIN_DOWN );if (ret)return ret; ret =ad7280_write (st,ad7280a_devaddr (st->slave_num), -AD7280A_ALERT ,0 , +AD7280A_ALERT_REG ,0 ,AD7280A_ALERT_GEN_STATIC_HIGH | (pdata->chain_last_alert_ignore &0xF ));if (ret)
Signature · 1 line
2.35.1
Jonathan Cameron
maintainerPATCH v3 3/20 staging:iio:adc:ad7280a: rename _read() to _read_reg()
In reply to Jonathan CameronFrom: Jonathan Cameron <[email protected]>
This avoids possible confusion with read back of the channel conversions. These two types of reads are of difference sizes with resulting differences in the data layout of the response from the hardware.
Signed-off-by Jonathan Cameron <[email protected]>
Reviewed-by Marcelo Schmitt <[email protected]>
--- drivers/staging/iio/adc/ad7280a.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/staging/iio/adc/ad7280a.c +4 -4
@@ -224,8 +224,8 @@ static int ad7280_write(struct ad7280_state *st, unsigned int devaddr,return spi_write (st->spi, &st->buf[0 ],4 ); } -static int ad7280_read (struct ad7280_state *st,unsigned int devaddr, -unsigned int addr) +static int ad7280_read_reg (struct ad7280_state *st,unsigned int devaddr, +unsigned int addr) {int ret;unsigned int tmp;
@@ -476,8 +476,8 @@ static ssize_t ad7280_show_balance_timer(struct device *dev,unsigned int msecs;mutex_lock (&st->lock); - ret =ad7280_read (st, this_attr->address >>8 , - this_attr->address &0xFF ); + ret =ad7280_read_reg (st, this_attr->address >>8 , + this_attr->address &0xFF );mutex_unlock (&st->lock);if (ret <0 )
Signature · 1 line
2.35.1
Jonathan Cameron
maintainerPATCH v3 4/20 staging:iio:adc:ad7280a: Split buff[2] into tx and rx parts
In reply to Jonathan CameronFrom: Jonathan Cameron <[email protected]>
As the __cacheline_aligned will ensure that the first of these two buffers is appropriate aligned, there is no need to keep them as a single array which is confusing given the first element is always tx and the second rx. Hence let us just have two parts and name them separately.
Signed-off-by Jonathan Cameron <[email protected]>
Reviewed-by Marcelo Schmitt <[email protected]>
--- drivers/staging/iio/adc/ad7280a.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)
drivers/staging/iio/adc/ad7280a.c +9 -8
@@ -153,7 +153,8 @@ struct ad7280_state {unsigned char cb_mask[AD7280A_MAX_CHAIN ];struct mutex lock;/* protect sensor state */ -__be32 buf[2 ]____cacheline_aligned ; +__be32 tx____cacheline_aligned ; +__be32 rx; };static unsigned char ad7280_calc_crc8 (unsigned char *crc_tab,unsigned int val)
@@ -196,18 +197,18 @@ static int __ad7280_read32(struct ad7280_state *st, unsigned int *val) {int ret;struct spi_transfer t = { - .tx_buf = &st->buf[0 ], - .rx_buf = &st->buf[1 ], - .len =4 , + .tx_buf = &st->tx, + .rx_buf = &st->rx, + .len =sizeof (st->tx), }; - st->buf[0 ] =cpu_to_be32 (AD7280A_READ_TXVAL ); + st->tx =cpu_to_be32 (AD7280A_READ_TXVAL ); ret =spi_sync_transfer (st->spi, &t,1 );if (ret)return ret; - *val =be32_to_cpu (st->buf[1 ]); + *val =be32_to_cpu (st->rx);return 0 ; }
@@ -219,9 +220,9 @@ static int ad7280_write(struct ad7280_state *st, unsigned int devaddr, (val &0xFF ) <<13 | all <<12 ; reg |=ad7280_calc_crc8 (st->crc_tab, reg >>11 ) <<3 |0x2 ; - st->buf[0 ] =cpu_to_be32 (reg); + st->tx =cpu_to_be32 (reg); -return spi_write (st->spi, &st->buf[0 ],4 ); +return spi_write (st->spi, &st->tx,sizeof (st->tx)); } static int ad7280_read_reg(struct ad7280_state *st, unsigned int devaddr,
Signature · 1 line
2.35.1
Jonathan Cameron
maintainerPATCH v3 5/20 staging:iio:adc:ad7280a: Use bitfield ops to managed fields in transfers.
In reply to Jonathan CameronFrom: Jonathan Cameron <[email protected]>
The write and two types of read transfer are sufficiently complex that they benefit from the clarity of using FIELD_PREP() and FIELD_GET(). This also applies to the handling in ad7280_event_handler() so use a similar approach there as well.
Signed-off-by Jonathan Cameron <[email protected]>
Reviewed-by Marcelo Schmitt <[email protected]>
--- drivers/staging/iio/adc/ad7280a.c | 64 ++++++++++++++++++++++--------- 1 file changed, 45 insertions(+), 19 deletions(-)
drivers/staging/iio/adc/ad7280a.c +45 -19
@@ -95,6 +95,23 @@#define AD7280A_READ_ADDR_MSK GENMASK(7, 2)#define AD7280A_CNVST_CTRL_REG 0x1D/* D7 to D0, Read/write */ +/* Transfer fields */ +#define AD7280A_TRANS_WRITE_DEVADDR_MSK GENMASK(31, 27) +#define AD7280A_TRANS_WRITE_ADDR_MSK GENMASK(26, 21) +#define AD7280A_TRANS_WRITE_VAL_MSK GENMASK(20, 13) +#define AD7280A_TRANS_WRITE_ALL_MSK BIT(12) +#define AD7280A_TRANS_WRITE_CRC_MSK GENMASK(10, 3) +#define AD7280A_TRANS_WRITE_RES_PATTERN 0x2 + +/* Layouts differ for channel vs other registers */ +#define AD7280A_TRANS_READ_DEVADDR_MSK GENMASK(31, 27) +#define AD7280A_TRANS_READ_CONV_CHANADDR_MSK GENMASK(26, 23) +#define AD7280A_TRANS_READ_CONV_DATA_MSK GENMASK(22, 11) +#define AD7280A_TRANS_READ_REG_REGADDR_MSK GENMASK(26, 21) +#define AD7280A_TRANS_READ_REG_DATA_MSK GENMASK(20, 13) +#define AD7280A_TRANS_READ_WRITE_ACK_MSK BIT(10) +#define AD7280A_TRANS_READ_CRC_MSK GENMASK(9, 2) +/* Magic value used to indicate this special case */ #define AD7280A_ALL_CELLS (0xAD << 16)
@@ -216,10 +233,16 @@ static int __ad7280_read32(struct ad7280_state *st, unsigned int *val)static int ad7280_write (struct ad7280_state *st,unsigned int devaddr,unsigned int addr,bool all,unsigned int val) { -unsigned int reg = devaddr <<27 | addr <<21 | - (val &0xFF ) <<13 | all <<12 ; +unsigned int reg =FIELD_PREP (AD7280A_TRANS_WRITE_DEVADDR_MSK , devaddr) | +FIELD_PREP (AD7280A_TRANS_WRITE_ADDR_MSK , addr) | +FIELD_PREP (AD7280A_TRANS_WRITE_VAL_MSK , val) | +FIELD_PREP (AD7280A_TRANS_WRITE_ALL_MSK , all); + + reg |=FIELD_PREP (AD7280A_TRANS_WRITE_CRC_MSK , +ad7280_calc_crc8 (st->crc_tab, reg >>11 )); +/* Reserved b010 pattern not included crc calc */ + reg |=AD7280A_TRANS_WRITE_RES_PATTERN ; - reg |=ad7280_calc_crc8 (st->crc_tab, reg >>11 ) <<3 |0x2 ; st->tx =cpu_to_be32 (reg);return spi_write (st->spi, &st->tx,sizeof (st->tx));
@@ -264,10 +287,11 @@ static int ad7280_read_reg(struct ad7280_state *st, unsigned int devaddr,if (ad7280_check_crc (st, tmp))return -EIO ; -if (((tmp >>27 ) != devaddr) || (((tmp >>21 ) &0x3F ) != addr)) +if ((FIELD_GET (AD7280A_TRANS_READ_DEVADDR_MSK , tmp) != devaddr) || + (FIELD_GET (AD7280A_TRANS_READ_REG_REGADDR_MSK , tmp) != addr))return -EFAULT ; -return (tmp >>13 ) &0xFF ; +return FIELD_GET (AD7280A_TRANS_READ_REG_DATA_MSK , tmp); } static int ad7280_read_channel(struct ad7280_state *st, unsigned int devaddr,
@@ -310,10 +334,11 @@ static int ad7280_read_channel(struct ad7280_state *st, unsigned int devaddr,if (ad7280_check_crc (st, tmp))return -EIO ; -if (((tmp >>27 ) != devaddr) || (((tmp >>23 ) &0xF ) != addr)) +if ((FIELD_GET (AD7280A_TRANS_READ_DEVADDR_MSK , tmp) != devaddr) || + (FIELD_GET (AD7280A_TRANS_READ_CONV_CHANADDR_MSK , tmp) != addr))return -EFAULT ; -return (tmp >>11 ) &0xFFF ; +return FIELD_GET (AD7280A_TRANS_READ_CONV_DATA_MSK , tmp); } static int ad7280_read_all_channels(struct ad7280_state *st, unsigned int cnt,
@@ -351,8 +376,9 @@ static int ad7280_read_all_channels(struct ad7280_state *st, unsigned int cnt,if (array) array[i] = tmp;/* only sum cell voltages */ -if (((tmp >>23 ) &0xF ) <=AD7280A_CELL_VOLTAGE_6_REG ) - sum += ((tmp >>11 ) &0xFFF ); +if (FIELD_GET (AD7280A_TRANS_READ_CONV_CHANADDR_MSK , tmp) <= +AD7280A_CELL_VOLTAGE_6_REG ) + sum +=FIELD_GET (AD7280A_TRANS_READ_CONV_DATA_MSK , tmp); }return sum;
@@ -407,7 +433,7 @@ static int ad7280_chain_setup(struct ad7280_state *st) goto error_power_down; } -if (n !=ad7280a_devaddr (val >>27 )) { +if (n !=ad7280a_devaddr (FIELD_GET (AD7280A_TRANS_READ_DEVADDR_MSK , val))) { ret = -EIO ; goto error_power_down; }
@@ -806,17 +832,19 @@ static irqreturn_t ad7280_event_handler(int irq, void *private) goto out;for (i =0 ; i < st->scan_cnt; i++) { -if (((channels[i] >>23 ) &0xF ) <=AD7280A_CELL_VOLTAGE_6_REG ) { -if (((channels[i] >>11 ) &0xFFF ) >= - st->cell_threshhigh) { +unsigned int val; + + val =FIELD_GET (AD7280A_TRANS_READ_CONV_DATA_MSK , channels[i]); +if (FIELD_GET (AD7280A_TRANS_READ_CONV_CHANADDR_MSK , channels[i]) <= +AD7280A_CELL_VOLTAGE_6_REG ) { +if (val >= st->cell_threshhigh) {u64 tmp =IIO_EVENT_CODE (IIO_VOLTAGE ,1 ,0 ,IIO_EV_DIR_RISING ,IIO_EV_TYPE_THRESH ,0 ,0 ,0 );iio_push_event (indio_dev, tmp,iio_get_time_ns (indio_dev)); - }else if (((channels[i] >>11 ) &0xFFF ) <= - st->cell_threshlow) { + }else if (val <= st->cell_threshlow) { u64 tmp = IIO_EVENT_CODE(IIO_VOLTAGE, 1, 0, IIO_EV_DIR_FALLING, IIO_EV_TYPE_THRESH,
@@ -825,15 +853,13 @@ static irqreturn_t ad7280_event_handler(int irq, void *private) iio_get_time_ns(indio_dev)); } }else { -if (((channels[i] >>11 ) &0xFFF ) >= - st->aux_threshhigh) { +if (val >= st->aux_threshhigh) {u64 tmp =IIO_UNMOD_EVENT_CODE (IIO_TEMP ,0 ,IIO_EV_TYPE_THRESH ,IIO_EV_DIR_RISING );iio_push_event (indio_dev, tmp,iio_get_time_ns (indio_dev)); - }else if (((channels[i] >>11 ) &0xFFF ) <= - st->aux_threshlow) { + }else if (val <= st->aux_threshlow) {u64 tmp =IIO_UNMOD_EVENT_CODE (IIO_TEMP ,0 ,IIO_EV_TYPE_THRESH ,IIO_EV_DIR_FALLING );
Signature · 1 line
2.35.1
Jonathan Cameron
maintainerPATCH v3 6/20 staging:iio:adc:ad7280a: Switch to standard event control
In reply to Jonathan CameronFrom: Jonathan Cameron <[email protected]>
This driver had a slightly non standard events ABI but there seems to be no reason for not doing it with the core support for rising and falling events on the two types of channels.
In theory the events on different daisy chained chips could be at different levels, but the driver has never supported this and it doesn't seem likely to be used so let us ignore that option.
Includes reordering so that we only set the software cached value of the thresholds if the hardware write succeeds.
Signed-off-by Jonathan Cameron <[email protected]>
Reviewed-by Marcelo Schmitt <[email protected]>
--- drivers/staging/iio/adc/ad7280a.c | 213 +++++++++++++++--------------- 1 file changed, 110 insertions(+), 103 deletions(-)
drivers/staging/iio/adc/ad7280a.c +110 -103
@@ -551,18 +551,34 @@ static const struct attribute_group ad7280_attrs_group = { .attrs = ad7280_attributes, }; +static const struct iio_event_spec ad7280_events[] = { + { + .type =IIO_EV_TYPE_THRESH , + .dir =IIO_EV_DIR_RISING , + .mask_shared_by_type =BIT (IIO_EV_INFO_VALUE ), + }, { + .type =IIO_EV_TYPE_THRESH , + .dir =IIO_EV_DIR_FALLING , + .mask_shared_by_type =BIT (IIO_EV_INFO_VALUE ), + }, +}; +static void ad7280_voltage_channel_init (struct iio_chan_spec *chan,int i) { chan->type =IIO_VOLTAGE ; chan->differential =1 ; chan->channel = i; chan->channel2 = chan->channel +1 ; + chan->event_spec = ad7280_events; + chan->num_event_specs =ARRAY_SIZE (ad7280_events); }static void ad7280_temp_channel_init (struct iio_chan_spec *chan,int i) { chan->type =IIO_TEMP ; chan->channel = i; + chan->event_spec = ad7280_events; + chan->num_event_specs =ARRAY_SIZE (ad7280_events); } static void ad7280_common_fields_init(struct iio_chan_spec *chan, int addr,
@@ -732,88 +748,120 @@ static int ad7280_attr_init(struct ad7280_state *st)return 0 ; } -static ssize_t ad7280_read_channel_config (struct device *dev, -struct device_attribute *attr, -char *buf) +static int ad7280a_read_thresh (struct iio_dev *indio_dev, +const struct iio_chan_spec *chan, +enum iio_event_type type, +enum iio_event_direction dir, +enum iio_event_info info,int *val,int *val2) { -struct iio_dev *indio_dev =dev_to_iio_dev (dev);struct ad7280_state *st =iio_priv (indio_dev); -struct iio_dev_attr *this_attr =to_iio_dev_attr (attr); -unsigned int val; -switch (this_attr->address) { -case AD7280A_CELL_OVERVOLTAGE_REG : - val =1000 + (st->cell_threshhigh *1568 ) /100 ; -break ; -case AD7280A_CELL_UNDERVOLTAGE_REG : - val =1000 + (st->cell_threshlow *1568 ) /100 ; -break ; -case AD7280A_AUX_ADC_OVERVOLTAGE_REG : - val = (st->aux_threshhigh *196 ) /10 ; +switch (chan->type) { +case IIO_VOLTAGE : +switch (dir) { +case IIO_EV_DIR_RISING : + *val =1000 + (st->cell_threshhigh *1568L ) /100 ; +return IIO_VAL_INT ; +case IIO_EV_DIR_FALLING : + *val =1000 + (st->cell_threshlow *1568L ) /100 ; +return IIO_VAL_INT ; +default : +return -EINVAL ; + }break ; -case AD7280A_AUX_ADC_UNDERVOLTAGE_REG : - val = (st->aux_threshlow *196 ) /10 ; +case IIO_TEMP : +switch (dir) { +case IIO_EV_DIR_RISING : + *val = ((st->aux_threshhigh) *196L ) /10 ; +return IIO_VAL_INT ; +case IIO_EV_DIR_FALLING : + *val = (st->aux_threshlow *196L ) /10 ; +return IIO_VAL_INT ; +default : +return -EINVAL ; + }break ;default :return -EINVAL ; } - -return sprintf (buf,"%u\n" , val); } -static ssize_t ad7280_write_channel_config (struct device *dev, -struct device_attribute *attr, -const char *buf, -size_t len) +static int ad7280a_write_thresh (struct iio_dev *indio_dev, +const struct iio_chan_spec *chan, +enum iio_event_type type, +enum iio_event_direction dir, +enum iio_event_info info, +int val,int val2) { -struct iio_dev *indio_dev =dev_to_iio_dev (dev);struct ad7280_state *st =iio_priv (indio_dev); -struct iio_dev_attr *this_attr =to_iio_dev_attr (attr); - -long val; +unsigned int addr; +long value;int ret; - ret =kstrtol (buf,10 , &val); -if (ret) -return ret; - -switch (this_attr->address) { -case AD7280A_CELL_OVERVOLTAGE_REG : -case AD7280A_CELL_UNDERVOLTAGE_REG : - val = ((val -1000 ) *100 ) /1568 ;/* LSB 15.68mV */ -break ; -case AD7280A_AUX_ADC_OVERVOLTAGE_REG : -case AD7280A_AUX_ADC_UNDERVOLTAGE_REG : - val = (val *10 ) /196 ;/* LSB 19.6mV */ -break ; -default : -return -EFAULT ; - } - - val =clamp (val,0L ,0xFFL ); +if (val2 !=0 ) +return -EINVAL ;mutex_lock (&st->lock); -switch (this_attr->address) { -case AD7280A_CELL_OVERVOLTAGE_REG : - st->cell_threshhigh = val; -break ; -case AD7280A_CELL_UNDERVOLTAGE_REG : - st->cell_threshlow = val; -break ; -case AD7280A_AUX_ADC_OVERVOLTAGE_REG : - st->aux_threshhigh = val; +switch (chan->type) { +case IIO_VOLTAGE : + value = ((val -1000 ) *100 ) /1568 ;/* LSB 15.68mV */ + value =clamp (value,0L ,0xFFL ); +switch (dir) { +case IIO_EV_DIR_RISING : + addr =AD7280A_CELL_OVERVOLTAGE_REG ; + ret =ad7280_write (st,AD7280A_DEVADDR_MASTER , addr, +1 , val); +if (ret) +break ; + st->cell_threshhigh = value; +break ; +case IIO_EV_DIR_FALLING : + addr =AD7280A_CELL_UNDERVOLTAGE_REG ; + ret =ad7280_write (st,AD7280A_DEVADDR_MASTER , addr, +1 , val); +if (ret) +break ; + st->cell_threshlow = value; +break ; +default : + ret = -EINVAL ; + goto err_unlock; + }break ; -case AD7280A_AUX_ADC_UNDERVOLTAGE_REG : - st->aux_threshlow = val; +case IIO_TEMP : + value = (val *10 ) /196 ;/* LSB 19.6mV */ + value =clamp (value,0L ,0xFFL ); +switch (dir) { +case IIO_EV_DIR_RISING : + addr =AD7280A_AUX_ADC_OVERVOLTAGE_REG ; + ret =ad7280_write (st,AD7280A_DEVADDR_MASTER , addr, +1 , val); +if (ret) +break ; + st->aux_threshhigh = val; +break ; +case IIO_EV_DIR_FALLING : + addr =AD7280A_AUX_ADC_UNDERVOLTAGE_REG ; + ret =ad7280_write (st,AD7280A_DEVADDR_MASTER , addr, +1 , val); +if (ret) +break ; + st->aux_threshlow = val; +break ; +default : + ret = -EINVAL ; + goto err_unlock; + }break ; +default : + ret = -EINVAL ; + goto err_unlock; } - ret =ad7280_write (st,AD7280A_DEVADDR_MASTER , - this_attr->address,1 , val); - +err_unlock:mutex_unlock (&st->lock); -return ret ? ret : len; +return ret; }static irqreturn_t ad7280_event_handler (int irq,void *private)
@@ -875,48 +923,6 @@ static irqreturn_t ad7280_event_handler(int irq, void *private)return IRQ_HANDLED ; } -/* Note: No need to fix checkpatch warning that reads: -* CHECK: spaces preferred around that '-' (ctx:VxV) -* The function argument is stringified and doesn't need a fix -*/ -static IIO_DEVICE_ATTR_NAMED(in_thresh_low_value, - in_voltage-voltage_thresh_low_value, -0644 , - ad7280_read_channel_config, - ad7280_write_channel_config, - AD7280A_CELL_UNDERVOLTAGE_REG); - -static IIO_DEVICE_ATTR_NAMED(in_thresh_high_value, - in_voltage-voltage_thresh_high_value, -0644 , - ad7280_read_channel_config, - ad7280_write_channel_config, - AD7280A_CELL_OVERVOLTAGE_REG); - -static IIO_DEVICE_ATTR(in_temp_thresh_low_value, -0644 , - ad7280_read_channel_config, - ad7280_write_channel_config, - AD7280A_AUX_ADC_UNDERVOLTAGE_REG); - -static IIO_DEVICE_ATTR(in_temp_thresh_high_value, -0644 , - ad7280_read_channel_config, - ad7280_write_channel_config, - AD7280A_AUX_ADC_OVERVOLTAGE_REG); - -static struct attribute *ad7280_event_attributes[] = { - &iio_dev_attr_in_thresh_low_value.dev_attr.attr, - &iio_dev_attr_in_thresh_high_value.dev_attr.attr, - &iio_dev_attr_in_temp_thresh_low_value.dev_attr.attr, - &iio_dev_attr_in_temp_thresh_high_value.dev_attr.attr, -NULL , -}; - -static const struct attribute_group ad7280_event_attrs_group = { - .attrs = ad7280_event_attributes, -}; - static int ad7280_read_raw(struct iio_dev *indio_dev, struct iio_chan_spec const *chan, int *val,
@@ -956,7 +962,8 @@ static int ad7280_read_raw(struct iio_dev *indio_dev,static const struct iio_info ad7280_info = { .read_raw = ad7280_read_raw, - .event_attrs = &ad7280_event_attrs_group, + .read_event_value = &ad7280a_read_thresh, + .write_event_value = &ad7280a_write_thresh, .attrs = &ad7280_attrs_group, };
Signature · 1 line
2.35.1
Jonathan Cameron
maintainerPATCH v3 7/20 staging:iio:adc:ad7280a: Standardize extended ABI naming
In reply to Jonathan CameronFrom: Jonathan Cameron <[email protected]>
The *_balance_switch_en and *_balance_switch_timer attributes had non standard prefixes. Use the ext_info framework to automatically create then with in_voltageX-voltageY_ prefix.
Documentation for these two unusual attributes to follow.
Signed-off-by Jonathan Cameron <[email protected]>
Reviewed-by Marcelo Schmitt <[email protected]>
--- drivers/staging/iio/adc/ad7280a.c | 174 ++++++++---------------------- 1 file changed, 43 insertions(+), 131 deletions(-)
drivers/staging/iio/adc/ad7280a.c +43 -131
@@ -156,7 +156,6 @@ static unsigned int ad7280a_devaddr(unsigned int addr)struct ad7280_state {struct spi_device *spi;struct iio_chan_spec *channels; -struct iio_dev_attr *iio_attr;int slave_num;int scan_cnt;int readback_delay_us;
@@ -447,37 +446,33 @@ static int ad7280_chain_setup(struct ad7280_state *st)return ret; } -static ssize_t ad7280_show_balance_sw (struct device *dev, -struct device_attribute *attr, -char *buf) +static ssize_t ad7280_show_balance_sw (struct iio_dev *indio_dev, +uintptr_t private, +const struct iio_chan_spec *chan,char *buf) { -struct iio_dev *indio_dev =dev_to_iio_dev (dev);struct ad7280_state *st =iio_priv (indio_dev); -struct iio_dev_attr *this_attr =to_iio_dev_attr (attr); -return sprintf (buf,"%d\n" , - !!(st->cb_mask[this_attr->address >>8 ] & - (1 << ((this_attr->address &0xFF ) +2 )))); +return sysfs_emit (buf,"%d\n" , + !!(st->cb_mask[chan->address >>8 ] & + (1 << ((chan->address &0xFF ) +2 )))); } -static ssize_t ad7280_store_balance_sw (struct device *dev, -struct device_attribute *attr, -const char *buf, -size_t len) +static ssize_t ad7280_store_balance_sw (struct iio_dev *indio_dev, +uintptr_t private, +const struct iio_chan_spec *chan, +const char *buf,size_t len) { -struct iio_dev *indio_dev =dev_to_iio_dev (dev);struct ad7280_state *st =iio_priv (indio_dev); -struct iio_dev_attr *this_attr =to_iio_dev_attr (attr); +unsigned int devaddr, ch;bool readin;int ret; -unsigned int devaddr, ch; ret =strtobool (buf, &readin);if (ret)return ret; - devaddr = this_attr->address >>8 ; - ch = this_attr->address &0xFF ; + devaddr = chan->address >>8 ; + ch = chan->address &0xFF ;mutex_lock (&st->lock);if (readin)
@@ -492,19 +487,18 @@ static ssize_t ad7280_store_balance_sw(struct device *dev,return ret ? ret : len; } -static ssize_t ad7280_show_balance_timer (struct device *dev, -struct device_attribute *attr, +static ssize_t ad7280_show_balance_timer (struct iio_dev *indio_dev, +uintptr_t private, +const struct iio_chan_spec *chan,char *buf) { -struct iio_dev *indio_dev =dev_to_iio_dev (dev);struct ad7280_state *st =iio_priv (indio_dev); -struct iio_dev_attr *this_attr =to_iio_dev_attr (attr); -int ret;unsigned int msecs; +int ret;mutex_lock (&st->lock); - ret =ad7280_read_reg (st, this_attr->address >>8 , - this_attr->address &0xFF ); + ret =ad7280_read_reg (st, chan->address >>8 , + (chan->address &0xFF ) +AD7280A_CB1_TIMER_REG );mutex_unlock (&st->lock);if (ret <0 )
@@ -512,43 +506,50 @@ static ssize_t ad7280_show_balance_timer(struct device *dev, msecs =FIELD_GET (AD7280A_CB_TIMER_VAL_MSK , ret) *71500 ; -return sprintf (buf,"%u\n" , msecs); +return sysfs_emit (buf,"%u.%u\n" , msecs /1000 , msecs %1000 ); } -static ssize_t ad7280_store_balance_timer (struct device *dev, -struct device_attribute *attr, -const char *buf, -size_t len) +static ssize_t ad7280_store_balance_timer (struct iio_dev *indio_dev, +uintptr_t private, +const struct iio_chan_spec *chan, +const char *buf,size_t len) { -struct iio_dev *indio_dev =dev_to_iio_dev (dev);struct ad7280_state *st =iio_priv (indio_dev); -struct iio_dev_attr *this_attr =to_iio_dev_attr (attr); -unsigned long val; +int val, val2;int ret; - ret =kstrtoul (buf,10 , &val); + ret =iio_str_to_fixpoint (buf,1000 , &val, &val2);if (ret)return ret; + val = val *1000 + val2; val /=71500 ;if (val >31 )return -EINVAL ;mutex_lock (&st->lock); - ret =ad7280_write (st, this_attr->address >>8 , - this_attr->address &0xFF ,0 , + ret =ad7280_write (st, chan->address >>8 , + (chan->address &0xFF ) +AD7280A_CB1_TIMER_REG ,0 ,FIELD_PREP (AD7280A_CB_TIMER_VAL_MSK , val));mutex_unlock (&st->lock);return ret ? ret : len; } -static struct attribute *ad7280_attributes[AD7280A_MAX_CHAIN * -AD7280A_CELLS_PER_DEV *2 +1 ]; - -static const struct attribute_group ad7280_attrs_group = { - .attrs = ad7280_attributes, +static const struct iio_chan_spec_ext_info ad7280_cell_ext_info[] = { + { + .name ="balance_switch_en" , + .read = ad7280_show_balance_sw, + .write = ad7280_store_balance_sw, + .shared =IIO_SEPARATE , + }, { + .name ="balance_switch_timer" , + .read = ad7280_show_balance_timer, + .write = ad7280_store_balance_timer, + .shared =IIO_SEPARATE , + }, + {} };static const struct iio_event_spec ad7280_events[] = {
@@ -571,6 +572,7 @@ static void ad7280_voltage_channel_init(struct iio_chan_spec *chan, int i) chan->channel2 = chan->channel +1 ; chan->event_spec = ad7280_events; chan->num_event_specs =ARRAY_SIZE (ad7280_events); + chan->ext_info = ad7280_cell_ext_info; }static void ad7280_temp_channel_init (struct iio_chan_spec *chan,int i)
@@ -663,91 +665,6 @@ static int ad7280_channel_init(struct ad7280_state *st)return cnt +1 ; } -static int ad7280_balance_switch_attr_init (struct iio_dev_attr *attr, -struct device *dev,int addr,int i) -{ - attr->address = addr; - attr->dev_attr.attr.mode =0644 ; - attr->dev_attr.show = ad7280_show_balance_sw; - attr->dev_attr.store = ad7280_store_balance_sw; - attr->dev_attr.attr.name =devm_kasprintf (dev,GFP_KERNEL , -"in%d-in%d_balance_switch_en" , - i, i +1 ); -if (!attr->dev_attr.attr.name) -return -ENOMEM ; - -return 0 ; -} - -static int ad7280_balance_timer_attr_init (struct iio_dev_attr *attr, -struct device *dev,int addr,int i) -{ - attr->address = addr; - attr->dev_attr.attr.mode =0644 ; - attr->dev_attr.show = ad7280_show_balance_timer; - attr->dev_attr.store = ad7280_store_balance_timer; - attr->dev_attr.attr.name =devm_kasprintf (dev,GFP_KERNEL , -"in%d-in%d_balance_timer" , - i, i +1 ); -if (!attr->dev_attr.attr.name) -return -ENOMEM ; - -return 0 ; -} - -static int ad7280_init_dev_attrs (struct ad7280_state *st,int dev,int *cnt) -{ -int addr, ch, i, ret; -struct iio_dev_attr *iio_attr; -struct device *sdev = &st->spi->dev; - -for (ch =AD7280A_CELL_VOLTAGE_1_REG ; ch <=AD7280A_CELL_VOLTAGE_6_REG ; ch++) { - iio_attr = &st->iio_attr[*cnt]; - addr =ad7280a_devaddr (dev) <<8 | ch; - i = dev *AD7280A_CELLS_PER_DEV + ch; - - ret =ad7280_balance_switch_attr_init (iio_attr, sdev, addr, i); -if (ret <0 ) -return ret; - - ad7280_attributes[*cnt] = &iio_attr->dev_attr.attr; - - (*cnt)++; - iio_attr = &st->iio_attr[*cnt]; - addr =ad7280a_devaddr (dev) <<8 | (AD7280A_CB1_TIMER_REG + ch); - - ret =ad7280_balance_timer_attr_init (iio_attr, sdev, addr, i); -if (ret <0 ) -return ret; - - ad7280_attributes[*cnt] = &iio_attr->dev_attr.attr; - (*cnt)++; - } - - ad7280_attributes[*cnt] =NULL ; - -return 0 ; -} - -static int ad7280_attr_init (struct ad7280_state *st) -{ -int dev, cnt =0 , ret; - - st->iio_attr =devm_kcalloc (&st->spi->dev,2 ,sizeof (*st->iio_attr) * - (st->slave_num +1 ) *AD7280A_CELLS_PER_DEV , -GFP_KERNEL ); -if (!st->iio_attr) -return -ENOMEM ; - -for (dev =0 ; dev <= st->slave_num; dev++) { - ret =ad7280_init_dev_attrs (st, dev, &cnt); -if (ret <0 ) -return ret; - } - -return 0 ; -} - static int ad7280a_read_thresh(struct iio_dev *indio_dev, const struct iio_chan_spec *chan, enum iio_event_type type,
@@ -964,7 +881,6 @@ static const struct iio_info ad7280_info = { .read_raw = ad7280_read_raw, .read_event_value = &ad7280a_read_thresh, .write_event_value = &ad7280a_write_thresh, - .attrs = &ad7280_attrs_group, };static const struct ad7280_platform_data ad7793_default_pdata = {
@@ -1045,10 +961,6 @@ static int ad7280_probe(struct spi_device *spi) indio_dev->channels = st->channels; indio_dev->info = &ad7280_info; - ret =ad7280_attr_init (st); -if (ret <0 ) -return ret; - ret =devm_iio_device_register (&spi->dev, indio_dev);if (ret)return ret;
Signature · 1 line
2.35.1
Jonathan Cameron
maintainerPATCH v3 8/20 staging:iio:adc:ad7280a: Drop unused timestamp channel.
In reply to Jonathan CameronFrom: Jonathan Cameron <[email protected]>
The driver doesn't support buffered mode, so a timestamp channel that is entirely hidden from userspace without buffer mode is rather pointless. Drop it.
Signed-off-by Jonathan Cameron <[email protected]>
Reviewed-by Marcelo Schmitt <[email protected]>
--- drivers/staging/iio/adc/ad7280a.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-)
drivers/staging/iio/adc/ad7280a.c +1 -13
@@ -613,16 +613,6 @@ static void ad7280_total_voltage_channel_init(struct iio_chan_spec *chan, chan->scan_type.storagebits =32 ; } -static void ad7280_timestamp_channel_init (struct iio_chan_spec *chan,int cnt) -{ - chan->type =IIO_TIMESTAMP ; - chan->channel =-1 ; - chan->scan_index = cnt; - chan->scan_type.sign ='s' ; - chan->scan_type.realbits =64 ; - chan->scan_type.storagebits =64 ; -} -static void ad7280_init_dev_channels (struct ad7280_state *st,int dev,int *cnt) {int addr, ch, i;
@@ -650,7 +640,7 @@ static int ad7280_channel_init(struct ad7280_state *st) {int dev, cnt =0 ; - st->channels =devm_kcalloc (&st->spi->dev, (st->slave_num +1 ) *12 +2 , + st->channels =devm_kcalloc (&st->spi->dev, (st->slave_num +1 ) *12 +1 ,sizeof (*st->channels),GFP_KERNEL );if (!st->channels)return -ENOMEM ;
@@ -659,8 +649,6 @@ static int ad7280_channel_init(struct ad7280_state *st)ad7280_init_dev_channels (st, dev, &cnt);ad7280_total_voltage_channel_init (&st->channels[cnt], cnt, dev); - cnt++; -ad7280_timestamp_channel_init (&st->channels[cnt], cnt);return cnt +1 ; }
Signature · 1 line
2.35.1
Jonathan Cameron
maintainerPATCH v3 9/20 staging:iio:adc:ad7280a: Trivial comment formatting cleanup
In reply to Jonathan CameronFrom: Jonathan Cameron <[email protected]>
IIO uses the
/*
* stuff
* more stuff
*/
multi-line style, so use that here as well.
Signed-off-by Jonathan Cameron <[email protected]>
Reviewed-by Marcelo Schmitt <[email protected]>
--- drivers/staging/iio/adc/ad7280a.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-)
drivers/staging/iio/adc/ad7280a.c +11 -10
@@ -139,9 +139,10 @@ static unsigned int ad7280a_devaddr(unsigned int addr) ((addr &0x10 ) >>4 ); } -/* During a read a valid write is mandatory. -* So writing to the highest available address (Address 0x1F) -* and setting the address all parts bit to 0 is recommended +/* +* During a read a valid write is mandatory. +* So writing to the highest available address (Address 0x1F) and setting the +* address all parts bit to 0 is recommended. * So the TXVAL is AD7280A_DEVADDR_ALL + CRC */ #define AD7280A_READ_TXVAL 0xF800030A
@@ -180,7 +181,7 @@ static unsigned char ad7280_calc_crc8(unsigned char *crc_tab, unsigned int val) crc = crc_tab[val >>16 &0xFF ]; crc = crc_tab[crc ^ (val >>8 &0xFF )]; -return crc ^ (val &0xFF ); +return crc ^ (val &0xFF ); }static int ad7280_check_crc (struct ad7280_state *st,unsigned int val)
@@ -193,12 +194,12 @@ static int ad7280_check_crc(struct ad7280_state *st, unsigned int val)return 0 ; } -/* After initiating a conversion sequence we need to wait until the -* conversion is done. The delay is typically in the range of 15..30 us -* however depending an the number of devices in the daisy chain and the -* number of averages taken, conversion delays and acquisition time options -* it may take up to 250us, in this case we better sleep instead of busy -* wait. +/* +* After initiating a conversion sequence we need to wait until the conversion +* is done. The delay is typically in the range of 15..30us however depending on +* the number of devices in the daisy chain, the number of averages taken, +* conversion delays and acquisition time options it may take up to 250us, in +* this case we better sleep instead of busy wait. */ static void ad7280_delay (struct ad7280_state *st)
Signature · 1 line
2.35.1
Jonathan Cameron
maintainerPATCH v3 10/20 staging:iio:adc:ad7280a: Make oversampling_ratio a runtime control
In reply to Jonathan CameronFrom: Jonathan Cameron <[email protected]>
Oversampling has nothing directly to do with analog circuits or similar so belongs in the control of userspace as a policy decision.
The only complexity in here was that the acquisition time needs updating if this setting is changed at runtime (as oversampling is time consuming).
Signed-off-by Jonathan Cameron <[email protected]>
Reviewed-by Marcelo Schmitt <[email protected]>
--- drivers/staging/iio/adc/ad7280a.c | 100 +++++++++++++++++++++--------- drivers/staging/iio/adc/ad7280a.h | 6 -- 2 files changed, 72 insertions(+), 34 deletions(-)
drivers/staging/iio/adc/ad7280a.c +72 -28
@@ -129,6 +129,10 @@#define AD7280A_DEVADDR_MASTER 0#define AD7280A_DEVADDR_ALL 0x1F + +static const unsigned short ad7280a_n_avg[4 ] = {1 ,2 ,4 ,8 }; +static const unsigned short ad7280a_t_acq_ns[4 ] = {465 ,1010 ,1460 ,1890 }; +/* 5-bit device address is sent LSB first */ static unsigned int ad7280a_devaddr (unsigned int addr) {
@@ -161,7 +165,8 @@ struct ad7280_state {int scan_cnt;int readback_delay_us;unsigned char crc_tab[CRC8_TABLE_SIZE ]; -unsigned char ctrl_hb; +u8 oversampling_ratio; +u8 acquisition_time;unsigned char ctrl_lb;unsigned char cell_threshhigh;unsigned char cell_threshlow;
@@ -260,7 +265,8 @@ static int ad7280_read_reg(struct ad7280_state *st, unsigned int devaddr, AD7280A_CTRL_HB_CONV_INPUT_ALL) |FIELD_PREP (AD7280A_CTRL_HB_CONV_RREAD_MSK ,AD7280A_CTRL_HB_CONV_RREAD_NO ) | - st->ctrl_hb); +FIELD_PREP (AD7280A_CTRL_HB_CONV_AVG_MSK , + st->oversampling_ratio));if (ret)return ret;
@@ -270,7 +276,8 @@ static int ad7280_read_reg(struct ad7280_state *st, unsigned int devaddr, AD7280A_CTRL_HB_CONV_INPUT_ALL) |FIELD_PREP (AD7280A_CTRL_HB_CONV_RREAD_MSK ,AD7280A_CTRL_HB_CONV_RREAD_ALL ) | - st->ctrl_hb); +FIELD_PREP (AD7280A_CTRL_HB_CONV_AVG_MSK , + st->oversampling_ratio));if (ret)return ret;
@@ -310,7 +317,8 @@ static int ad7280_read_channel(struct ad7280_state *st, unsigned int devaddr, AD7280A_CTRL_HB_CONV_INPUT_ALL) |FIELD_PREP (AD7280A_CTRL_HB_CONV_RREAD_MSK ,AD7280A_CTRL_HB_CONV_RREAD_NO ) | - st->ctrl_hb); +FIELD_PREP (AD7280A_CTRL_HB_CONV_AVG_MSK , + st->oversampling_ratio));if (ret)return ret;
@@ -321,7 +329,8 @@ static int ad7280_read_channel(struct ad7280_state *st, unsigned int devaddr, AD7280A_CTRL_HB_CONV_RREAD_ALL) |FIELD_PREP (AD7280A_CTRL_HB_CONV_START_MSK ,AD7280A_CTRL_HB_CONV_START_CS ) | - st->ctrl_hb); +FIELD_PREP (AD7280A_CTRL_HB_CONV_AVG_MSK , + st->oversampling_ratio));if (ret)return ret;
@@ -359,7 +368,8 @@ static int ad7280_read_all_channels(struct ad7280_state *st, unsigned int cnt, AD7280A_CTRL_HB_CONV_RREAD_ALL) |FIELD_PREP (AD7280A_CTRL_HB_CONV_START_MSK ,AD7280A_CTRL_HB_CONV_START_CS ) | - st->ctrl_hb); +FIELD_PREP (AD7280A_CTRL_HB_CONV_AVG_MSK , + st->oversampling_ratio));if (ret)return ret;
@@ -389,7 +399,8 @@ static void ad7280_sw_power_down(void *data)struct ad7280_state *st = data;ad7280_write (st,AD7280A_DEVADDR_MASTER ,AD7280A_CTRL_HB_REG ,1 , -AD7280A_CTRL_HB_PWRDN_SW | st->ctrl_hb); +AD7280A_CTRL_HB_PWRDN_SW | +FIELD_PREP (AD7280A_CTRL_HB_CONV_AVG_MSK , st->oversampling_ratio)); }static int ad7280_chain_setup (struct ad7280_state *st)
@@ -442,7 +453,8 @@ static int ad7280_chain_setup(struct ad7280_state *st) error_power_down:ad7280_write (st,AD7280A_DEVADDR_MASTER ,AD7280A_CTRL_HB_REG ,1 , -AD7280A_CTRL_HB_PWRDN_SW | st->ctrl_hb); +AD7280A_CTRL_HB_PWRDN_SW | +FIELD_PREP (AD7280A_CTRL_HB_CONV_AVG_MSK , st->oversampling_ratio));return ret; }
@@ -590,6 +602,7 @@ static void ad7280_common_fields_init(struct iio_chan_spec *chan, int addr, chan->indexed =1 ; chan->info_mask_separate =BIT (IIO_CHAN_INFO_RAW ); chan->info_mask_shared_by_type =BIT (IIO_CHAN_INFO_SCALE ); + chan->info_mask_shared_by_all =BIT (IIO_CHAN_INFO_OVERSAMPLING_RATIO ); chan->address = addr; chan->scan_index = cnt; chan->scan_type.sign ='u' ;
@@ -829,6 +842,26 @@ static irqreturn_t ad7280_event_handler(int irq, void *private)return IRQ_HANDLED ; } +static void ad7280_update_delay (struct ad7280_state *st) +{ +/* +* Total Conversion Time = ((tACQ + tCONV) * +* (Number of Conversions per Part)) − +* tACQ + ((N - 1) * tDELAY) +* +* Readback Delay = Total Conversion Time + tWAIT +*/ + + st->readback_delay_us = + ((ad7280a_t_acq_ns[st->acquisition_time &0x3 ] +695 ) * + (AD7280A_NUM_CH * ad7280a_n_avg[st->oversampling_ratio &0x3 ])) - + ad7280a_t_acq_ns[st->acquisition_time &0x3 ] + st->slave_num *250 ; + +/* Convert to usecs */ + st->readback_delay_us =DIV_ROUND_UP (st->readback_delay_us,1000 ); + st->readback_delay_us +=5 ;/* Add tWAIT */ +} + static int ad7280_read_raw(struct iio_dev *indio_dev, struct iio_chan_spec const *chan, int *val,
@@ -862,19 +895,46 @@ static int ad7280_read_raw(struct iio_dev *indio_dev, *val2 =AD7280A_BITS ;return IIO_VAL_FRACTIONAL_LOG2 ; +case IIO_CHAN_INFO_OVERSAMPLING_RATIO : + *val = ad7280a_n_avg[st->oversampling_ratio]; +return IIO_VAL_INT ; }return -EINVAL ; } +static int ad7280_write_raw (struct iio_dev *indio_dev, +struct iio_chan_spec const *chan, +int val,int val2,long mask) +{ +struct ad7280_state *st =iio_priv (indio_dev); +int i; + +switch (mask) { +case IIO_CHAN_INFO_OVERSAMPLING_RATIO : +if (val2 !=0 ) +return -EINVAL ; +for (i =0 ; i <ARRAY_SIZE (ad7280a_n_avg); i++) { +if (val == ad7280a_n_avg[i]) { + st->oversampling_ratio = i; +ad7280_update_delay (st); +return 0 ; + } + } +return -EINVAL ; +default : +return -EINVAL ; + } +} +static const struct iio_info ad7280_info = { .read_raw = ad7280_read_raw, + .write_raw = ad7280_write_raw, .read_event_value = &ad7280a_read_thresh, .write_event_value = &ad7280a_write_thresh, };static const struct ad7280_platform_data ad7793_default_pdata = { .acquisition_time = AD7280A_ACQ_TIME_400ns, - .conversion_averaging =AD7280A_CONV_AVG_DIS , .thermistor_term_en = true, };
@@ -883,8 +943,6 @@ static int ad7280_probe(struct spi_device *spi)const struct ad7280_platform_data *pdata =dev_get_platdata (&spi->dev);struct ad7280_state *st;int ret; -const unsigned short t_acq_ns[4 ] = {465 ,1010 ,1460 ,1890 }; -const unsigned short n_avg[4 ] = {1 ,2 ,4 ,8 };struct iio_dev *indio_dev; indio_dev =devm_iio_device_alloc (&spi->dev,sizeof (*st));
@@ -907,7 +965,7 @@ static int ad7280_probe(struct spi_device *spi) st->ctrl_lb =FIELD_PREP (AD7280A_CTRL_LB_ACQ_TIME_MSK , pdata->acquisition_time) |FIELD_PREP (AD7280A_CTRL_LB_THERMISTOR_MSK , pdata->thermistor_term_en); - st->ctrl_hb =FIELD_PREP (AD7280A_CTRL_HB_CONV_AVG_MSK , pdata->conversion_averaging); + st->oversampling_ratio =0 ;/* No oversampling */ ret =ad7280_chain_setup (st);if (ret <0 )
@@ -917,27 +975,13 @@ static int ad7280_probe(struct spi_device *spi) st->scan_cnt = (st->slave_num +1 ) *AD7280A_NUM_CH ; st->cell_threshhigh =0xFF ; st->aux_threshhigh =0xFF ; + st->acquisition_time = pdata->acquisition_time; ret =devm_add_action_or_reset (&spi->dev, ad7280_sw_power_down, st);if (ret)return ret; -/* -* Total Conversion Time = ((tACQ + tCONV) * -* (Number of Conversions per Part)) − -* tACQ + ((N - 1) * tDELAY) -* -* Readback Delay = Total Conversion Time + tWAIT -*/ - - st->readback_delay_us = - ((t_acq_ns[pdata->acquisition_time &0x3 ] +695 ) * - (AD7280A_NUM_CH * n_avg[pdata->conversion_averaging &0x3 ])) - - t_acq_ns[pdata->acquisition_time &0x3 ] + st->slave_num *250 ; - -/* Convert to usecs */ - st->readback_delay_us =DIV_ROUND_UP (st->readback_delay_us,1000 ); - st->readback_delay_us +=5 ;/* Add tWAIT */ +ad7280_update_delay (st); indio_dev->name =spi_get_device_id (spi)->name; indio_dev->modes =INDIO_DIRECT_MODE ;
drivers/staging/iio/adc/ad7280a.h +0 -6
@@ -17,11 +17,6 @@#define AD7280A_ACQ_TIME_1200ns 2#define AD7280A_ACQ_TIME_1600ns 3 -#define AD7280A_CONV_AVG_DIS 0 -#define AD7280A_CONV_AVG_2 1 -#define AD7280A_CONV_AVG_4 2 -#define AD7280A_CONV_AVG_8 3 -#define AD7280A_ALERT_REMOVE_VIN5 BIT(2)#define AD7280A_ALERT_REMOVE_VIN4_VIN5 BIT(3)#define AD7280A_ALERT_REMOVE_AUX5 BIT(0)
@@ -29,7 +24,6 @@struct ad7280_platform_data {unsigned int acquisition_time; -unsigned int conversion_averaging;unsigned int chain_last_alert_ignore;bool thermistor_term_en; };
Signature · 1 line
2.35.1
Jonathan Cameron
maintainerPATCH v3 11/20 staging:iio:adc:ad7280a: Cleanup includes
In reply to Jonathan CameronFrom: Jonathan Cameron <[email protected]>
Drop used includes, add a few missing ones and reorder. The include-what-you-use tool output was considered in making this change.
Signed-off-by Jonathan Cameron <[email protected]>
Reviewed-by Marcelo Schmitt <[email protected]>
--- drivers/staging/iio/adc/ad7280a.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
drivers/staging/iio/adc/ad7280a.c +9 -7
@@ -5,21 +5,23 @@* Copyright 2011 Analog Devices Inc. */ +#include <linux/bitfield.h> +#include <linux/bits.h> #include <linux/crc8.h> +#include <linux/delay.h> #include <linux/device.h> +#include <linux/err.h> +#include <linux/interrupt.h> #include <linux/kernel.h> +#include <linux/module.h> +#include <linux/mod_devicetable.h> +#include <linux/mutex.h> #include <linux/slab.h> #include <linux/sysfs.h> #include <linux/spi/spi.h> -#include <linux/bitfield.h> -#include <linux/err.h> -#include <linux/delay.h> -#include <linux/interrupt.h> -#include <linux/module.h> -#include <linux/iio/iio.h> -#include <linux/iio/sysfs.h> #include <linux/iio/events.h> +#include <linux/iio/iio.h> #include "ad7280a.h"
Signature · 1 line
2.35.1
Jonathan Cameron
maintainerPATCH v3 12/20 staging:iio:ad7280a: Reflect optionality of irq in ABI
In reply to Jonathan CameronFrom: Jonathan Cameron <[email protected]>
Given the irq is optional, let us remove the interfaces related to events when it is not present.
Signed-off-by Jonathan Cameron <[email protected]>
Reviewed-by Marcelo Schmitt <[email protected]>
--- drivers/staging/iio/adc/ad7280a.c | 48 +++++++++++++++++++------------ 1 file changed, 29 insertions(+), 19 deletions(-)
drivers/staging/iio/adc/ad7280a.c +29 -19
@@ -579,23 +579,29 @@ static const struct iio_event_spec ad7280_events[] = { }, }; -static void ad7280_voltage_channel_init (struct iio_chan_spec *chan,int i) +static void ad7280_voltage_channel_init (struct iio_chan_spec *chan,int i, +bool irq_present) { chan->type =IIO_VOLTAGE ; chan->differential =1 ; chan->channel = i; chan->channel2 = chan->channel +1 ; - chan->event_spec = ad7280_events; - chan->num_event_specs =ARRAY_SIZE (ad7280_events); +if (irq_present) { + chan->event_spec = ad7280_events; + chan->num_event_specs =ARRAY_SIZE (ad7280_events); + } chan->ext_info = ad7280_cell_ext_info; } -static void ad7280_temp_channel_init (struct iio_chan_spec *chan,int i) +static void ad7280_temp_channel_init (struct iio_chan_spec *chan,int i, +bool irq_present) { chan->type =IIO_TEMP ; chan->channel = i; - chan->event_spec = ad7280_events; - chan->num_event_specs =ARRAY_SIZE (ad7280_events); +if (irq_present) { + chan->event_spec = ad7280_events; + chan->num_event_specs =ARRAY_SIZE (ad7280_events); + } } static void ad7280_common_fields_init(struct iio_chan_spec *chan, int addr,
@@ -629,7 +635,8 @@ static void ad7280_total_voltage_channel_init(struct iio_chan_spec *chan, chan->scan_type.storagebits =32 ; } -static void ad7280_init_dev_channels (struct ad7280_state *st,int dev,int *cnt) +static void ad7280_init_dev_channels (struct ad7280_state *st,int dev,int *cnt, +bool irq_present) {int addr, ch, i;struct iio_chan_spec *chan;
@@ -639,10 +646,10 @@ static void ad7280_init_dev_channels(struct ad7280_state *st, int dev, int *cnt)if (ch <AD7280A_AUX_ADC_1_REG ) { i =AD7280A_CALC_VOLTAGE_CHAN_NUM (dev, ch); -ad7280_voltage_channel_init (chan, i); +ad7280_voltage_channel_init (chan, i, irq_present); }else { i =AD7280A_CALC_TEMP_CHAN_NUM (dev, ch); -ad7280_temp_channel_init (chan, i); +ad7280_temp_channel_init (chan, i, irq_present); } addr =ad7280a_devaddr (dev) <<8 | ch;
@@ -652,7 +659,7 @@ static void ad7280_init_dev_channels(struct ad7280_state *st, int dev, int *cnt) } } -static int ad7280_channel_init (struct ad7280_state *st) +static int ad7280_channel_init (struct ad7280_state *st,bool irq_present) {int dev, cnt =0 ;
@@ -662,7 +669,7 @@ static int ad7280_channel_init(struct ad7280_state *st)return -ENOMEM ;for (dev =0 ; dev <= st->slave_num; dev++) -ad7280_init_dev_channels (st, dev, &cnt); +ad7280_init_dev_channels (st, dev, &cnt, irq_present);ad7280_total_voltage_channel_init (&st->channels[cnt], cnt, dev);
@@ -935,6 +942,11 @@ static const struct iio_info ad7280_info = { .write_event_value = &ad7280a_write_thresh, }; +static const struct iio_info ad7280_info_no_irq = { + .read_raw = ad7280_read_raw, + .write_raw = ad7280_write_raw, +}; +static const struct ad7280_platform_data ad7793_default_pdata = { .acquisition_time = AD7280A_ACQ_TIME_400ns, .thermistor_term_en = true,
@@ -988,18 +1000,12 @@ static int ad7280_probe(struct spi_device *spi) indio_dev->name =spi_get_device_id (spi)->name; indio_dev->modes =INDIO_DIRECT_MODE ; - ret =ad7280_channel_init (st); + ret =ad7280_channel_init (st, spi->irq >0 );if (ret <0 )return ret; indio_dev->num_channels = ret; indio_dev->channels = st->channels; - indio_dev->info = &ad7280_info; - - ret =devm_iio_device_register (&spi->dev, indio_dev); -if (ret) -return ret; -if (spi->irq >0 ) { ret = ad7280_write(st, AD7280A_DEVADDR_MASTER, AD7280A_ALERT_REG, 1,
@@ -1023,9 +1029,13 @@ static int ad7280_probe(struct spi_device *spi) indio_dev);if (ret)return ret; + + indio_dev->info = &ad7280_info; + }else { + indio_dev->info = &ad7280_info_no_irq; } -return 0 ; +return devm_iio_device_register (&spi->dev, indio_dev); }static const struct spi_device_id ad7280_id[] = {
Signature · 1 line
2.35.1
Jonathan Cameron
maintainerPATCH v3 13/20 staging:iio:adc:ad7280a: Use a local dev pointer to avoid &spi->dev
In reply to Jonathan CameronFrom: Jonathan Cameron <[email protected]>
We use this a few times already and it is about to get worse, so introduce a local variable to simplify things.
Signed-off-by Jonathan Cameron <[email protected]>
Reviewed-by Marcelo Schmitt <[email protected]>
--- drivers/staging/iio/adc/ad7280a.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/staging/iio/adc/ad7280a.c +5 -4
@@ -955,11 +955,12 @@ static const struct ad7280_platform_data ad7793_default_pdata = {static int ad7280_probe (struct spi_device *spi) {const struct ad7280_platform_data *pdata =dev_get_platdata (&spi->dev); +struct device *dev = &spi->dev;struct ad7280_state *st;int ret;struct iio_dev *indio_dev; - indio_dev =devm_iio_device_alloc (&spi->dev,sizeof (*st)); + indio_dev =devm_iio_device_alloc (dev,sizeof (*st));if (!indio_dev)return -ENOMEM ;
@@ -991,7 +992,7 @@ static int ad7280_probe(struct spi_device *spi) st->aux_threshhigh =0xFF ; st->acquisition_time = pdata->acquisition_time; - ret =devm_add_action_or_reset (&spi->dev, ad7280_sw_power_down, st); + ret =devm_add_action_or_reset (dev, ad7280_sw_power_down, st);if (ret)return ret;
@@ -1020,7 +1021,7 @@ static int ad7280_probe(struct spi_device *spi)if (ret)return ret; - ret = devm_request_threaded_irq(&spi->dev, spi->irq, + ret = devm_request_threaded_irq(dev, spi->irq, NULL, ad7280_event_handler, IRQF_TRIGGER_FALLING |
@@ -1035,7 +1036,7 @@ static int ad7280_probe(struct spi_device *spi) indio_dev->info = &ad7280_info_no_irq; } -return devm_iio_device_register (&spi->dev, indio_dev); +return devm_iio_device_register (dev, indio_dev); }static const struct spi_device_id ad7280_id[] = {
Signature · 1 line
2.35.1
Jonathan Cameron
maintainerPATCH v3 14/20 staging:iio:adc:ad7280a: Use device properties to replace platform data.
In reply to Jonathan CameronFrom: Jonathan Cameron <[email protected]>
Convert all the device specific info that was previously in platform data over to generic firmware query interfaces.
dt-bindings to follow shortly.
Signed-off-by Jonathan Cameron <[email protected]>
--- drivers/staging/iio/adc/ad7280a.c | 100 +++++++++++++++++++++++++----- drivers/staging/iio/adc/ad7280a.h | 31 --------- 2 files changed, 86 insertions(+), 45 deletions(-)
drivers/staging/iio/adc/ad7280a.c +86 -14
@@ -23,8 +23,6 @@#include <linux/iio/events.h> #include <linux/iio/iio.h> -#include "ad7280a.h" -/* Registers */ #define AD7280A_CELL_VOLTAGE_1_REG 0x0/* D11 to D0, Read only */
@@ -81,6 +79,11 @@#define AD7280A_AUX_ADC_UNDERVOLTAGE_REG 0x12/* D7 to D0, Read/write */ #define AD7280A_ALERT_REG 0x13/* D7 to D0, Read/write */ +#define AD7280A_ALERT_REMOVE_MSK GENMASK(3, 0) +#define AD7280A_ALERT_REMOVE_AUX5 BIT(0) +#define AD7280A_ALERT_REMOVE_AUX3_AUX5 BIT(1) +#define AD7280A_ALERT_REMOVE_VIN5 BIT(2) +#define AD7280A_ALERT_REMOVE_VIN4_VIN5 BIT(3)#define AD7280A_ALERT_GEN_STATIC_HIGH BIT(6)#define AD7280A_ALERT_RELAY_SIG_CHAIN_DOWN (BIT(7) | BIT(6))
@@ -163,6 +166,8 @@ static unsigned int ad7280a_devaddr(unsigned int addr)struct ad7280_state {struct spi_device *spi;struct iio_chan_spec *channels; +unsigned int chain_last_alert_ignore; +bool thermistor_term_en;int slave_num;int scan_cnt;int readback_delay_us;
@@ -947,14 +952,8 @@ static const struct iio_info ad7280_info_no_irq = { .write_raw = ad7280_write_raw, }; -static const struct ad7280_platform_data ad7793_default_pdata = { - .acquisition_time = AD7280A_ACQ_TIME_400ns, - .thermistor_term_en = true, -}; -static int ad7280_probe (struct spi_device *spi) { -const struct ad7280_platform_data *pdata =dev_get_platdata (&spi->dev);struct device *dev = &spi->dev;struct ad7280_state *st;int ret;
@@ -969,17 +968,90 @@ static int ad7280_probe(struct spi_device *spi) st->spi = spi;mutex_init (&st->lock); -if (!pdata) - pdata = &ad7793_default_pdata; + st->thermistor_term_en = +device_property_read_bool (dev,"adi,thermistor-termination" ); + +if (device_property_present (dev,"adi,acquisition-time-ns" )) { +u32 val; + + ret =device_property_read_u32 (dev,"adi,acquisition-time-ns" , &val); +if (ret) +return ret; + +switch (val) { +case 400 : + st->acquisition_time = AD7280A_CTRL_LB_ACQ_TIME_400ns; +break ; +case 800 : + st->acquisition_time = AD7280A_CTRL_LB_ACQ_TIME_800ns; +break ; +case 1200 : + st->acquisition_time = AD7280A_CTRL_LB_ACQ_TIME_1200ns; +break ; +case 1600 : + st->acquisition_time = AD7280A_CTRL_LB_ACQ_TIME_1600ns; +break ; +default : +dev_err (dev,"Firmware provided acquisition time is invalid\n" ); +return -EINVAL ; + } + }else { + st->acquisition_time = AD7280A_CTRL_LB_ACQ_TIME_400ns; + } + +/* Alert masks are intended for when particular inputs are not wired up */ +if (device_property_present (dev,"adi,voltage-alert-last-chan" )) { +u32 val; + ret =device_property_read_u32 (dev,"adi,voltage-alert-last-chan" , &val); +if (ret) +return ret; + +switch (val) { +case 3 : + st->chain_last_alert_ignore |=AD7280A_ALERT_REMOVE_VIN4_VIN5 ; +break ; +case 4 : + st->chain_last_alert_ignore |=AD7280A_ALERT_REMOVE_VIN5 ; +break ; +case 5 : +break ; +default : +dev_err (dev, +"Firmware provided last voltage alert channel invalid\n" ); +break ; + } + } +if (device_property_present (dev,"adi,temp-alert-last-chan" )) { +u32 val; + + ret =device_property_read_u32 (dev,"adi,temp-alert-last-chan" , &val); +if (ret) +return ret; + +switch (val) { +case 3 : + st->chain_last_alert_ignore |=AD7280A_ALERT_REMOVE_AUX3_AUX5 ; +break ; +case 4 : + st->chain_last_alert_ignore |=AD7280A_ALERT_REMOVE_AUX5 ; +break ; +case 5 : +break ; +default : +dev_err (dev, +"Firmware provided last temp alert channel invalid\n" ); +break ; + } + }crc8_populate_msb (st->crc_tab,POLYNOM ); st->spi->max_speed_hz =AD7280A_MAX_SPI_CLK_HZ ; st->spi->mode =SPI_MODE_1 ;spi_setup (st->spi); - st->ctrl_lb =FIELD_PREP (AD7280A_CTRL_LB_ACQ_TIME_MSK , pdata->acquisition_time) | -FIELD_PREP (AD7280A_CTRL_LB_THERMISTOR_MSK , pdata->thermistor_term_en); + st->ctrl_lb =FIELD_PREP (AD7280A_CTRL_LB_ACQ_TIME_MSK , st->acquisition_time) | +FIELD_PREP (AD7280A_CTRL_LB_THERMISTOR_MSK , st->thermistor_term_en); st->oversampling_ratio =0 ;/* No oversampling */ ret =ad7280_chain_setup (st);
@@ -990,7 +1062,6 @@ static int ad7280_probe(struct spi_device *spi) st->scan_cnt = (st->slave_num +1 ) *AD7280A_NUM_CH ; st->cell_threshhigh =0xFF ; st->aux_threshhigh =0xFF ; - st->acquisition_time = pdata->acquisition_time; ret =devm_add_action_or_reset (dev, ad7280_sw_power_down, st);if (ret)
@@ -1017,7 +1088,8 @@ static int ad7280_probe(struct spi_device *spi) ret =ad7280_write (st,ad7280a_devaddr (st->slave_num),AD7280A_ALERT_REG ,0 ,AD7280A_ALERT_GEN_STATIC_HIGH | - (pdata->chain_last_alert_ignore &0xF )); +FIELD_PREP (AD7280A_ALERT_REMOVE_MSK , + st->chain_last_alert_ignore));if (ret)return ret;
drivers/staging/iio/adc/ad7280a.h deleted +0 -31
@@ -1,31 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* -* AD7280A Lithium Ion Battery Monitoring System -* -* Copyright 2011 Analog Devices Inc. -*/ - -#ifndef IIO_ADC_AD7280_H_ -#define IIO_ADC_AD7280_H_ - -/* -* TODO: struct ad7280_platform_data needs to go into include/linux/iio -*/ - -#define AD7280A_ACQ_TIME_400ns 0 -#define AD7280A_ACQ_TIME_800ns 1 -#define AD7280A_ACQ_TIME_1200ns 2 -#define AD7280A_ACQ_TIME_1600ns 3 - -#define AD7280A_ALERT_REMOVE_VIN5 BIT(2) -#define AD7280A_ALERT_REMOVE_VIN4_VIN5 BIT(3) -#define AD7280A_ALERT_REMOVE_AUX5 BIT(0) -#define AD7280A_ALERT_REMOVE_AUX4_AUX5 BIT(1) - -struct ad7280_platform_data { -unsigned int acquisition_time; -unsigned int chain_last_alert_ignore; -bool thermistor_term_en; -}; - -#endif /* IIO_ADC_AD7280_H_ */
Signature · 1 line
2.35.1
Jonathan Cameron
maintainerPATCH v3 15/20 staging:iio:adc:ad7280a: Drop buggy support for early termination of AUX alert.
In reply to Jonathan CameronFrom: Jonathan Cameron <[email protected]>
This functionality is intended to allow for a few temperature sensors to be missing (and hence not worth reading) on the final device in a chain. The ones removed are 3 and 5 (unlike for the ADC channels where it is 4 and 5).
The datasheet includes a foot note 3 to Table 12 that makes this complex to support.
"(3) To remove AUX5 or AUX5 and AUX3 from the alert detection, conversions on three auxiliary ADC input channels only must be selected in the control register."
This mode has never been supported by the driver.
As this support would be complex to add and the rework is being done against a QEMU model developed for the purposes of verifying nothing is broken, it is better to drop this support for now.
Reported-by Marcelo Schmitt <[email protected]>
Signed-off-by Jonathan Cameron <[email protected]>
--- drivers/staging/iio/adc/ad7280a.c | 22 ---------------------- 1 file changed, 22 deletions(-)
drivers/staging/iio/adc/ad7280a.c +0 -22
@@ -1022,28 +1022,6 @@ static int ad7280_probe(struct spi_device *spi)break ; } } -if (device_property_present (dev,"adi,temp-alert-last-chan" )) { -u32 val; - - ret =device_property_read_u32 (dev,"adi,temp-alert-last-chan" , &val); -if (ret) -return ret; - -switch (val) { -case 3 : - st->chain_last_alert_ignore |=AD7280A_ALERT_REMOVE_AUX3_AUX5 ; -break ; -case 4 : - st->chain_last_alert_ignore |=AD7280A_ALERT_REMOVE_AUX5 ; -break ; -case 5 : -break ; -default : -dev_err (dev, -"Firmware provided last temp alert channel invalid\n" ); -break ; - } - }crc8_populate_msb (st->crc_tab,POLYNOM ); st->spi->max_speed_hz =AD7280A_MAX_SPI_CLK_HZ ;
Signature · 1 line
2.35.1
Jonathan Cameron
maintainerPATCH v3 16/20 dt-bindings:iio:adc:ad7280a: Add binding
In reply to Jonathan CameronFrom: Jonathan Cameron <[email protected]>
Add a binding for this Lithium Ion Battery monitoring chip/chain of chips as it is now clean and ready to move out of staging.
Signed-off-by Jonathan Cameron <[email protected]>
Reviewed-by Rob Herring <[email protected]>
Reviewed-by Marcelo Schmitt <[email protected]>
--- .../bindings/iio/adc/adi,ad7280a.yaml | 77 +++++++++++++++++++ 1 file changed, 77 insertions(+)
Documentation/devicetree/bindings/iio/adc/adi,ad7280a.yaml new file +77 -0
@@ -0,0 +1,77 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/iio/adc/adi,ad7280a.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Analog Devices AD7280a Lithium Ion Battery Monitoring System + +maintainers: + - Michael Hennerich <[email protected]> + - Jonathan Cameron <[email protected]> + +description: | + Bindings for the Analog Devices AD7280a Battery Monitoring System. + Used in devices such as hybrid electric cars, battery backup and power tools. + Multiple chips can be daisy chained and accessed via a single SPI interface. + Data sheet found here: + https://www.analog.com/media/en/technical-documentation/data-sheets/AD7280A.pdf + +properties: + compatible: + const: adi,ad7280a + + reg: + maxItems: 1 + + interrupts: + description: IRQ line for the ADC + maxItems: 1 + + spi-max-frequency: true + + adi,voltage-alert-last-chan: + $ref: /schemas/types.yaml#/definitions/uint32 + description: + Allows limiting of scope of which channels are considered for voltage + alerts, typically because not all are wired to anything. Only applies to + last device in the daisy chain. + default: 5 + enum: [3, 4, 5] + + adi,acquisition-time-ns: + description: + Additional time may be needed to charge the sampling capacitors depending + on external writing. + default: 400 + enum: [400, 800, 1200, 1600] + + adi,thermistor-termination: + type: boolean + description: + Enable the thermistor termination function. + +required: + - compatible + - reg + +additionalProperties: false + +examples: + - | + spi { + #address-cells = <1>; + #size-cells = <0>; + + adc@0 { + compatible = "adi,ad7280a"; + reg = <0>; + spi-max-frequency = <700000>; + interrupt-parent = <&gpio>; + interrupts = <25 2>; + adi,thermistor-termination; + adi,acquisition-time-ns = <800>; + adi,voltage-alert-last-chan = <5>; + }; + }; +...
Signature · 1 line
2.35.1
Jonathan Cameron
maintainerPATCH v3 17/20 iio:adc:ad7280a: Document ABI for cell balance switches
In reply to Jonathan CameronFrom: Jonathan Cameron <[email protected]>
Very minimal ABI docs. This is unusual enough that I'd expect anyone who actually wanted to touch them to go look at the datasheet.
Signed-off-by Jonathan Cameron <[email protected]>
Reviewed-by Marcelo Schmitt <[email protected]>
--- Documentation/ABI/testing/sysfs-bus-iio-adc-ad7280a | 13 +++++++++++++ 1 file changed, 13 insertions(+)
Documentation/ABI/testing/sysfs-bus-iio-adc-ad7280a new file +13 -0
@@ -0,0 +1,13 @@ +What: /sys/bus/iio/devices/iio:deviceX/in_voltageY-voltageZ_balance_switch_en +KernelVersion: 5.14 +Contact: [email protected] +Description: + Used to enable an output for balancing cells for time + controlled via in_voltage_Y-voltageZ_balance_switch_timer. + +What: /sys/bus/iio/devices/iio:deviceX/in_voltageY-voltageZ_balance_switch_timer +KernelVersion: 5.14 +Contact: [email protected] +Description: + Time in seconds for which balance switch will be turned on. + Multiple of 71.5 seconds.
Signature · 1 line
2.35.1
Jonathan Cameron
maintainerPATCH v3 18/20 staging:iio:adc:ad7280a: Remove shift from cb_mask state cache.
In reply to Jonathan CameronFrom: Jonathan Cameron <[email protected]>
Making the local storage of the Cell Balance mask a simple bitmap and then shifting it only at time of register write simplifies several code paths.
Suggested-by Marcelo Schmitt <[email protected]>
Signed-off-by Jonathan Cameron <[email protected]>
--- drivers/staging/iio/adc/ad7280a.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
drivers/staging/iio/adc/ad7280a.c +7 -5
@@ -88,6 +88,7 @@#define AD7280A_ALERT_RELAY_SIG_CHAIN_DOWN (BIT(7) | BIT(6))#define AD7280A_CELL_BALANCE_REG 0x14/* D7 to D0, Read/write */ +#define AD7280A_CELL_BALANCE_CHAN_BITMAP_MSK GENMASK(7, 2)#define AD7280A_CB1_TIMER_REG 0x15/* D7 to D0, Read/write */ #define AD7280A_CB_TIMER_VAL_MSK GENMASK(7, 3)#define AD7280A_CB2_TIMER_REG 0x16/* D7 to D0, Read/write */
@@ -474,7 +475,7 @@ static ssize_t ad7280_show_balance_sw(struct iio_dev *indio_dev,return sysfs_emit (buf,"%d\n" , !!(st->cb_mask[chan->address >>8 ] & - (1 << ((chan->address &0xFF ) +2 )))); +BIT (chan->address &0xFF ))); } static ssize_t ad7280_store_balance_sw(struct iio_dev *indio_dev,
@@ -496,12 +497,13 @@ static ssize_t ad7280_store_balance_sw(struct iio_dev *indio_dev,mutex_lock (&st->lock);if (readin) - st->cb_mask[devaddr] |=1 << (ch +2 ); + st->cb_mask[devaddr] |=BIT (ch);else - st->cb_mask[devaddr] &= ~(1 << (ch +2 )); + st->cb_mask[devaddr] &= ~BIT (ch); - ret =ad7280_write (st, devaddr,AD7280A_CELL_BALANCE_REG , -0 , st->cb_mask[devaddr]); + ret =ad7280_write (st, devaddr,AD7280A_CELL_BALANCE_REG ,0 , +FIELD_PREP (AD7280A_CELL_BALANCE_CHAN_BITMAP_MSK , + st->cb_mask[devaddr]));mutex_unlock (&st->lock);return ret ? ret : len;
Signature · 1 line
2.35.1
Jonathan Cameron
maintainerPATCH v3 19/20 staging:iio:adc:ad7280a: Use more conservative delays to allow 105C operation.
In reply to Jonathan CameronFrom: Jonathan Cameron <[email protected]>
The datasheet provides timings for operating this device at up to 105 degrees centigrade. Adopt these more conservative timings.
Suggested-by Marcelo Schmitt <[email protected]>
Signed-off-by Jonathan Cameron <[email protected]>
--- drivers/staging/iio/adc/ad7280a.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/iio/adc/ad7280a.c +2 -2
@@ -137,7 +137,7 @@#define AD7280A_DEVADDR_ALL 0x1Fstatic const unsigned short ad7280a_n_avg[4 ] = {1 ,2 ,4 ,8 }; -static const unsigned short ad7280a_t_acq_ns[4 ] = {465 ,1010 ,1460 ,1890 }; +static const unsigned short ad7280a_t_acq_ns[4 ] = {470 ,1030 ,1510 ,1945 };/* 5-bit device address is sent LSB first */ static unsigned int ad7280a_devaddr (unsigned int addr)
@@ -869,7 +869,7 @@ static void ad7280_update_delay(struct ad7280_state *st)*/ st->readback_delay_us = - ((ad7280a_t_acq_ns[st->acquisition_time &0x3 ] +695 ) * + ((ad7280a_t_acq_ns[st->acquisition_time &0x3 ] +720 ) * (AD7280A_NUM_CH * ad7280a_n_avg[st->oversampling_ratio &0x3 ])) - ad7280a_t_acq_ns[st->acquisition_time &0x3 ] + st->slave_num *250 ;
Signature · 1 line
2.35.1
Jonathan Cameron
maintainerPATCH v3 20/20 iio:adc:ad7280a: Move out of staging
In reply to Jonathan CameronFrom: Jonathan Cameron <[email protected]>
This is a rather unusual device (in IIO anyway). However, it has a near to standard userspace ABI.
Note the work to move this out of staging was done against a minimal QEMU model, which doesn't model all the features of the device. I have no intention to upstream the QEMU model as it was developed just to enable this driver cleanup.
https://github.com/jic23/qemu/tree/ad7280a-hacks
Signed-off-by Jonathan Cameron <[email protected]>
--- drivers/iio/adc/Kconfig | 11 + drivers/iio/adc/Makefile | 1 + drivers/iio/adc/ad7280a.c | 1111 +++++++++++++++++++++++++++++ drivers/staging/iio/adc/Kconfig | 11 - drivers/staging/iio/adc/Makefile | 1 - drivers/staging/iio/adc/ad7280a.c | 1111 ----------------------------- 6 files changed, 1123 insertions(+), 1123 deletions(-)
drivers/iio/adc/Kconfig +11 -0
@@ -64,6 +64,17 @@ config AD7266 To compile this driver as a module, choose M here: the module will be called ad7266. +config AD7280 + tristate "Analog Devices AD7280A Lithium Ion Battery Monitoring System" + depends on SPI + select CRC8 + help + Say yes here to build support for Analog Devices AD7280A + Lithium Ion Battery Monitoring System. + + To compile this driver as a module, choose M here: the + module will be called ad7280a + config AD7291 tristate "Analog Devices AD7291 ADC driver" depends on I2C
drivers/iio/adc/Makefile +1 -0
@@ -10,6 +10,7 @@ obj-$(CONFIG_AD7091R5) += ad7091r5.o ad7091r-base.o obj-$(CONFIG_AD7124) += ad7124.o obj-$(CONFIG_AD7192) += ad7192.o obj-$(CONFIG_AD7266) += ad7266.o +obj-$(CONFIG_AD7280) += ad7280a.o obj-$(CONFIG_AD7291) += ad7291.o obj-$(CONFIG_AD7292) += ad7292.o obj-$(CONFIG_AD7298) += ad7298.o
drivers/iio/adc/ad7280a.c new file +1111 -0
1,111 lines not on this page · raw message
drivers/staging/iio/adc/Kconfig +0 -11
@@ -15,15 +15,4 @@ config AD7816 To compile this driver as a module, choose M here: the module will be called ad7816. -config AD7280 - tristate "Analog Devices AD7280A Lithium Ion Battery Monitoring System" - depends on SPI - select CRC8 - help - Say yes here to build support for Analog Devices AD7280A - Lithium Ion Battery Monitoring System. - - To compile this driver as a module, choose M here: the - module will be called ad7280a - endmenu
drivers/staging/iio/adc/Makefile +0 -1
@@ -4,4 +4,3 @@ # obj-$(CONFIG_AD7816) += ad7816.o -obj-$(CONFIG_AD7280) += ad7280a.o
drivers/staging/iio/adc/ad7280a.c deleted +0 -1111
1,111 lines not on this page · raw message
Signature · 1 line
2.35.1
Quoted 16 lines · Jonathan Cameron
From: Jonathan Cameron <[email protected]>
Changes since v2:
All in response to Marcelo Schmitt doing a really detailed review and testing against the QEMU model.- Moved elements of patch 2 to patch 5 to avoid missing defines.
- Patch 6: Amend ordering to avoid updated software cached values until the hardware write has succeeded.
- Patch 12 Fixed wrong callbacks inno_irqcase
- Patch 14: Changed all numeric properties to u32 to avoid needing to specify bit depth in dts.
- Patch 14: Typo fix.
- Patch 15: New Patch to drop the handling of partial aux alert channels as it is buggy (and always was). Anyone wanting to bring this back will hopefully have hardware to test as it will be fiddly.
Quoted 8 lines
- Patch 15 (old number, now 16). Update dt bindings to drop the adi,temp-alert-last-chan given new patch 15 drops the support.
- New Patch 18: Changecb_masksoftware cache to not include the offset of 2 and instead apply that only when writing the registers.
- New Patch 19: More conservative timings to allow 105 degree Centigrade operation.
- Patch 20 is moving the new code so obviously all the above apply to that as well!
I had another look into this set (including the new patches), and it seems all good. :) Also, thanks for clarifying my doubts about the driver on the previous thread. So,
Reviewed-by Marcelo Schmitt <[email protected]>
for the whole series.
It will be nice to see another driver getting out of staging. :D
Thanks,
Marcelo
Quoted 77 lines
Hi All,
This one proved an interesting diversion.
Work done against a somewhat hacked up QEMU emulation of 3 daisy chained ad7280a devices (18 channels). Note that the emulation isn't complete but does do chaining, CRC, and readout of channels etc in a fashion that worked with the original driver (up to the bug in patch 1) and continues to work with the updated version. I've not intention to upstream the emulation (as would need to make it more completed and flexible), but happy to share it with anyone who is interested.
I briefly flirted with posting a patch to just drop the driver entirely, but the part is still available and it looked like fun + isn't going to greatly impact maintainability of the subsystem long term so is low cost even if it becomes unavailable sometime soon.
There are lots of things we could do after this set to improved the driver and make things more flexible, but it should basically 'just work'
Anyhow, as normal for staging graduations, last patch has rename detection turned off so that people can easily see what I am proposing we move out of staging.
All comments welcome and thanks to Marcelo for reviewing this beast!
Thanks,
Jonathan
Jonathan Cameron (20):
staging:iio:adc:ad7280a: Fix handing of device address bit reversing. staging:iio:adc:ad7280a: Register define cleanup. staging:iio:adc:ad7280a: rename_read()to_read_reg()staging:iio:adc:ad7280a: Split buff[2] into tx and rx parts staging:iio:adc:ad7280a: Use bitfield ops to managed fields in
transfers.
staging:iio:adc:ad7280a: Switch to standard event control staging:iio:adc:ad7280a: Standardize extended ABI naming staging:iio:adc:ad7280a: Drop unused timestamp channel. staging:iio:adc:ad7280a: Trivial comment formatting cleanup staging:iio:adc:ad7280a: Makeoversampling_ratioa runtime control staging:iio:adc:ad7280a: Cleanup includes staging:iio:ad7280a: Reflect optionality of irq in ABI staging:iio:adc:ad7280a: Use a local dev pointer to avoid&spi->devstaging:iio:adc:ad7280a: Use device properties to replace platform
data.
staging:iio:adc:ad7280a: Drop buggy support for early termination of
AUX alert.
dt-bindings:iio:adc:ad7280a: Add binding
iio:adc:ad7280a: Document ABI for cell balance switches staging:iio:adc:ad7280a: Remove shift fromcb_maskstate cache. staging:iio:adc:ad7280a: Use more conservative delays to allow 105C
operation.
iio:adc:ad7280a: Move out of staging.../ABI/testing/sysfs-bus-iio-adc-ad7280a | 13 + .../bindings/iio/adc/adi,ad7280a.yaml | 77 ++ drivers/iio/adc/Kconfig | 11 + drivers/iio/adc/Makefile | 1 + drivers/iio/adc/ad7280a.c | 1111 +++++++++++++++++ drivers/staging/iio/adc/Kconfig | 11 - drivers/staging/iio/adc/Makefile | 1 - drivers/staging/iio/adc/ad7280a.c | 1044 ---------------- drivers/staging/iio/adc/ad7280a.h | 37 - 9 files changed, 1213 insertions(+), 1093 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-adc-ad7280a create mode 100644 Documentation/devicetree/bindings/iio/adc/adi,ad7280a.yaml create mode 100644 drivers/iio/adc/ad7280a.c delete mode 100644 drivers/staging/iio/adc/ad7280a.c delete mode 100644 drivers/staging/iio/adc/ad7280a.hSignature · 1 line
2.35.1
Jonathan Cameron
maintainerQuoted 26 lines · On Sun, 13 Feb 2022 17:11:11 -0300 Marcelo Schmitt…
Quoted 16 lines · Jonathan Cameron
From: Jonathan Cameron <[email protected]>
Changes since v2:
All in response to Marcelo Schmitt doing a really detailed review and testing against the QEMU model.- Moved elements of patch 2 to patch 5 to avoid missing defines.
- Patch 6: Amend ordering to avoid updated software cached values until the hardware write has succeeded.
- Patch 12 Fixed wrong callbacks inno_irqcase
- Patch 14: Changed all numeric properties to u32 to avoid needing to specify bit depth in dts.
- Patch 14: Typo fix.
- Patch 15: New Patch to drop the handling of partial aux alert channels as it is buggy (and always was). Anyone wanting to bring this back will hopefully have hardware to test as it will be fiddly.Quoted 8 lines
- Patch 15 (old number, now 16). Update dt bindings to drop the adi,temp-alert-last-chan given new patch 15 drops the support.
- New Patch 18: Changecb_masksoftware cache to not include the offset of 2 and instead apply that only when writing the registers.
- New Patch 19: More conservative timings to allow 105 degree Centigrade operation.
- Patch 20 is moving the new code so obviously all the above apply to that as well!
Quoted 7 lines
I had another look into this set (including the new patches), and it seems all good. :) Also, thanks for clarifying my doubts about the driver on the previous thread. So,
Reviewed-by Marcelo Schmitt <[email protected]>for the whole series.
It will be nice to see another driver getting out of staging. :D
Hi Marcelo,
Thanks for your help with this.
Applied to the togreg branch of iio.git and pushed out as testing to let 0-day see if it can find anything we missed.
Guess I'll have to figure out which one of the remaining staging drivers to tackle next in my (very) slow moving project to get them all out...
I actually have hardware for the adt7316 so maybe time to wire that up though IIRC I could only get SPI to work intermittently due to my dubious soldering. Keeping it all in software by using emulation for this one was nice :)
Jonathan
Quoted 82 lines
Thanks,
Marcelo
Quoted 77 lines
Hi All,
This one proved an interesting diversion.
Work done against a somewhat hacked up QEMU emulation of 3 daisy chained ad7280a devices (18 channels). Note that the emulation isn't complete but does do chaining, CRC, and readout of channels etc in a fashion that worked with the original driver (up to the bug in patch 1) and continues to work with the updated version. I've not intention to upstream the emulation (as would need to make it more completed and flexible), but happy to share it with anyone who is interested.
I briefly flirted with posting a patch to just drop the driver entirely, but the part is still available and it looked like fun + isn't going to greatly impact maintainability of the subsystem long term so is low cost even if it becomes unavailable sometime soon.
There are lots of things we could do after this set to improved the driver and make things more flexible, but it should basically 'just work'
Anyhow, as normal for staging graduations, last patch has rename detection turned off so that people can easily see what I am proposing we move out of staging.
All comments welcome and thanks to Marcelo for reviewing this beast!
Thanks,
Jonathan
Jonathan Cameron (20):
staging:iio:adc:ad7280a: Fix handing of device address bit reversing. staging:iio:adc:ad7280a: Register define cleanup. staging:iio:adc:ad7280a: rename_read()to_read_reg()staging:iio:adc:ad7280a: Split buff[2] into tx and rx parts staging:iio:adc:ad7280a: Use bitfield ops to managed fields in
transfers.
staging:iio:adc:ad7280a: Switch to standard event control staging:iio:adc:ad7280a: Standardize extended ABI naming staging:iio:adc:ad7280a: Drop unused timestamp channel. staging:iio:adc:ad7280a: Trivial comment formatting cleanup staging:iio:adc:ad7280a: Makeoversampling_ratioa runtime control staging:iio:adc:ad7280a: Cleanup includes staging:iio:ad7280a: Reflect optionality of irq in ABI staging:iio:adc:ad7280a: Use a local dev pointer to avoid&spi->devstaging:iio:adc:ad7280a: Use device properties to replace platform
data.
staging:iio:adc:ad7280a: Drop buggy support for early termination of
AUX alert.
dt-bindings:iio:adc:ad7280a: Add binding
iio:adc:ad7280a: Document ABI for cell balance switches staging:iio:adc:ad7280a: Remove shift fromcb_maskstate cache. staging:iio:adc:ad7280a: Use more conservative delays to allow 105C
operation.
iio:adc:ad7280a: Move out of staging.../ABI/testing/sysfs-bus-iio-adc-ad7280a | 13 + .../bindings/iio/adc/adi,ad7280a.yaml | 77 ++ drivers/iio/adc/Kconfig | 11 + drivers/iio/adc/Makefile | 1 + drivers/iio/adc/ad7280a.c | 1111 +++++++++++++++++ drivers/staging/iio/adc/Kconfig | 11 - drivers/staging/iio/adc/Makefile | 1 - drivers/staging/iio/adc/ad7280a.c | 1044 ---------------- drivers/staging/iio/adc/ad7280a.h | 37 - 9 files changed, 1213 insertions(+), 1093 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-adc-ad7280a create mode 100644 Documentation/devicetree/bindings/iio/adc/adi,ad7280a.yaml create mode 100644 drivers/iio/adc/ad7280a.c delete mode 100644 drivers/staging/iio/adc/ad7280a.c delete mode 100644 drivers/staging/iio/adc/ad7280a.hSignature · 1 line
2.35.1