Adding support for STMPE811 ADC
Subsystems (8)
v5 cover Adding support for STMPE811 ADC
From: Philippe Schenker <[email protected]>
Hello everyone,
This patchset is adding an ADC driver for STMPE811. The STMPE811 is a Multi-Frontend-Device that supports a touchscreen, ADC, GPIO and a temperature sensor.
For Touchscreen and GPIO there are already existing drivers in mainline. This patchset will add support, to read out the ADC and temperature sensor.
This patchset is also reformatting device tree bindings, so they are easier to read (PATCH 1/1).
To be able to add this ADC driver it is necessary to move some defines from the touchscreen driver to the mfd device (PATCH 2/8) so they are also accessible by mfd and adc driver.
Because the touchscreen driver is also using the internal ADC it makes sense to put the common adc settings of stmpe-ts.c and stmpe_adc.c to the MFD. In the MFD there is then also an initialisation for the common settings of ADC done. The existing initialisation in touchscreen driver is kept for backwards-compatibility. All of this MFD related changes are in PATCH 3/8.
In PATCH 4/8 then these settings are removed from stmpe-ts and grabbed from MFD.
PATCH 5/8 is actually adding the ADC driver that also supports the built-in temperature sensor.
PATCH 6/8 is then adding the needed devicetree bindings. PATCH 7/8 and 8/8 is lastly adding the stmpe_adc DT-nodes as found on Toradex boards.
Changes in v5:
- Made a one column list
- Added lee's Acked-for-MFD
- Changed author of commit to use correct email.
- Changed author of commit to use correct email
- Added Lee Jone's Ack
- Changed author of commit. Previous patch versions author was wrong by mistake.
- Changed author of commit to use correct email.
- Removed devm_add_action_or_reset
- Changed iio_device_register to devm_iio_device_register
- Added Jonathan Cameron's Reviewed-by
- Added correct author of commit, as this changed by accident
- Made a one column list
- Cleared note about precedence
- Changed example to a full STMPE811 device with MFD, touchscreen, and the new stmpe_adc driver.
- Added Jonathan Cameron's Reviewed-by
Changes in v4:
- New separate precursor patch for holding reformatting
- Added Lee Jone's Ack
- Added Dmitry Torokhov's Ack
- New patch: split mfd changes into this precursor patch
- Export the added stmpe811_adc_commmon_init function
- Disabling adc when mfd is removed
- New patch: Split changes in stmpe-ts.c to a separate commit
- Remove common adc settings from init and call the stmpe811_adc_common_init function
- Moved MFD changes to a precursor patch
- Moved stmpe-ts changes to a precursor patch
- Created stmpe_read_temp and stmpe_read_voltage functions to make read_raw more readable
- Added local lock instead of using indio_dev's mlock
- Use be16_to_cpu() macro instead of bitshifting
- Added stmpe_enable again to stmpe_adc_init_hw
- Use devm_add_action_or_reset to get rid of the remove function (I tested if that actually works)
- Put reformatting in a separate precursor patch.
- Moved T30 devicetree settings to separate commit
- New separate commit to hold T30 devicetree changes
Changes in v3:
- Undo ADC-settings related code-deletions in stmpe-ts.c that the code is backwards-compatible to older devicetrees.
- Removed COMPILE_TEST from dependings in Kconfig
- Removed stmpe_adc_get_platform_info() function and integrated the few code lines in the other function
- Reformatted documentation for touchscreen to use tabs and have a better overview of the settings.
- Added note which adc-settings will take precedence.
- changed typo in sample-time setting from 144 clocks to 124 clocks, as stated in the datasheet.
- None
Changes in v2:
- This is a new added commit. Separate commit for moving the defines out of drivers/input/touchscreen/stmpe-ts.c to overlying mfd-device drivers/mfd/stmpe.c
- Pre-fix defines with STMPE_
- Move code to setup ADC to MFD device, as it is used by both drivers adc and touchscreen
- Code formatting
- Removed unused includes
- Defined the macro STMPE_START_ONE_TEMP_CONV with other macros.
- Added new macro that defines the channel of the temperature sensor. Took new name for STMPE_MAX_ADC->STMPE_ADC_LAST_NR and used it throughout the code for better readability.
- Added mutex_unlock where missing.
- Moved the bindings for ADC to the overlying mfd.
- Reformatted for better readability
- Put common ADC settings in mfd
Philippe Schenker (5):
dt-bindings: stmpe: reformatting parameter list and use tabs only
mfd: stmpe: Move ADC related defines to header of mfd
Input: stmpe-ts: preparations for STMPE ADC driver
ARM: dts: Add stmpe-adc DT node to Toradex iMX6 modules
ARM: dts: Add stmpe-adc DT node to Toradex T30 modules
Stefan Agner (3):
mfd: stmpe: preparations for STMPE ADC driver
iio: adc: add STMPE ADC driver using IIO framework
iio: adc: add STMPE ADC devicetree bindings
.../devicetree/bindings/iio/adc/stmpe-adc.txt | 21 + .../bindings/input/touchscreen/stmpe.txt | 116 ++++-- .../devicetree/bindings/mfd/stmpe.txt | 28 +- arch/arm/boot/dts/imx6qdl-apalis.dtsi | 22 +- arch/arm/boot/dts/imx6qdl-colibri.dtsi | 23 +- arch/arm/boot/dts/tegra30-apalis.dtsi | 22 +- arch/arm/boot/dts/tegra30-colibri.dtsi | 22 +- drivers/iio/adc/Kconfig | 7 + drivers/iio/adc/Makefile | 1 + drivers/iio/adc/stmpe-adc.c | 363 ++++++++++++++++++ drivers/input/touchscreen/stmpe-ts.c | 66 +--- drivers/mfd/Kconfig | 3 +- drivers/mfd/stmpe.c | 68 ++++ include/linux/mfd/stmpe.h | 21 + 14 files changed, 667 insertions(+), 116 deletions(-) create mode 100644 Documentation/devicetree/bindings/iio/adc/stmpe-adc.txt create mode 100644 drivers/iio/adc/stmpe-adc.c
Signature · 1 line
2.19.2
PATCH v5 1/8 dt-bindings: stmpe: reformatting parameter list and use tabs only
From: Philippe Schenker <[email protected]>
This patch reformats the parameter list for stmpe device in a table-style so it is more clear to read.
---
Changes in v5:
- Made a one column list
- Added lee's Acked-for-MFD
- Changed author of commit to use correct email.
Changes in v4:
- New separate precursor patch for holding reformatting
Changes in v3: None
Changes in v2: None
.../bindings/input/touchscreen/stmpe.txt | 64 +++++++++++++------ .../devicetree/bindings/mfd/stmpe.txt | 14 ++-- 2 files changed, 53 insertions(+), 25 deletions(-)
Documentation/devicetree/bindings/input/touchscreen/stmpe.txt +46 -18
@@ -5,24 +5,52 @@ Required properties: - compatible: "st,stmpe-ts" Optional properties: -- st,sample-time: ADC converstion time in number of clock. (0 -> 36 clocks, 1 -> - 44 clocks, 2 -> 56 clocks, 3 -> 64 clocks, 4 -> 80 clocks, 5 -> 96 clocks, 6 - -> 144 clocks), recommended is 4. -- st,mod-12b: ADC Bit mode (0 -> 10bit ADC, 1 -> 12bit ADC) -- st,ref-sel: ADC reference source (0 -> internal reference, 1 -> external - reference) -- st,adc-freq: ADC Clock speed (0 -> 1.625 MHz, 1 -> 3.25 MHz, 2 || 3 -> 6.5 MHz) -- st,ave-ctrl: Sample average control (0 -> 1 sample, 1 -> 2 samples, 2 -> 4 - samples, 3 -> 8 samples) -- st,touch-det-delay: Touch detect interrupt delay (0 -> 10 us, 1 -> 50 us, 2 -> - 100 us, 3 -> 500 us, 4-> 1 ms, 5 -> 5 ms, 6 -> 10 ms, 7 -> 50 ms) recommended - is 3 -- st,settling: Panel driver settling time (0 -> 10 us, 1 -> 100 us, 2 -> 500 us, 3 - -> 1 ms, 4 -> 5 ms, 5 -> 10 ms, 6 for 50 ms, 7 -> 100 ms) recommended is 2 -- st,fraction-z: Length of the fractional part in z (fraction-z ([0..7]) = Count of - the fractional part) recommended is 7 -- st,i-drive: current limit value of the touchscreen drivers (0 -> 20 mA typical 35 - mA max, 1 -> 50 mA typical 80 mA max) +- st,sample-time : ADC conversion time in number of clock. + 0 -> 36 clocks + 1 -> 44 clocks + 2 -> 56 clocks + 3 -> 64 clocks + 4 -> 80 clocks (recommended) + 5 -> 96 clocks + 6 -> 144 clocks +- st,mod-12b : ADC Bit mode + 0 -> 10bit ADC + 1 -> 12bit ADC +- st,ref-sel : ADC reference source + 0 -> internal + 1 -> external +- st,adc-freq : ADC Clock speed + 0 -> 1.625 MHz + 1 -> 3.25 MHz + 2 || 3 -> 6.5 MHz +- st,ave-ctrl : Sample average control + 0 -> 1 sample + 1 -> 2 samples + 2 -> 4 samples + 3 -> 8 samples +- st,touch-det-delay : Touch detect interrupt delay (recommended is 3) + 0 -> 10 us + 1 -> 50 us + 2 -> 100 us + 3 -> 500 us + 4 -> 1 ms + 5 -> 5 ms + 6 -> 10 ms + 7 -> 50 ms +- st,settling : Panel driver settling time (recommended is 2) + 0 -> 10 us + 1 -> 100 us + 2 -> 500 us + 3 -> 1 ms + 4 -> 5 ms + 5 -> 10 ms + 6 -> 50 ms + 7 -> 100 ms +- st,fraction-z : Length of the fractional part in z (recommended is 7) + (fraction-z ([0..7]) = Count of the fractional part) +- st,i-drive : current limit value of the touchscreen drivers + 0 -> 20 mA (typical 35mA max) + 1 -> 50 mA (typical 80 mA max) Node name must be stmpe_touchscreen and should be child node of stmpe node to which it belongs.
Documentation/devicetree/bindings/mfd/stmpe.txt +7 -7
@@ -4,15 +4,15 @@ STMPE is an MFD device which may expose the following inbuilt devices: gpio, keypad, touchscreen, adc, pwm, rotator. Required properties: - - compatible : "st,stmpe[610|801|811|1600|1601|2401|2403]" - - reg : I2C/SPI address of the device + - compatible : "st,stmpe[610|801|811|1600|1601|2401|2403]" + - reg : I2C/SPI address of the device Optional properties: - - interrupts : The interrupt outputs from the controller - - interrupt-controller : Marks the device node as an interrupt controller - - wakeup-source : Marks the input device as wakable - - st,autosleep-timeout : Valid entries (ms); 4, 16, 32, 64, 128, 256, 512 and 1024 - - irq-gpio : If present, which GPIO to use for event IRQ + - interrupts : The interrupt outputs from the controller + - interrupt-controller : Marks the device node as an interrupt controller + - wakeup-source : Marks the input device as wakable + - st,autosleep-timeout : Valid entries (ms); 4, 16, 32, 64, 128, 256, 512 and 1024 + - irq-gpio : If present, which GPIO to use for event IRQ Example:
Signature · 1 line
2.19.2
PATCH v5 2/8 mfd: stmpe: Move ADC related defines to header of mfd
In reply to Philippe SchenkerFrom: Philippe Schenker <[email protected]>
Move defines that are ADC related to the header of the overlying mfd, so they can be used from multiple sub-devices.
---
Changes in v5:
- Changed author of commit to use correct email
Changes in v4:
- Added Lee Jone's Ack
- Added Dmitry Torokhov's Ack
Changes in v3: None
Changes in v2:
- This is a new added commit. Separate commit for moving the defines out of drivers/input/touchscreen/stmpe-ts.c to overlying mfd-device drivers/mfd/stmpe.c
- Pre-fix defines with STMPE_
drivers/input/touchscreen/stmpe-ts.c | 34 +++++++++++----------------- include/linux/mfd/stmpe.h | 11 +++++++++ 2 files changed, 24 insertions(+), 21 deletions(-)
drivers/input/touchscreen/stmpe-ts.c +13 -21
@@ -49,17 +49,6 @@#define STMPE_IRQ_TOUCH_DET 0 -#define SAMPLE_TIME (x) ((x & 0xf) << 4) -#define MOD_12B (x) ((x & 0x1) << 3) -#define REF_SEL (x) ((x & 0x1) << 1) -#define ADC_FREQ (x) (x & 0x3) -#define AVE_CTRL (x) ((x & 0x3) << 6) -#define DET_DELAY (x) ((x & 0x7) << 3) -#define SETTLING (x) (x & 0x7) -#define FRACTION_Z (x) (x & 0x7) -#define I_DRIVE (x) (x & 0x1) -#define OP_MODE (x) ((x & 0x7) << 1) -#define STMPE_TS_NAME "stmpe-ts"#define XY_MASK 0xfff
@@ -213,9 +202,10 @@ static int stmpe_init_hw(struct stmpe_touch *ts)return ret; } - adc_ctrl1 =SAMPLE_TIME (ts->sample_time) |MOD_12B (ts->mod_12b) | -REF_SEL (ts->ref_sel); - adc_ctrl1_mask =SAMPLE_TIME (0xff ) |MOD_12B (0xff ) |REF_SEL (0xff ); + adc_ctrl1 =STMPE_SAMPLE_TIME (ts->sample_time) | +STMPE_MOD_12B (ts->mod_12b) |STMPE_REF_SEL (ts->ref_sel); + adc_ctrl1_mask =STMPE_SAMPLE_TIME (0xff ) |STMPE_MOD_12B (0xff ) | +STMPE_REF_SEL (0xff ); ret =stmpe_set_bits (stmpe,STMPE_REG_ADC_CTRL1 , adc_ctrl1_mask, adc_ctrl1);
@@ -225,15 +215,17 @@ static int stmpe_init_hw(struct stmpe_touch *ts) } ret =stmpe_set_bits (stmpe,STMPE_REG_ADC_CTRL2 , -ADC_FREQ (0xff ),ADC_FREQ (ts->adc_freq)); +STMPE_ADC_FREQ (0xff ),STMPE_ADC_FREQ (ts->adc_freq));if (ret) {dev_err (dev,"Could not setup ADC\n" );return ret; } - tsc_cfg =AVE_CTRL (ts->ave_ctrl) |DET_DELAY (ts->touch_det_delay) | -SETTLING (ts->settling); - tsc_cfg_mask =AVE_CTRL (0xff ) |DET_DELAY (0xff ) |SETTLING (0xff ); + tsc_cfg =STMPE_AVE_CTRL (ts->ave_ctrl) | +STMPE_DET_DELAY (ts->touch_det_delay) | +STMPE_SETTLING (ts->settling); + tsc_cfg_mask =STMPE_AVE_CTRL (0xff ) |STMPE_DET_DELAY (0xff ) | +STMPE_SETTLING (0xff ); ret =stmpe_set_bits (stmpe,STMPE_REG_TSC_CFG , tsc_cfg_mask, tsc_cfg);if (ret) {
@@ -242,14 +234,14 @@ static int stmpe_init_hw(struct stmpe_touch *ts) } ret =stmpe_set_bits (stmpe,STMPE_REG_TSC_FRACTION_Z , -FRACTION_Z (0xff ),FRACTION_Z (ts->fraction_z)); +STMPE_FRACTION_Z (0xff ),STMPE_FRACTION_Z (ts->fraction_z));if (ret) {dev_err (dev,"Could not config touch\n" );return ret; } ret =stmpe_set_bits (stmpe,STMPE_REG_TSC_I_DRIVE , -I_DRIVE (0xff ),I_DRIVE (ts->i_drive)); +STMPE_I_DRIVE (0xff ),STMPE_I_DRIVE (ts->i_drive));if (ret) {dev_err (dev,"Could not config touch\n" );return ret;
@@ -263,7 +255,7 @@ static int stmpe_init_hw(struct stmpe_touch *ts) } ret =stmpe_set_bits (stmpe,STMPE_REG_TSC_CTRL , -OP_MODE (0xff ),OP_MODE (OP_MOD_XYZ )); +STMPE_OP_MODE (0xff ),STMPE_OP_MODE (OP_MOD_XYZ ));if (ret) {dev_err (dev,"Could not set mode\n" );return ret;
include/linux/mfd/stmpe.h +11 -0
@@ -10,6 +10,17 @@#include <linux/mutex.h> +#define STMPE_SAMPLE_TIME (x) ((x & 0xf) << 4) +#define STMPE_MOD_12B (x) ((x & 0x1) << 3) +#define STMPE_REF_SEL (x) ((x & 0x1) << 1) +#define STMPE_ADC_FREQ (x) (x & 0x3) +#define STMPE_AVE_CTRL (x) ((x & 0x3) << 6) +#define STMPE_DET_DELAY (x) ((x & 0x7) << 3) +#define STMPE_SETTLING (x) (x & 0x7) +#define STMPE_FRACTION_Z (x) (x & 0x7) +#define STMPE_I_DRIVE (x) (x & 0x1) +#define STMPE_OP_MODE (x) ((x & 0x7) << 1) +struct device ;struct regulator ;
Signature · 1 line
2.19.2
PATCH v5 4/8 Input: stmpe-ts: preparations for STMPE ADC driver
In reply to Philippe SchenkerFrom: Philippe Schenker <[email protected]>
This patch removes common ADC settings in favor to use stmpe811_adc_common_init that is present in MFD. This is necessary in preparation for the stmpe-adc driver, because those two drivers have common settings for the ADC.
---
Changes in v5:
- Changed author of commit to use correct email.
Changes in v4:
- New patch: Split changes in stmpe-ts.c to a separate commit
- Remove common adc settings from init and call the stmpe811_adc_common_init function
Changes in v3:
- Undo ADC-settings related code-deletions in stmpe-ts.c that the code is backwards-compatible to older devicetrees.
Changes in v2: None
drivers/input/touchscreen/stmpe-ts.c | 42 +++++----------------------- 1 file changed, 7 insertions(+), 35 deletions(-)
drivers/input/touchscreen/stmpe-ts.c +7 -35
@@ -30,8 +30,6 @@* with touchscreen controller */ #define STMPE_REG_INT_STA 0x0B -#define STMPE_REG_ADC_CTRL1 0x20 -#define STMPE_REG_ADC_CTRL2 0x21#define STMPE_REG_TSC_CTRL 0x40#define STMPE_REG_TSC_CFG 0x41#define STMPE_REG_FIFO_TH 0x4A
@@ -58,15 +56,6 @@* @idev: registered input device * @work: a work item used to scan the device * @dev: a pointer back to the MFD cell struct device* -* @sample_time: ADC converstion time in number of clock. -* (0 -> 36 clocks, 1 -> 44 clocks, 2 -> 56 clocks, 3 -> 64 clocks, -* 4 -> 80 clocks, 5 -> 96 clocks, 6 -> 144 clocks), -* recommended is 4. -* @mod_12b: ADC Bit mode (0 -> 10bit ADC, 1 -> 12bit ADC) -* @ref_sel: ADC reference source -* (0 -> internal reference, 1 -> external reference) -* @adc_freq: ADC Clock speed -* (0 -> 1.625 MHz, 1 -> 3.25 MHz, 2 || 3 -> 6.5 MHz) * @ave_ctrl: Sample average control * (0 -> 1 sample, 1 -> 2 samples, 2 -> 4 samples, 3 -> 8 samples) * @touch_det_delay: Touch detect interrupt delay
@@ -88,10 +77,6 @@ struct stmpe_touch {struct input_dev *idev;struct delayed_work work;struct device *dev; -u8 sample_time; -u8 mod_12b; -u8 ref_sel; -u8 adc_freq;u8 ave_ctrl;u8 touch_det_delay;u8 settling;
@@ -192,7 +177,7 @@ static irqreturn_t stmpe_ts_handler(int irq, void *data)static int stmpe_init_hw (struct stmpe_touch *ts) {int ret; -u8 adc_ctrl1, adc_ctrl1_mask, tsc_cfg, tsc_cfg_mask; +u8 tsc_cfg, tsc_cfg_mask;struct stmpe *stmpe = ts->stmpe;struct device *dev = ts->dev;
@@ -202,22 +187,9 @@ static int stmpe_init_hw(struct stmpe_touch *ts)return ret; } - adc_ctrl1 =STMPE_SAMPLE_TIME (ts->sample_time) | -STMPE_MOD_12B (ts->mod_12b) |STMPE_REF_SEL (ts->ref_sel); - adc_ctrl1_mask =STMPE_SAMPLE_TIME (0xff ) |STMPE_MOD_12B (0xff ) | -STMPE_REF_SEL (0xff ); - - ret =stmpe_set_bits (stmpe,STMPE_REG_ADC_CTRL1 , - adc_ctrl1_mask, adc_ctrl1); -if (ret) { -dev_err (dev,"Could not setup ADC\n" ); -return ret; - } - - ret =stmpe_set_bits (stmpe,STMPE_REG_ADC_CTRL2 , -STMPE_ADC_FREQ (0xff ),STMPE_ADC_FREQ (ts->adc_freq)); + ret =stmpe811_adc_common_init (stmpe);if (ret) { -dev_err (dev,"Could not setup ADC\n" ); +stmpe_disable (stmpe,STMPE_BLOCK_TOUCHSCREEN |STMPE_BLOCK_ADC );return ret; }
@@ -295,13 +267,13 @@ static void stmpe_ts_get_platform_info(struct platform_device *pdev,if (np) {if (!of_property_read_u32 (np,"st,sample-time" , &val)) - ts->sample_time = val; + ts->stmpe->sample_time = val;if (!of_property_read_u32 (np,"st,mod-12b" , &val)) - ts->mod_12b = val; + ts->stmpe->mod_12b = val;if (!of_property_read_u32 (np,"st,ref-sel" , &val)) - ts->ref_sel = val; + ts->stmpe->ref_sel = val;if (!of_property_read_u32 (np,"st,adc-freq" , &val)) - ts->adc_freq = val; + ts->stmpe->adc_freq = val;if (!of_property_read_u32 (np,"st,ave-ctrl" , &val)) ts->ave_ctrl = val;if (!of_property_read_u32 (np,"st,touch-det-delay" , &val))
Signature · 1 line
2.19.2
PATCH v5 6/8 iio: adc: add STMPE ADC devicetree bindings
In reply to Philippe SchenkerFrom: Stefan Agner <[email protected]>
This adds the devicetree bindings for the STMPE ADC. This also corrects a typo in st,sample-time it is rather "6 -> 124 clocks" according to the datasheet and not 144.
We need to use the naming stmpe_adc in devicetree because this is given by the mfd device.
---
Changes in v5:
- Made a one column list
- Cleared note about precedence
- Changed example to a full STMPE811 device with MFD, touchscreen, and the new stmpe_adc driver.
- Added Jonathan Cameron's Reviewed-by
Changes in v4:
- Put reformatting in a separate precursor patch.
Changes in v3:
- Reformatted documentation for touchscreen to use tabs and have a better overview of the settings.
- Added note which adc-settings will take precedence.
- changed typo in sample-time setting from 144 clocks to 124 clocks, as stated in the datasheet.
Changes in v2:
- Moved the bindings for ADC to the overlying mfd.
- Reformatted for better readability
.../devicetree/bindings/iio/adc/stmpe-adc.txt | 21 +++++ .../bindings/input/touchscreen/stmpe.txt | 88 +++++++++++++------ .../devicetree/bindings/mfd/stmpe.txt | 14 +++ 3 files changed, 98 insertions(+), 25 deletions(-) create mode 100644 Documentation/devicetree/bindings/iio/adc/stmpe-adc.txt
Documentation/devicetree/bindings/iio/adc/stmpe-adc.txt new file +21 -0
@@ -0,0 +1,21 @@ +STMPE ADC driver +---------------- + +Required properties: + - compatible: "st,stmpe-adc" + +Optional properties: +Note that the ADC is shared with the STMPE touchscreen. ADC related settings +have to be done in the mfd. +- st,norequest-mask: bitmask specifying which ADC channels should _not_ be + requestable due to different usage (e.g. touch) + +Node name must be stmpe_adc and should be child node of stmpe node to +which it belongs. + +Example: + + stmpe_adc { + compatible = "st,stmpe-adc"; + st,norequest-mask = <0x0F>; /* dont use ADC CH3-0 */ + };
Documentation/devicetree/bindings/input/touchscreen/stmpe.txt +63 -25
107 lines not on this page · raw message
Documentation/devicetree/bindings/mfd/stmpe.txt +14 -0
@@ -14,6 +14,20 @@ Optional properties: - st,autosleep-timeout : Valid entries (ms); 4, 16, 32, 64, 128, 256, 512 and 1024 - irq-gpio : If present, which GPIO to use for event IRQ +Optional properties for devices with touch and ADC (STMPE811|STMPE610): + - st,sample-time : ADC conversion time in number of clock. + 0 -> 36 clocks 4 -> 80 clocks (recommended) + 1 -> 44 clocks 5 -> 96 clocks + 2 -> 56 clocks 6 -> 124 clocks + 3 -> 64 clocks + - st,mod-12b : ADC Bit mode + 0 -> 10bit ADC 1 -> 12bit ADC + - st,ref-sel : ADC reference source + 0 -> internal 1 -> external + - st,adc-freq : ADC Clock speed + 0 -> 1.625 MHz 2 || 3 -> 6.5 MHz + 1 -> 3.25 MHz + Example: stmpe1601: stmpe1601@40 {
Signature · 1 line
2.19.2
PATCH v5 7/8 ARM: dts: Add stmpe-adc DT node to Toradex iMX6 modules
In reply to Philippe SchenkerFrom: Philippe Schenker <[email protected]>
Add the stmpe-adc DT node as found on Toradex iMX6 modules
---
Changes in v5: None
Changes in v4:
- Moved T30 devicetree settings to separate commit
Changes in v3:
- None
Changes in v2:
- Put common ADC settings in mfd
arch/arm/boot/dts/imx6qdl-apalis.dtsi | 22 ++++++++++++++-------- arch/arm/boot/dts/imx6qdl-colibri.dtsi | 23 +++++++++++++++-------- 2 files changed, 29 insertions(+), 16 deletions(-)
arch/arm/boot/dts/imx6qdl-apalis.dtsi +14 -8
@@ -331,11 +331,18 @@ id = <0>; blocks = <0x5>; irq-trigger = <0x1>; + /* 3.25 MHz ADC clock speed */ + st,adc-freq = <1>; + /* 12-bit ADC */ + st,mod-12b = <1>; + /* internal ADC reference */ + st,ref-sel = <0>; + /* ADC converstion time: 80 clocks */ + st,sample-time = <4>; + /* forbid to use ADC channels 3-0 (touch) */ stmpe_touchscreen { compatible = "st,stmpe-ts"; - /* 3.25 MHz ADC clock speed */ - st,adc-freq = <1>; /* 8 sample average control */ st,ave-ctrl = <3>; /* 7 length fractional part in z */
@@ -345,17 +352,16 @@ * current limit value */ st,i-drive = <1>; - /* 12-bit ADC */ - st,mod-12b = <1>; - /* internal ADC reference */ - st,ref-sel = <0>; - /* ADC converstion time: 80 clocks */ - st,sample-time = <4>; /* 1 ms panel driver settling time */ st,settling = <3>; /* 5 ms touch detect interrupt delay */ st,touch-det-delay = <5>; }; + + stmpe_adc { + compatible = "st,stmpe-adc"; + st,norequest-mask = <0x0F>; + }; }; };
arch/arm/boot/dts/imx6qdl-colibri.dtsi +15 -8
@@ -262,11 +262,18 @@ id = <0>; blocks = <0x5>; irq-trigger = <0x1>; + /* 3.25 MHz ADC clock speed */ + st,adc-freq = <1>; + /* 12-bit ADC */ + st,mod-12b = <1>; + /* internal ADC reference */ + st,ref-sel = <0>; + /* ADC converstion time: 80 clocks */ + st,sample-time = <4>; + /* forbid to use ADC channels 3-0 (touch) */ stmpe_touchscreen { compatible = "st,stmpe-ts"; - /* 3.25 MHz ADC clock speed */ - st,adc-freq = <1>; /* 8 sample average control */ st,ave-ctrl = <3>; /* 7 length fractional part in z */
@@ -276,17 +283,17 @@ * current limit value */ st,i-drive = <1>; - /* 12-bit ADC */ - st,mod-12b = <1>; - /* internal ADC reference */ - st,ref-sel = <0>; - /* ADC converstion time: 80 clocks */ - st,sample-time = <4>; /* 1 ms panel driver settling time */ st,settling = <3>; /* 5 ms touch detect interrupt delay */ st,touch-det-delay = <5>; }; + + stmpe_adc { + compatible = "st,stmpe-adc"; + /* 3.25 MHz ADC clock speed */ + st,norequest-mask = <0x0F>; + }; }; };
Signature · 1 line
2.19.2
PATCH v5 8/8 ARM: dts: Add stmpe-adc DT node to Toradex T30 modules
In reply to Philippe SchenkerFrom: Philippe Schenker <[email protected]>
Add the stmpe-adc DT node as found on Toradex T30 modules
---
Changes in v5: None
Changes in v4:
- New separate commit to hold T30 devicetree changes
Changes in v3: None
Changes in v2: None
arch/arm/boot/dts/tegra30-apalis.dtsi | 22 ++++++++++++++-------- arch/arm/boot/dts/tegra30-colibri.dtsi | 22 ++++++++++++++-------- 2 files changed, 28 insertions(+), 16 deletions(-)
arch/arm/boot/dts/tegra30-apalis.dtsi +14 -8
@@ -976,11 +976,18 @@ id = <0>; blocks = <0x5>; irq-trigger = <0x1>; + /* 3.25 MHz ADC clock speed */ + st,adc-freq = <1>; + /* 12-bit ADC */ + st,mod-12b = <1>; + /* internal ADC reference */ + st,ref-sel = <0>; + /* ADC converstion time: 80 clocks */ + st,sample-time = <4>; + /* forbid to use ADC channels 3-0 (touch) */ stmpe_touchscreen { compatible = "st,stmpe-ts"; - /* 3.25 MHz ADC clock speed */ - st,adc-freq = <1>; /* 8 sample average control */ st,ave-ctrl = <3>; /* 7 length fractional part in z */
@@ -990,17 +997,16 @@ * current limit value */ st,i-drive = <1>; - /* 12-bit ADC */ - st,mod-12b = <1>; - /* internal ADC reference */ - st,ref-sel = <0>; - /* ADC converstion time: 80 clocks */ - st,sample-time = <4>; /* 1 ms panel driver settling time */ st,settling = <3>; /* 5 ms touch detect interrupt delay */ st,touch-det-delay = <5>; }; + + stmpe_adc { + compatible = "st,stmpe-adc"; + st,norequest-mask = <0x0F>; + }; }; /*
arch/arm/boot/dts/tegra30-colibri.dtsi +14 -8
@@ -845,11 +845,18 @@ id = <0>; blocks = <0x5>; irq-trigger = <0x1>; + /* 3.25 MHz ADC clock speed */ + st,adc-freq = <1>; + /* 12-bit ADC */ + st,mod-12b = <1>; + /* internal ADC reference */ + st,ref-sel = <0>; + /* ADC converstion time: 80 clocks */ + st,sample-time = <4>; + /* forbid to use ADC channels 3-0 (touch) */ stmpe_touchscreen { compatible = "st,stmpe-ts"; - /* 3.25 MHz ADC clock speed */ - st,adc-freq = <1>; /* 8 sample average control */ st,ave-ctrl = <3>; /* 7 length fractional part in z */
@@ -859,17 +866,16 @@ * current limit value */ st,i-drive = <1>; - /* 12-bit ADC */ - st,mod-12b = <1>; - /* internal ADC reference */ - st,ref-sel = <0>; - /* ADC converstion time: 80 clocks */ - st,sample-time = <4>; /* 1 ms panel driver settling time */ st,settling = <3>; /* 5 ms touch detect interrupt delay */ st,touch-det-delay = <5>; }; + + stmpe_adc { + compatible = "st,stmpe-adc"; + st,norequest-mask = <0x0F>; + }; }; /*
Signature · 1 line
2.19.2
PATCH v5 5/8 iio: adc: add STMPE ADC driver using IIO framework
In reply to Philippe SchenkerFrom: Stefan Agner <[email protected]>
This adds an ADC driver for the STMPE device using the industrial input/output interface. The driver supports raw reading of values. The driver depends on the MFD STMPE driver. If the touchscreen block is enabled too, only four of the 8 ADC channels are available.
---
Changes in v5:
- Removed devm_add_action_or_reset
- Changed iio_device_register to devm_iio_device_register
- Added Jonathan Cameron's Reviewed-by
- Added correct author of commit, as this changed by accident
Changes in v4:
- Moved MFD changes to a precursor patch
- Moved stmpe-ts changes to a precursor patch
- Created stmpe_read_temp and stmpe_read_voltage functions to make read_raw more readable
- Added local lock instead of using indio_dev's mlock
- Use be16_to_cpu() macro instead of bitshifting
- Added stmpe_enable again to stmpe_adc_init_hw
- Use devm_add_action_or_reset to get rid of the remove function (I tested if that actually works)
Changes in v3:
- Removed COMPILE_TEST from dependings in Kconfig
- Removed stmpe_adc_get_platform_info() function and integrated the few code lines in the other function
Changes in v2:
- Code formatting
- Removed unused includes
- Defined the macro STMPE_START_ONE_TEMP_CONV with other macros.
- Added new macro that defines the channel of the temperature sensor. Took new name for STMPE_MAX_ADC->STMPE_ADC_LAST_NR and used it throughout the code for better readability.
- Added mutex_unlock where missing.
drivers/iio/adc/Kconfig | 7 + drivers/iio/adc/Makefile | 1 + drivers/iio/adc/stmpe-adc.c | 363 ++++++++++++++++++++++++++++++++++++ 3 files changed, 371 insertions(+) create mode 100644 drivers/iio/adc/stmpe-adc.c
drivers/iio/adc/Kconfig +7 -0
@@ -734,6 +734,13 @@ config STM32_DFSDM_ADC This driver can also be built as a module. If so, the module will be called stm32-dfsdm-adc. +config STMPE_ADC + tristate "STMicroelectronics STMPE ADC driver" + depends on OF && MFD_STMPE + help + Say yes here to build support for ST Microelectronics STMPE + built-in ADC block (stmpe811). + config STX104 tristate "Apex Embedded Systems STX104 driver" depends on PC104 && X86
drivers/iio/adc/Makefile +1 -0
@@ -69,6 +69,7 @@ obj-$(CONFIG_STM32_ADC_CORE) += stm32-adc-core.o obj-$(CONFIG_STM32_ADC) += stm32-adc.o obj-$(CONFIG_STM32_DFSDM_CORE) += stm32-dfsdm-core.o obj-$(CONFIG_STM32_DFSDM_ADC) += stm32-dfsdm-adc.o +obj-$(CONFIG_STMPE_ADC) += stmpe-adc.o obj-$(CONFIG_TI_ADC081C) += ti-adc081c.o obj-$(CONFIG_TI_ADC0832) += ti-adc0832.o obj-$(CONFIG_TI_ADC084S021) += ti-adc084s021.o
drivers/iio/adc/stmpe-adc.c new file +363 -0
363 lines not on this page · raw message
Signature · 1 line
2.19.2
PATCH v5 3/8 mfd: stmpe: preparations for STMPE ADC driver
In reply to Philippe SchenkerFrom: Stefan Agner <[email protected]>
This prepares the MFD for the STMPE ADC driver. This commit introduces devicetree settings that are used by the ADC and adds an init function. Common ADC settings that are shared with the touchscreen driver can now reside in the overlying MFD.
---
Changes in v5:
- Added Lee Jone's Ack
- Changed author of commit. Previous patch versions author was wrong by mistake.
Changes in v4:
- New patch: split mfd changes into this precursor patch
- Export the added stmpe811_adc_commmon_init function
- Disabling adc when mfd is removed
Changes in v3: None
Changes in v2:
- Move code to setup ADC to MFD device, as it is used by both drivers adc and touchscreen
drivers/mfd/Kconfig | 3 +- drivers/mfd/stmpe.c | 68 +++++++++++++++++++++++++++++++++++++++ include/linux/mfd/stmpe.h | 10 ++++++ 3 files changed, 80 insertions(+), 1 deletion(-)
drivers/mfd/Kconfig +2 -1
@@ -1204,7 +1204,7 @@ config MFD_STMPE Currently supported devices are: - STMPE811: GPIO, Touchscreen + STMPE811: GPIO, Touchscreen, ADC STMPE1601: GPIO, Keypad STMPE1801: GPIO, Keypad STMPE2401: GPIO, Keypad
@@ -1217,6 +1217,7 @@ config MFD_STMPE GPIO: stmpe-gpio Keypad: stmpe-keypad Touchscreen: stmpe-ts + ADC: stmpe-adc menu "STMicroelectronics STMPE Interface Drivers" depends on MFD_STMPE
drivers/mfd/stmpe.c +68 -0
104 lines not on this page · raw message
include/linux/mfd/stmpe.h +10 -0
@@ -21,6 +21,9 @@#define STMPE_I_DRIVE (x) (x & 0x1)#define STMPE_OP_MODE (x) ((x & 0x7) << 1) +#define STMPE811_REG_ADC_CTRL1 0x20 +#define STMPE811_REG_ADC_CTRL2 0x21 +struct device ;struct regulator ;
@@ -134,6 +137,12 @@ struct stmpe {u8 ier[2 ];u8 oldier[2 ];struct stmpe_platform_data *pdata; + +/* For devices that use an ADC */ +u8 sample_time; +u8 mod_12b; +u8 ref_sel; +u8 adc_freq; };extern int stmpe_reg_write (struct stmpe *stmpe,u8 reg,u8 data);
@@ -147,6 +156,7 @@ extern int stmpe_set_altfunc(struct stmpe *stmpe, u32 pins, enum stmpe_block block);extern int stmpe_enable (struct stmpe *stmpe,unsigned int blocks);extern int stmpe_disable (struct stmpe *stmpe,unsigned int blocks); +extern int stmpe811_adc_common_init (struct stmpe *stmpe);#define STMPE_GPIO_NOREQ_811_TOUCH (0xf0)
Signature · 1 line
2.19.2
Re: [PATCH v5 1/8] dt-bindings: stmpe: reformatting parameter list and use tabs only
In reply to Philippe SchenkerQuoted 18 lines · Philippe Schenker
From: Philippe Schenker <[email protected]>
This patch reformats the parameter list for stmpe device in a table-style so it is more clear to read.
Signed-off-by Philippe Schenker <[email protected]>Acked-for-MFD-by Lee Jones <[email protected]>---
Changes in v5:
- Made a one column list
- Added lee's Acked-for-MFD
- Changed author of commit to use correct email.Changes in v4:
- New separate precursor patch for holding reformatting
Quoted 7 lines
Changes in v3: None
Changes in v2: None.../bindings/input/touchscreen/stmpe.txt | 64 +++++++++++++------ .../devicetree/bindings/mfd/stmpe.txt | 14 ++-- 2 files changed, 53 insertions(+), 25 deletions(-)
Re: [PATCH v5 6/8] iio: adc: add STMPE ADC devicetree bindings
In reply to Philippe SchenkerQuoted 36 lines · Philippe Schenker
From: Stefan Agner <[email protected]>
This adds the devicetree bindings for the STMPE ADC. This also corrects a typo in st,sample-time it is rather "6 -> 124 clocks" according to the datasheet and not 144.
We need to use the namingstmpe_adcin devicetree because this is given by the mfd device.Signed-off-by Stefan Agner <[email protected]>Signed-off-by Max Krummenacher <[email protected]>Signed-off-by Philippe Schenker <[email protected]>Reviewed-by Jonathan Cameron <[email protected]>---
Changes in v5:
- Made a one column list
- Cleared note about precedence
- Changed example to a full STMPE811 device with MFD, touchscreen, and the newstmpe_adcdriver.
- Added Jonathan Cameron's Reviewed-byChanges in v4:
- Put reformatting in a separate precursor patch.Changes in v3:
- Reformatted documentation for touchscreen to use tabs and have a better overview of the settings.
- Added note which adc-settings will take precedence.
- changed typo in sample-time setting from 144 clocks to 124 clocks, as stated in the datasheet.Changes in v2:
- Moved the bindings for ADC to the overlying mfd.
- Reformatted for better readability
Quoted 6 lines
.../devicetree/bindings/iio/adc/stmpe-adc.txt | 21 +++++ .../bindings/input/touchscreen/stmpe.txt | 88 +++++++++++++------ .../devicetree/bindings/mfd/stmpe.txt | 14 +++ 3 files changed, 98 insertions(+), 25 deletions(-) create mode 100644 Documentation/devicetree/bindings/iio/adc/stmpe-adc.txt
Re: [PATCH v5 4/8] Input: stmpe-ts: preparations for STMPE ADC driver
In reply to Philippe SchenkerQuoted 8 lines · Philippe Schenker
From: Philippe Schenker <[email protected]>
This patch removes common ADC settings in favor to use
stmpe811_adc_common_initthat is present in MFD. This is necessary in preparation for the stmpe-adc driver, because those two drivers have common settings for the ADC.Signed-off-by Philippe Schenker <[email protected]>
Quoted 115 lines
---
Changes in v5:
- Changed author of commit to use correct email.Changes in v4:
- New patch: Split changes instmpe-ts.cto a separate commit
- Remove common adc settings from init and call thestmpe811_adc_common_initfunctionChanges in v3:
- Undo ADC-settings related code-deletions instmpe-ts.cthat the code is backwards-compatible to older devicetrees.Changes in v2: None
drivers/input/touchscreen/stmpe-ts.c | 42 +++++----------------------- 1 file changed, 7 insertions(+), 35 deletions(-)drivers/input/touchscreen/stmpe-ts.c +7
-35@@ -30,8 +30,6 @@* with touchscreen controller */ #define STMPE_REG_INT_STA 0x0B -#define STMPE_REG_ADC_CTRL1 0x20 -#define STMPE_REG_ADC_CTRL2 0x21#define STMPE_REG_TSC_CTRL 0x40#define STMPE_REG_TSC_CFG 0x41#define STMPE_REG_FIFO_TH 0x4A@@ -58,15 +56,6 @@* @idev: registered input device * @work: a work item used to scan the device * @dev: a pointer back to the MFD cell struct device* -* @sample_time: ADC converstion time in number of clock. -* (0 -> 36 clocks, 1 -> 44 clocks, 2 -> 56 clocks, 3 -> 64 clocks, -* 4 -> 80 clocks, 5 -> 96 clocks, 6 -> 144 clocks), -* recommended is 4. -* @mod_12b: ADC Bit mode (0 -> 10bit ADC, 1 -> 12bit ADC) -* @ref_sel: ADC reference source -* (0 -> internal reference, 1 -> external reference) -* @adc_freq: ADC Clock speed -* (0 -> 1.625 MHz, 1 -> 3.25 MHz, 2 || 3 -> 6.5 MHz) * @ave_ctrl: Sample average control * (0 -> 1 sample, 1 -> 2 samples, 2 -> 4 samples, 3 -> 8 samples) * @touch_det_delay: Touch detect interrupt delay @@ -88,10 +77,6 @@ struct stmpe_touch {struct input_dev *idev;struct delayed_work work;struct device *dev; -u8 sample_time; -u8 mod_12b; -u8 ref_sel; -u8 adc_freq;u8 ave_ctrl;u8 touch_det_delay;u8 settling;@@ -192,7 +177,7 @@ static irqreturn_t stmpe_ts_handler(int irq, void *data)static int stmpe_init_hw (struct stmpe_touch *ts) {int ret; -u8 adc_ctrl1, adc_ctrl1_mask, tsc_cfg, tsc_cfg_mask; +u8 tsc_cfg, tsc_cfg_mask;struct stmpe *stmpe = ts->stmpe;struct device *dev = ts->dev;@@ -202,22 +187,9 @@ static int stmpe_init_hw(struct stmpe_touch *ts)return ret; } - adc_ctrl1 =STMPE_SAMPLE_TIME (ts->sample_time) | -STMPE_MOD_12B (ts->mod_12b) |STMPE_REF_SEL (ts->ref_sel); - adc_ctrl1_mask =STMPE_SAMPLE_TIME (0xff ) |STMPE_MOD_12B (0xff ) | -STMPE_REF_SEL (0xff ); - - ret =stmpe_set_bits (stmpe,STMPE_REG_ADC_CTRL1 , - adc_ctrl1_mask, adc_ctrl1); -if (ret) { -dev_err (dev,"Could not setup ADC\n" ); -return ret; - } - - ret =stmpe_set_bits (stmpe,STMPE_REG_ADC_CTRL2 , -STMPE_ADC_FREQ (0xff ),STMPE_ADC_FREQ (ts->adc_freq)); + ret =stmpe811_adc_common_init (stmpe);if (ret) { -dev_err (dev,"Could not setup ADC\n" ); +stmpe_disable (stmpe,STMPE_BLOCK_TOUCHSCREEN |STMPE_BLOCK_ADC );return ret; }@@ -295,13 +267,13 @@ static void stmpe_ts_get_platform_info(struct platform_device *pdev,if (np) {if (!of_property_read_u32 (np,"st,sample-time" , &val)) - ts->sample_time = val; + ts->stmpe->sample_time = val;if (!of_property_read_u32 (np,"st,mod-12b" , &val)) - ts->mod_12b = val; + ts->stmpe->mod_12b = val;if (!of_property_read_u32 (np,"st,ref-sel" , &val)) - ts->ref_sel = val; + ts->stmpe->ref_sel = val;if (!of_property_read_u32 (np,"st,adc-freq" , &val)) - ts->adc_freq = val; + ts->stmpe->adc_freq = val;if (!of_property_read_u32 (np,"st,ave-ctrl" , &val)) ts->ave_ctrl = val;if (!of_property_read_u32 (np,"st,touch-det-delay" , &val))Signature · 1 line
2.19.2
Signature · 1 line
Dmitry
Re: [PATCH v5 7/8] ARM: dts: Add stmpe-adc DT node to Toradex iMX6 modules
In reply to Philippe SchenkerQuoted 5 lines · Philippe Schenker
From: Philippe Schenker <[email protected]>
Add the stmpe-adc DT node as found on Toradex iMX6 modules
Signed-off-by Philippe Schenker <[email protected]>
Quoted 114 lines
---
Changes in v5: None
Changes in v4:
- Moved T30 devicetree settings to separate commitChanges in v3:
- NoneChanges in v2:
- Put common ADC settings in mfdarch/arm/boot/dts/imx6qdl-apalis.dtsi | 22 ++++++++++++++-------- arch/arm/boot/dts/imx6qdl-colibri.dtsi | 23 +++++++++++++++-------- 2 files changed, 29 insertions(+), 16 deletions(-)arch/arm/boot/dts/imx6qdl-apalis.dtsi +14
-8@@ -331,11 +331,18 @@ id = <0>; blocks = <0x5>; irq-trigger = <0x1>; + /* 3.25 MHz ADC clock speed */ + st,adc-freq = <1>; + /* 12-bit ADC */ + st,mod-12b = <1>; + /* internal ADC reference */ + st,ref-sel = <0>; + /* ADC converstion time: 80 clocks */ + st,sample-time = <4>; + /* forbid to use ADC channels 3-0 (touch) */ stmpe_touchscreen { compatible = "st,stmpe-ts"; - /* 3.25 MHz ADC clock speed */ - st,adc-freq = <1>; /* 8 sample average control */ st,ave-ctrl = <3>; /* 7 length fractional part in z */@@ -345,17 +352,16 @@ * current limit value */ st,i-drive = <1>; - /* 12-bit ADC */ - st,mod-12b = <1>; - /* internal ADC reference */ - st,ref-sel = <0>; - /* ADC converstion time: 80 clocks */ - st,sample-time = <4>; /* 1 ms panel driver settling time */ st,settling = <3>; /* 5 ms touch detect interrupt delay */ st,touch-det-delay = <5>; }; + + stmpe_adc { + compatible = "st,stmpe-adc"; + st,norequest-mask = <0x0F>; + }; }; };arch/arm/boot/dts/imx6qdl-colibri.dtsi +15
-8@@ -262,11 +262,18 @@ id = <0>; blocks = <0x5>; irq-trigger = <0x1>; + /* 3.25 MHz ADC clock speed */ + st,adc-freq = <1>; + /* 12-bit ADC */ + st,mod-12b = <1>; + /* internal ADC reference */ + st,ref-sel = <0>; + /* ADC converstion time: 80 clocks */ + st,sample-time = <4>; + /* forbid to use ADC channels 3-0 (touch) */ stmpe_touchscreen { compatible = "st,stmpe-ts"; - /* 3.25 MHz ADC clock speed */ - st,adc-freq = <1>; /* 8 sample average control */ st,ave-ctrl = <3>; /* 7 length fractional part in z */@@ -276,17 +283,17 @@ * current limit value */ st,i-drive = <1>; - /* 12-bit ADC */ - st,mod-12b = <1>; - /* internal ADC reference */ - st,ref-sel = <0>; - /* ADC converstion time: 80 clocks */ - st,sample-time = <4>; /* 1 ms panel driver settling time */ st,settling = <3>; /* 5 ms touch detect interrupt delay */ st,touch-det-delay = <5>; }; + + stmpe_adc { + compatible = "st,stmpe-adc"; + /* 3.25 MHz ADC clock speed */ + st,norequest-mask = <0x0F>; + }; }; };
Re: [PATCH v5 8/8] ARM: dts: Add stmpe-adc DT node to Toradex T30 modules
In reply to Philippe SchenkerQuoted 5 lines · Philippe Schenker
From: Philippe Schenker <[email protected]>
Add the stmpe-adc DT node as found on Toradex T30 modules
Signed-off-by Philippe Schenker <[email protected]>
Quoted 111 lines
---
Changes in v5: None
Changes in v4:
- New separate commit to hold T30 devicetree changesChanges in v3: None
Changes in v2: Nonearch/arm/boot/dts/tegra30-apalis.dtsi | 22 ++++++++++++++-------- arch/arm/boot/dts/tegra30-colibri.dtsi | 22 ++++++++++++++-------- 2 files changed, 28 insertions(+), 16 deletions(-)arch/arm/boot/dts/tegra30-apalis.dtsi +14
-8@@ -976,11 +976,18 @@ id = <0>; blocks = <0x5>; irq-trigger = <0x1>; + /* 3.25 MHz ADC clock speed */ + st,adc-freq = <1>; + /* 12-bit ADC */ + st,mod-12b = <1>; + /* internal ADC reference */ + st,ref-sel = <0>; + /* ADC converstion time: 80 clocks */ + st,sample-time = <4>; + /* forbid to use ADC channels 3-0 (touch) */ stmpe_touchscreen { compatible = "st,stmpe-ts"; - /* 3.25 MHz ADC clock speed */ - st,adc-freq = <1>; /* 8 sample average control */ st,ave-ctrl = <3>; /* 7 length fractional part in z */@@ -990,17 +997,16 @@ * current limit value */ st,i-drive = <1>; - /* 12-bit ADC */ - st,mod-12b = <1>; - /* internal ADC reference */ - st,ref-sel = <0>; - /* ADC converstion time: 80 clocks */ - st,sample-time = <4>; /* 1 ms panel driver settling time */ st,settling = <3>; /* 5 ms touch detect interrupt delay */ st,touch-det-delay = <5>; }; + + stmpe_adc { + compatible = "st,stmpe-adc"; + st,norequest-mask = <0x0F>; + }; }; /*arch/arm/boot/dts/tegra30-colibri.dtsi +14
-8@@ -845,11 +845,18 @@ id = <0>; blocks = <0x5>; irq-trigger = <0x1>; + /* 3.25 MHz ADC clock speed */ + st,adc-freq = <1>; + /* 12-bit ADC */ + st,mod-12b = <1>; + /* internal ADC reference */ + st,ref-sel = <0>; + /* ADC converstion time: 80 clocks */ + st,sample-time = <4>; + /* forbid to use ADC channels 3-0 (touch) */ stmpe_touchscreen { compatible = "st,stmpe-ts"; - /* 3.25 MHz ADC clock speed */ - st,adc-freq = <1>; /* 8 sample average control */ st,ave-ctrl = <3>; /* 7 length fractional part in z */@@ -859,17 +866,16 @@ * current limit value */ st,i-drive = <1>; - /* 12-bit ADC */ - st,mod-12b = <1>; - /* internal ADC reference */ - st,ref-sel = <0>; - /* ADC converstion time: 80 clocks */ - st,sample-time = <4>; /* 1 ms panel driver settling time */ st,settling = <3>; /* 5 ms touch detect interrupt delay */ st,touch-det-delay = <5>; }; + + stmpe_adc { + compatible = "st,stmpe-adc"; + st,norequest-mask = <0x0F>; + }; }; /*
[GIT PULL] Immutable branch between MFD, IIO and Input due for the v5.1 merge window
In reply to Philippe SchenkerTaken all but the ARM patches.
These need to be reviewed and go in via ARM-SoC.
The following changes since commit bfeffd155283772bbe78c6a05dec7c0128ee500c:
Linux 5.0-rc1 (2019-01-06 17:08:20 -0800)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git ib-mfd-iio-input-v5.1
for you to fetch changes up to 81cdab79818988d27d8aeb162b7988c9e6dde936:
iio: adc: add STMPE ADC devicetree bindings (2019-01-16 12:37:36 +0000)
----------------------------------------------------------------
Immutable branch between MFD, IIO and Input due for the v5.1 merge window
----------------------------------------------------------------
Philippe Schenker (3):
dt-bindings: stmpe: Reformatting parameter list and use tabs only
mfd: stmpe: Move ADC related defines to MFD header
Input: stmpe-ts: preparations for STMPE ADC driver
Stefan Agner (3):
mfd: stmpe: Preparations for STMPE ADC driver
iio: adc: add STMPE ADC driver using IIO framework
iio: adc: add STMPE ADC devicetree bindings
.../devicetree/bindings/iio/adc/stmpe-adc.txt | 21 ++ .../bindings/input/touchscreen/stmpe.txt | 116 +++++-- Documentation/devicetree/bindings/mfd/stmpe.txt | 28 +- drivers/iio/adc/Kconfig | 7 + drivers/iio/adc/Makefile | 1 + drivers/iio/adc/stmpe-adc.c | 363 +++++++++++++++++++++ drivers/input/touchscreen/stmpe-ts.c | 66 +--- drivers/mfd/Kconfig | 3 +- drivers/mfd/stmpe.c | 68 ++++ include/linux/mfd/stmpe.h | 21 ++ 10 files changed, 610 insertions(+), 84 deletions(-) create mode 100644 Documentation/devicetree/bindings/iio/adc/stmpe-adc.txt create mode 100644 drivers/iio/adc/stmpe-adc.c
Signature · 4 lines
Lee Jones [李琼斯] Linaro Services Technical Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog