From: Philippe Schenker <philippe.schenker@xxxxxxxxxxx> 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 v6: - Added Rob's Reviewed-by - Added Dmitry's ack - Added Rob's Reviewed-by - Just realized that the comment for st,norequest-mask was at the wrong place, fixed. - Just realized that the comment for st,norequest-mask was at the wrong place, fixed. - Added also tegra30-apalis-v1.1.dtsi, as I forgot that. 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-v1.1.dtsi | 22 +- 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 + 15 files changed, 681 insertions(+), 124 deletions(-) create mode 100644 Documentation/devicetree/bindings/iio/adc/stmpe-adc.txt create mode 100644 drivers/iio/adc/stmpe-adc.c -- 2.20.1
