* [PATCH 0/3] arm imx25 touchscreen/ADC drivers @ 2014-02-20 16:21 ` Markus Pargmann 0 siblings, 0 replies; 76+ messages in thread From: Markus Pargmann @ 2014-02-20 16:21 UTC (permalink / raw) To: devicetree, linux-input, linux-iio Cc: Dmitry Torokhov, Samuel Ortiz, Lee Jones, Jonathan Cameron, linux-arm-kernel, kernel, Markus Pargmann Hi, This series adds 3 drivers to support the i.MX25 Touchscreen/ADC device. The device has 3 parts. The core controls some generic functions of the complete device, including the clock and IRQs. A touchscreen specific conversion queue that works with the central ADC to detect and convert touch positions. And a generic conversion queue which is the same hardware as the touchscreen conversion queue but is supposed to be used for generic ADC conversions. There are 3 drivers to support all parts. fsl-imx25-tsadc is a MFD driver which controls the core. fsl-imx25-tcq is the touchscreen conversion queue driver which registers a touchscreen input device. fsl-imx25-gcq is the generic conversion queue driver that registers a iio device for all inputs available. All drivers are initialized using devicetree bindings. Regards, Markus Pargmann Markus Pargmann (3): mfd: fsl imx25 Touchscreen ADC driver input: touchscreen: imx25 tcq driver iio: adc: fsl,imx25-gcq driver .../devicetree/bindings/iio/adc/fsl,imx25-gcq.txt | 54 ++ .../bindings/input/touchscreen/fsl-mx25-tcq.txt | 29 + .../devicetree/bindings/mfd/fsl-imx25-tsadc.txt | 46 ++ drivers/iio/adc/Kconfig | 7 + drivers/iio/adc/Makefile | 1 + drivers/iio/adc/fsl-imx25-gcq.c | 325 ++++++++++++ drivers/input/touchscreen/Kconfig | 6 + drivers/input/touchscreen/Makefile | 1 + drivers/input/touchscreen/fsl-imx25-tcq.c | 589 +++++++++++++++++++++ drivers/mfd/Kconfig | 9 + drivers/mfd/Makefile | 2 + drivers/mfd/fsl-imx25-tsadc.c | 234 ++++++++ include/linux/mfd/imx25-tsadc.h | 138 +++++ 13 files changed, 1441 insertions(+) create mode 100644 Documentation/devicetree/bindings/iio/adc/fsl,imx25-gcq.txt create mode 100644 Documentation/devicetree/bindings/input/touchscreen/fsl-mx25-tcq.txt create mode 100644 Documentation/devicetree/bindings/mfd/fsl-imx25-tsadc.txt create mode 100644 drivers/iio/adc/fsl-imx25-gcq.c create mode 100644 drivers/input/touchscreen/fsl-imx25-tcq.c create mode 100644 drivers/mfd/fsl-imx25-tsadc.c create mode 100644 include/linux/mfd/imx25-tsadc.h -- 1.8.5.3 ^ permalink raw reply [flat|nested] 76+ messages in thread
* [PATCH 0/3] arm imx25 touchscreen/ADC drivers @ 2014-02-20 16:21 ` Markus Pargmann 0 siblings, 0 replies; 76+ messages in thread From: Markus Pargmann @ 2014-02-20 16:21 UTC (permalink / raw) To: linux-arm-kernel Hi, This series adds 3 drivers to support the i.MX25 Touchscreen/ADC device. The device has 3 parts. The core controls some generic functions of the complete device, including the clock and IRQs. A touchscreen specific conversion queue that works with the central ADC to detect and convert touch positions. And a generic conversion queue which is the same hardware as the touchscreen conversion queue but is supposed to be used for generic ADC conversions. There are 3 drivers to support all parts. fsl-imx25-tsadc is a MFD driver which controls the core. fsl-imx25-tcq is the touchscreen conversion queue driver which registers a touchscreen input device. fsl-imx25-gcq is the generic conversion queue driver that registers a iio device for all inputs available. All drivers are initialized using devicetree bindings. Regards, Markus Pargmann Markus Pargmann (3): mfd: fsl imx25 Touchscreen ADC driver input: touchscreen: imx25 tcq driver iio: adc: fsl,imx25-gcq driver .../devicetree/bindings/iio/adc/fsl,imx25-gcq.txt | 54 ++ .../bindings/input/touchscreen/fsl-mx25-tcq.txt | 29 + .../devicetree/bindings/mfd/fsl-imx25-tsadc.txt | 46 ++ drivers/iio/adc/Kconfig | 7 + drivers/iio/adc/Makefile | 1 + drivers/iio/adc/fsl-imx25-gcq.c | 325 ++++++++++++ drivers/input/touchscreen/Kconfig | 6 + drivers/input/touchscreen/Makefile | 1 + drivers/input/touchscreen/fsl-imx25-tcq.c | 589 +++++++++++++++++++++ drivers/mfd/Kconfig | 9 + drivers/mfd/Makefile | 2 + drivers/mfd/fsl-imx25-tsadc.c | 234 ++++++++ include/linux/mfd/imx25-tsadc.h | 138 +++++ 13 files changed, 1441 insertions(+) create mode 100644 Documentation/devicetree/bindings/iio/adc/fsl,imx25-gcq.txt create mode 100644 Documentation/devicetree/bindings/input/touchscreen/fsl-mx25-tcq.txt create mode 100644 Documentation/devicetree/bindings/mfd/fsl-imx25-tsadc.txt create mode 100644 drivers/iio/adc/fsl-imx25-gcq.c create mode 100644 drivers/input/touchscreen/fsl-imx25-tcq.c create mode 100644 drivers/mfd/fsl-imx25-tsadc.c create mode 100644 include/linux/mfd/imx25-tsadc.h -- 1.8.5.3 ^ permalink raw reply [flat|nested] 76+ messages in thread
* [PATCH 1/3] mfd: fsl imx25 Touchscreen ADC driver 2014-02-20 16:21 ` Markus Pargmann @ 2014-02-20 16:21 ` Markus Pargmann -1 siblings, 0 replies; 76+ messages in thread From: Markus Pargmann @ 2014-02-20 16:21 UTC (permalink / raw) To: devicetree, linux-input, linux-iio Cc: Dmitry Torokhov, Samuel Ortiz, Lee Jones, Jonathan Cameron, linux-arm-kernel, kernel, Markus Pargmann This is the core driver for imx25 touchscreen/adc driver. The module has one shared ADC and two different conversion queues which use the ADC. The two queues are identical. Both can be used for general purpose ADC but one is meant to be used for touchscreens. This driver is the core which manages the central components and registers of the TSC/ADC unit. It manages the IRQs and forwards them to the correct components. Signed-off-by: Markus Pargmann <mpa@pengutronix.de> --- .../devicetree/bindings/mfd/fsl-imx25-tsadc.txt | 46 ++++ drivers/mfd/Kconfig | 9 + drivers/mfd/Makefile | 2 + drivers/mfd/fsl-imx25-tsadc.c | 234 +++++++++++++++++++++ include/linux/mfd/imx25-tsadc.h | 138 ++++++++++++ 5 files changed, 429 insertions(+) create mode 100644 Documentation/devicetree/bindings/mfd/fsl-imx25-tsadc.txt create mode 100644 drivers/mfd/fsl-imx25-tsadc.c create mode 100644 include/linux/mfd/imx25-tsadc.h diff --git a/Documentation/devicetree/bindings/mfd/fsl-imx25-tsadc.txt b/Documentation/devicetree/bindings/mfd/fsl-imx25-tsadc.txt new file mode 100644 index 0000000..a857af0e --- /dev/null +++ b/Documentation/devicetree/bindings/mfd/fsl-imx25-tsadc.txt @@ -0,0 +1,46 @@ +Freescale mx25 ADC/TSC multifunction device + +This device combines two general purpose conversion queues one used for general +ADC and the other used for touchscreens. + +Required properties: + - compatible: Should be "fsl,imx25-tsadc". + - reg: Memory range of the device. + - interrupts: Interrupt for this device as described in + interrupts/interrupts.txt + - clocks: An 'ipg' clock defined as described in clocks/clock.txt + - interrupt-controller: This device is an interrupt controller. It controls + the interrupts of both conversion queues. + - #interrupt-cells: Should be '<1>'. + - #address-cells: Should be '<1>'. + - #size-cells: Should be '<1>'. + - ranges + +This device includes two conversion queues which can be added as subnodes. +The first queue is for the touchscreen, the second for general purpose ADC. + +Example: + tscadc: tscadc@50030000 { + compatible = "fsl,imx25-tsadc"; + reg = <0x50030000 0xc>; + interrupts = <46>; + clocks = <&clks 119>; + clock-names = "ipg"; + interrupt-controller; + #interrupt-cells = <1>; + #address-cells = <1>; + #size-cells = <1>; + ranges; + + tsc: tcq@50030400 { + compatible = "fsl,imx25-tcq"; + reg = <0x50030400 0x60>; + ... + }; + + adc: gcq@50030800 { + compatible = "fsl,imx25-gcq"; + reg = <0x50030800 0x60>; + ... + }; + }; diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig index 49bb445..5b43c72 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig @@ -163,6 +163,15 @@ config MFD_DA9063 Additional drivers must be enabled in order to use the functionality of the device. +config MFD_MX25_TSADC + depends on ARCH_MXC + select REGMAP_MMIO + tristate "Freescale i.MX25 integrated Touchscreen and ADC unit" + help + Enable support for the integrated Touchscreen and ADC unit of the + i.MX25 processors. They consist of a conversion queue for general + purpose ADC and a queue for Touchscreens. + config MFD_MC13XXX tristate depends on (SPI_MASTER || I2C) diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile index 5aea5ef..f8c0093 100644 --- a/drivers/mfd/Makefile +++ b/drivers/mfd/Makefile @@ -76,6 +76,8 @@ obj-$(CONFIG_TWL4030_POWER) += twl4030-power.o obj-$(CONFIG_MFD_TWL4030_AUDIO) += twl4030-audio.o obj-$(CONFIG_TWL6040_CORE) += twl6040.o +obj-$(CONFIG_MFD_MX25_TSADC) += fsl-imx25-tsadc.o + obj-$(CONFIG_MFD_MC13XXX) += mc13xxx-core.o obj-$(CONFIG_MFD_MC13XXX_SPI) += mc13xxx-spi.o obj-$(CONFIG_MFD_MC13XXX_I2C) += mc13xxx-i2c.o diff --git a/drivers/mfd/fsl-imx25-tsadc.c b/drivers/mfd/fsl-imx25-tsadc.c new file mode 100644 index 0000000..549990b --- /dev/null +++ b/drivers/mfd/fsl-imx25-tsadc.c @@ -0,0 +1,234 @@ +/* + * Copyright 2014 Markus Pargmann, Pengutronix <mpa@pengutronix.de> + * + * The code contained herein is licensed under the GNU General Public + * License. You may obtain a copy of the GNU General Public License + * Version 2 or later at the following locations: + * + * http://www.opensource.org/licenses/gpl-license.html + * http://www.gnu.org/copyleft/gpl.html + */ + +#include <linux/clk.h> +#include <linux/interrupt.h> +#include <linux/irq.h> +#include <linux/irqdesc.h> +#include <linux/irqdomain.h> +#include <linux/irqchip/chained_irq.h> +#include <linux/mfd/imx25-tsadc.h> +#include <linux/module.h> +#include <linux/of.h> +#include <linux/of_platform.h> +#include <linux/platform_device.h> +#include <linux/regmap.h> + +struct mx25_tsadc_priv { + struct regmap *regs; + struct irq_domain *domain; + struct clk *clk; +}; + +static struct regmap_config mx25_tsadc = { + .fast_io = true, + .max_register = 0x8, + .reg_bits = 32, + .val_bits = 32, + .reg_stride = 4, +}; + +struct regmap *mx25_tsadc_get_regmap(struct device *dev) +{ + struct platform_device *pdev; + struct mx25_tsadc_priv *priv; + + if (!dev) + return NULL; + + pdev = container_of(dev, struct platform_device, dev); + priv = platform_get_drvdata(pdev); + if (IS_ERR_OR_NULL(priv->regs)) + return NULL; + + return priv->regs; +} +EXPORT_SYMBOL(mx25_tsadc_get_regmap); + +struct clk *mx25_tsadc_get_ipg(struct device *dev) +{ + struct platform_device *pdev; + struct mx25_tsadc_priv *priv; + + if (!dev) + return NULL; + + pdev = container_of(dev, struct platform_device, dev); + priv = platform_get_drvdata(pdev); + if (IS_ERR_OR_NULL(priv->clk)) + return NULL; + + return priv->clk; +} +EXPORT_SYMBOL(mx25_tsadc_get_ipg); + +static void mx25_tsadc_irq_handler(u32 irq, struct irq_desc *desc) +{ + struct mx25_tsadc_priv *priv = irq_desc_get_handler_data(desc); + struct irq_chip *chip = irq_get_chip(irq); + u32 status; + + chained_irq_enter(chip, desc); + + regmap_read(priv->regs, MX25_TSC_TGSR, &status); + + if (status & MX25_TGSR_GCQ_INT) + generic_handle_irq(irq_find_mapping(priv->domain, 1)); + + if (status & MX25_TGSR_TCQ_INT) + generic_handle_irq(irq_find_mapping(priv->domain, 0)); + + chained_irq_exit(chip, desc); +} + +static void mx25_tsadc_nop(struct irq_data *d) +{ +} + +static int mx25_tsadc_set_wake_nop(struct irq_data *d, unsigned int state) +{ + return 0; +} + +static struct irq_chip mx25_tsadc_irq_chip = { + .name = "mx25-tsadc", + .irq_ack = mx25_tsadc_nop, + .irq_mask = mx25_tsadc_nop, + .irq_unmask = mx25_tsadc_nop, + .irq_set_wake = mx25_tsadc_set_wake_nop, +}; + +static int mx25_tsadc_domain_map(struct irq_domain *d, unsigned int irq, + irq_hw_number_t hwirq) +{ + struct mx25_tsadc_priv *priv = d->host_data; + + irq_set_chip_data(irq, priv); + irq_set_chip_and_handler(irq, &mx25_tsadc_irq_chip, + handle_level_irq); + +#ifdef CONFIG_ARM + set_irq_flags(irq, IRQF_VALID); +#else + irq_set_noprobe(irq); +#endif + + return 0; +} + +static struct irq_domain_ops mx25_tsadc_domain_ops = { + .map = mx25_tsadc_domain_map, + .xlate = irq_domain_xlate_onecell, +}; + +static int mx25_tsadc_setup_irq(struct platform_device *pdev, + struct mx25_tsadc_priv *priv) +{ + struct device *dev = &pdev->dev; + struct device_node *np = dev->of_node; + int irq; + + irq = platform_get_irq(pdev, 0); + if (irq < 0) { + dev_err(dev, "Failed to get irq\n"); + return irq; + } + + priv->domain = irq_domain_add_simple(np, 2, 0, &mx25_tsadc_domain_ops, + priv); + if (!priv->domain) { + dev_err(dev, "Failed to add irq domain\n"); + return -ENOMEM; + } + + irq_set_chained_handler(irq, mx25_tsadc_irq_handler); + irq_set_handler_data(irq, priv); + + return 0; +} + +static int mx25_tsadc_probe(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + struct device_node *np = dev->of_node; + struct mx25_tsadc_priv *priv; + struct resource *iores; + int ret; + void __iomem *iomem; + + priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); + if (!priv) + return -ENOMEM; + + iores = platform_get_resource(pdev, IORESOURCE_MEM, 0); + iomem = devm_ioremap_resource(dev, iores); + if (IS_ERR(iomem)) { + dev_err(dev, "Failed to remap iomem\n"); + return PTR_ERR(iomem); + } + + priv->regs = regmap_init_mmio(dev, iomem, &mx25_tsadc); + if (IS_ERR(priv->regs)) { + dev_err(dev, "Failed to initialize regmap\n"); + return PTR_ERR(priv->regs); + } + + priv->clk = devm_clk_get(dev, "ipg"); + if (IS_ERR(priv->clk)) { + dev_err(dev, "Failed to get ipg clock\n"); + return PTR_ERR(priv->clk); + } + + /* Enable clock and reset the component */ + regmap_update_bits(priv->regs, MX25_TSC_TGCR, MX25_TGCR_CLK_EN, + MX25_TGCR_CLK_EN); + regmap_update_bits(priv->regs, MX25_TSC_TGCR, MX25_TGCR_TSC_RST, + MX25_TGCR_TSC_RST); + + /* Setup powersaving mode, but enable internal reference voltage */ + regmap_update_bits(priv->regs, MX25_TSC_TGCR, MX25_TGCR_POWERMODE_MASK, + MX25_TGCR_POWERMODE_SAVE); + regmap_update_bits(priv->regs, MX25_TSC_TGCR, MX25_TGCR_INTREFEN, + MX25_TGCR_INTREFEN); + + ret = mx25_tsadc_setup_irq(pdev, priv); + if (ret) { + dev_err(dev, "Failed to setup irqs\n"); + return ret; + } + + platform_set_drvdata(pdev, priv); + + of_platform_populate(np, NULL, NULL, dev); + + dev_info(dev, "i.MX25/25 Touchscreen and ADC core driver loaded\n"); + + return 0; +} + +static const struct of_device_id mx25_tsadc_ids[] = { + { .compatible = "fsl,imx25-tsadc", }, + { /* Sentinel */ } +}; + +static struct platform_driver mx25_tsadc_driver = { + .driver = { + .name = "mx25-tsadc", + .owner = THIS_MODULE, + .of_match_table = mx25_tsadc_ids, + }, + .probe = mx25_tsadc_probe, +}; +module_platform_driver(mx25_tsadc_driver); + +MODULE_DESCRIPTION("MFD for ADC/TSC for Freescale mx25"); +MODULE_AUTHOR("Markus Pargmann <mpa@pengutronix.de>"); +MODULE_LICENSE("GPL v2"); diff --git a/include/linux/mfd/imx25-tsadc.h b/include/linux/mfd/imx25-tsadc.h new file mode 100644 index 0000000..6fba341 --- /dev/null +++ b/include/linux/mfd/imx25-tsadc.h @@ -0,0 +1,138 @@ +#ifndef _LINUX_INCLUDE_INPUT_IMX25_TSADC_H_ +#define _LINUX_INCLUDE_INPUT_IMX25_TSADC_H_ + +struct regmap; +struct device; +struct clk; + +struct regmap *mx25_tsadc_get_regmap(struct device *dev); +struct clk *mx25_tsadc_get_ipg(struct device *dev); + +#define MX25_TSC_TGCR 0x00 +#define MX25_TSC_TGSR 0x04 +#define MX25_TSC_TICR 0x08 + +/* The same register layout for TC and GC queue */ +#define MX25_ADCQ_FIFO 0x00 +#define MX25_ADCQ_CR 0x04 +#define MX25_ADCQ_SR 0x08 +#define MX25_ADCQ_MR 0x0c +#define MX25_ADCQ_ITEM_7_0 0x20 +#define MX25_ADCQ_ITEM_15_8 0x24 +#define MX25_ADCQ_CFG(n) (0x40 + ((n) * 0x4)) + +/* Register values */ +/* Queue Config register */ +#define MX25_ADCQ_MR_MASK 0xffffffff + +/* TGCR */ +#define MX25_TGCR_PDBTIME(x) ((x) << 25) +#define MX25_TGCR_PDBTIME_MASK MX25_TGCR_PDBTIME(0x7f) +#define MX25_TGCR_PDBEN (1 << 24) +#define MX25_TGCR_PDEN (1 << 23) +#define MX25_TGCR_ADCCLKCFG(x) ((x) << 16) +#define MX25_TGCR_GET_ADCCLK(x) (((x) >> 16) & 0x1f) +#define MX25_TGCR_INTREFEN (1 << 10) +#define MX25_TGCR_POWERMODE_MASK (3 << 8) +#define MX25_TGCR_POWERMODE_SAVE (1 << 8) +#define MX25_TGCR_POWERMODE_ON (2 << 8) +#define MX25_TGCR_STLC (1 << 5) +#define MX25_TGCR_SLPC (1 << 4) +#define MX25_TGCR_FUNC_RST (1 << 2) +#define MX25_TGCR_TSC_RST (1 << 1) +#define MX25_TGCR_CLK_EN (1 << 0) + +/* TGSR */ +#define MX25_TGSR_SLP_INT (1 << 2) +#define MX25_TGSR_GCQ_INT (1 << 1) +#define MX25_TGSR_TCQ_INT (1 << 0) + +/* ADCQ_ITEM_* */ +#define _MX25_ADCQ_ITEM(item, x) ((x) << ((item) * 4)) +#define MX25_ADCQ_ITEM(item, x) ((item) >= 8 ? \ + _MX25_ADCQ_ITEM((item) - 8, (x)) : _MX25_ADCQ_ITEM((item), (x))) + +/* ADCQ_FIFO (TCQFIFO and GCQFIFO) */ +#define MX25_ADCQ_FIFO_DATA(x) (((x) >> 4) & 0xfff) +#define MX25_ADCQ_FIFO_ID(x) ((x) & 0xf) + +/* ADCQ_CR (TCQR and GCQR) */ +#define MX25_ADCQ_CR_PDCFG_LEVEL (1 << 19) +#define MX25_ADCQ_CR_PDMSK (1 << 18) +#define MX25_ADCQ_CR_FRST (1 << 17) +#define MX25_ADCQ_CR_QRST (1 << 16) +#define MX25_ADCQ_CR_RWAIT_MASK (0xf << 12) +#define MX25_ADCQ_CR_RWAIT(x) ((x) << 12) +#define MX25_ADCQ_CR_WMRK_MASK (0xf << 8) +#define MX25_ADCQ_CR_WMRK(x) ((x) << 8) +#define MX25_ADCQ_CR_LITEMID_MASK (0xf << 4) +#define MX25_ADCQ_CR_LITEMID(x) ((x) << 4) +#define MX25_ADCQ_CR_RPT (1 << 3) +#define MX25_ADCQ_CR_FQS (1 << 2) +#define MX25_ADCQ_CR_QSM_MASK 0x3 +#define MX25_ADCQ_CR_QSM_PD 0x1 +#define MX25_ADCQ_CR_QSM_FQS 0x2 +#define MX25_ADCQ_CR_QSM_FQS_PD 0x3 + +/* ADCQ_SR (TCQSR and GCQSR) */ +#define MX25_ADCQ_SR_FDRY (1 << 15) +#define MX25_ADCQ_SR_FULL (1 << 14) +#define MX25_ADCQ_SR_EMPT (1 << 13) +#define MX25_ADCQ_SR_FDN(x) (((x) >> 8) & 0x1f) +#define MX25_ADCQ_SR_FRR (1 << 6) +#define MX25_ADCQ_SR_FUR (1 << 5) +#define MX25_ADCQ_SR_FOR (1 << 4) +#define MX25_ADCQ_SR_EOQ (1 << 1) +#define MX25_ADCQ_SR_PD (1 << 0) + +/* ADCQ_MR (TCQMR and GCQMR) */ +#define MX25_ADCQ_MR_FDRY_DMA (1 << 31) +#define MX25_ADCQ_MR_FER_DMA (1 << 22) +#define MX25_ADCQ_MR_FUR_DMA (1 << 21) +#define MX25_ADCQ_MR_FOR_DMA (1 << 20) +#define MX25_ADCQ_MR_EOQ_DMA (1 << 17) +#define MX25_ADCQ_MR_PD_DMA (1 << 16) +#define MX25_ADCQ_MR_FDRY_IRQ (1 << 15) +#define MX25_ADCQ_MR_FER_IRQ (1 << 6) +#define MX25_ADCQ_MR_FUR_IRQ (1 << 5) +#define MX25_ADCQ_MR_FOR_IRQ (1 << 4) +#define MX25_ADCQ_MR_EOQ_IRQ (1 << 1) +#define MX25_ADCQ_MR_PD_IRQ (1 << 0) + +/* ADCQ_CFG (TICR, TCC0-7,GCC0-7) */ +#define MX25_ADCQ_CFG_SETTLING_TIME(x) ((x) << 24) +#define MX25_ADCQ_CFG_IGS (1 << 20) +#define MX25_ADCQ_CFG_NOS_MASK (0xf << 16) +#define MX25_ADCQ_CFG_NOS(x) (((x) - 1) << 16) +#define MX25_ADCQ_CFG_WIPER (1 << 15) +#define MX25_ADCQ_CFG_YNLR (1 << 14) +#define MX25_ADCQ_CFG_YPLL_HIGH 0 +#define MX25_ADCQ_CFG_YPLL_OFF (1 << 12) +#define MX25_ADCQ_CFG_YPLL_LOW (3 << 12) +#define MX25_ADCQ_CFG_XNUR_HIGH 0 +#define MX25_ADCQ_CFG_XNUR_OFF (1 << 10) +#define MX25_ADCQ_CFG_XNUR_LOW (3 << 10) +#define MX25_ADCQ_CFG_XPUL_OFF (1 << 9) +#define MX25_ADCQ_CFG_XPUL_HIGH 0 +#define MX25_ADCQ_CFG_REFP_YP 0 +#define MX25_ADCQ_CFG_REFP_XP (1 << 7) +#define MX25_ADCQ_CFG_REFP_EXT (2 << 7) +#define MX25_ADCQ_CFG_REFP_INT (3 << 7) +#define MX25_ADCQ_CFG_REFP_MASK (3 << 7) +#define MX25_ADCQ_CFG_IN_XP 0 +#define MX25_ADCQ_CFG_IN_YP (1 << 4) +#define MX25_ADCQ_CFG_IN_XN (2 << 4) +#define MX25_ADCQ_CFG_IN_YN (3 << 4) +#define MX25_ADCQ_CFG_IN_WIPER (4 << 4) +#define MX25_ADCQ_CFG_IN_AUX0 (5 << 4) +#define MX25_ADCQ_CFG_IN_AUX1 (6 << 4) +#define MX25_ADCQ_CFG_IN_AUX2 (7 << 4) +#define MX25_ADCQ_CFG_REFN_XN 0 +#define MX25_ADCQ_CFG_REFN_YN (1 << 2) +#define MX25_ADCQ_CFG_REFN_NGND (2 << 2) +#define MX25_ADCQ_CFG_REFN_NGND2 (3 << 2) +#define MX25_ADCQ_CFG_REFN_MASK (3 << 2) +#define MX25_ADCQ_CFG_PENIACK (1 << 1) + + +#endif /* _LINUX_INCLUDE_INPUT_IMX25_TSADC_H_ */ -- 1.8.5.3 ^ permalink raw reply related [flat|nested] 76+ messages in thread
* [PATCH 1/3] mfd: fsl imx25 Touchscreen ADC driver @ 2014-02-20 16:21 ` Markus Pargmann 0 siblings, 0 replies; 76+ messages in thread From: Markus Pargmann @ 2014-02-20 16:21 UTC (permalink / raw) To: linux-arm-kernel This is the core driver for imx25 touchscreen/adc driver. The module has one shared ADC and two different conversion queues which use the ADC. The two queues are identical. Both can be used for general purpose ADC but one is meant to be used for touchscreens. This driver is the core which manages the central components and registers of the TSC/ADC unit. It manages the IRQs and forwards them to the correct components. Signed-off-by: Markus Pargmann <mpa@pengutronix.de> --- .../devicetree/bindings/mfd/fsl-imx25-tsadc.txt | 46 ++++ drivers/mfd/Kconfig | 9 + drivers/mfd/Makefile | 2 + drivers/mfd/fsl-imx25-tsadc.c | 234 +++++++++++++++++++++ include/linux/mfd/imx25-tsadc.h | 138 ++++++++++++ 5 files changed, 429 insertions(+) create mode 100644 Documentation/devicetree/bindings/mfd/fsl-imx25-tsadc.txt create mode 100644 drivers/mfd/fsl-imx25-tsadc.c create mode 100644 include/linux/mfd/imx25-tsadc.h diff --git a/Documentation/devicetree/bindings/mfd/fsl-imx25-tsadc.txt b/Documentation/devicetree/bindings/mfd/fsl-imx25-tsadc.txt new file mode 100644 index 0000000..a857af0e --- /dev/null +++ b/Documentation/devicetree/bindings/mfd/fsl-imx25-tsadc.txt @@ -0,0 +1,46 @@ +Freescale mx25 ADC/TSC multifunction device + +This device combines two general purpose conversion queues one used for general +ADC and the other used for touchscreens. + +Required properties: + - compatible: Should be "fsl,imx25-tsadc". + - reg: Memory range of the device. + - interrupts: Interrupt for this device as described in + interrupts/interrupts.txt + - clocks: An 'ipg' clock defined as described in clocks/clock.txt + - interrupt-controller: This device is an interrupt controller. It controls + the interrupts of both conversion queues. + - #interrupt-cells: Should be '<1>'. + - #address-cells: Should be '<1>'. + - #size-cells: Should be '<1>'. + - ranges + +This device includes two conversion queues which can be added as subnodes. +The first queue is for the touchscreen, the second for general purpose ADC. + +Example: + tscadc: tscadc at 50030000 { + compatible = "fsl,imx25-tsadc"; + reg = <0x50030000 0xc>; + interrupts = <46>; + clocks = <&clks 119>; + clock-names = "ipg"; + interrupt-controller; + #interrupt-cells = <1>; + #address-cells = <1>; + #size-cells = <1>; + ranges; + + tsc: tcq at 50030400 { + compatible = "fsl,imx25-tcq"; + reg = <0x50030400 0x60>; + ... + }; + + adc: gcq at 50030800 { + compatible = "fsl,imx25-gcq"; + reg = <0x50030800 0x60>; + ... + }; + }; diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig index 49bb445..5b43c72 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig @@ -163,6 +163,15 @@ config MFD_DA9063 Additional drivers must be enabled in order to use the functionality of the device. +config MFD_MX25_TSADC + depends on ARCH_MXC + select REGMAP_MMIO + tristate "Freescale i.MX25 integrated Touchscreen and ADC unit" + help + Enable support for the integrated Touchscreen and ADC unit of the + i.MX25 processors. They consist of a conversion queue for general + purpose ADC and a queue for Touchscreens. + config MFD_MC13XXX tristate depends on (SPI_MASTER || I2C) diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile index 5aea5ef..f8c0093 100644 --- a/drivers/mfd/Makefile +++ b/drivers/mfd/Makefile @@ -76,6 +76,8 @@ obj-$(CONFIG_TWL4030_POWER) += twl4030-power.o obj-$(CONFIG_MFD_TWL4030_AUDIO) += twl4030-audio.o obj-$(CONFIG_TWL6040_CORE) += twl6040.o +obj-$(CONFIG_MFD_MX25_TSADC) += fsl-imx25-tsadc.o + obj-$(CONFIG_MFD_MC13XXX) += mc13xxx-core.o obj-$(CONFIG_MFD_MC13XXX_SPI) += mc13xxx-spi.o obj-$(CONFIG_MFD_MC13XXX_I2C) += mc13xxx-i2c.o diff --git a/drivers/mfd/fsl-imx25-tsadc.c b/drivers/mfd/fsl-imx25-tsadc.c new file mode 100644 index 0000000..549990b --- /dev/null +++ b/drivers/mfd/fsl-imx25-tsadc.c @@ -0,0 +1,234 @@ +/* + * Copyright 2014 Markus Pargmann, Pengutronix <mpa@pengutronix.de> + * + * The code contained herein is licensed under the GNU General Public + * License. You may obtain a copy of the GNU General Public License + * Version 2 or later at the following locations: + * + * http://www.opensource.org/licenses/gpl-license.html + * http://www.gnu.org/copyleft/gpl.html + */ + +#include <linux/clk.h> +#include <linux/interrupt.h> +#include <linux/irq.h> +#include <linux/irqdesc.h> +#include <linux/irqdomain.h> +#include <linux/irqchip/chained_irq.h> +#include <linux/mfd/imx25-tsadc.h> +#include <linux/module.h> +#include <linux/of.h> +#include <linux/of_platform.h> +#include <linux/platform_device.h> +#include <linux/regmap.h> + +struct mx25_tsadc_priv { + struct regmap *regs; + struct irq_domain *domain; + struct clk *clk; +}; + +static struct regmap_config mx25_tsadc = { + .fast_io = true, + .max_register = 0x8, + .reg_bits = 32, + .val_bits = 32, + .reg_stride = 4, +}; + +struct regmap *mx25_tsadc_get_regmap(struct device *dev) +{ + struct platform_device *pdev; + struct mx25_tsadc_priv *priv; + + if (!dev) + return NULL; + + pdev = container_of(dev, struct platform_device, dev); + priv = platform_get_drvdata(pdev); + if (IS_ERR_OR_NULL(priv->regs)) + return NULL; + + return priv->regs; +} +EXPORT_SYMBOL(mx25_tsadc_get_regmap); + +struct clk *mx25_tsadc_get_ipg(struct device *dev) +{ + struct platform_device *pdev; + struct mx25_tsadc_priv *priv; + + if (!dev) + return NULL; + + pdev = container_of(dev, struct platform_device, dev); + priv = platform_get_drvdata(pdev); + if (IS_ERR_OR_NULL(priv->clk)) + return NULL; + + return priv->clk; +} +EXPORT_SYMBOL(mx25_tsadc_get_ipg); + +static void mx25_tsadc_irq_handler(u32 irq, struct irq_desc *desc) +{ + struct mx25_tsadc_priv *priv = irq_desc_get_handler_data(desc); + struct irq_chip *chip = irq_get_chip(irq); + u32 status; + + chained_irq_enter(chip, desc); + + regmap_read(priv->regs, MX25_TSC_TGSR, &status); + + if (status & MX25_TGSR_GCQ_INT) + generic_handle_irq(irq_find_mapping(priv->domain, 1)); + + if (status & MX25_TGSR_TCQ_INT) + generic_handle_irq(irq_find_mapping(priv->domain, 0)); + + chained_irq_exit(chip, desc); +} + +static void mx25_tsadc_nop(struct irq_data *d) +{ +} + +static int mx25_tsadc_set_wake_nop(struct irq_data *d, unsigned int state) +{ + return 0; +} + +static struct irq_chip mx25_tsadc_irq_chip = { + .name = "mx25-tsadc", + .irq_ack = mx25_tsadc_nop, + .irq_mask = mx25_tsadc_nop, + .irq_unmask = mx25_tsadc_nop, + .irq_set_wake = mx25_tsadc_set_wake_nop, +}; + +static int mx25_tsadc_domain_map(struct irq_domain *d, unsigned int irq, + irq_hw_number_t hwirq) +{ + struct mx25_tsadc_priv *priv = d->host_data; + + irq_set_chip_data(irq, priv); + irq_set_chip_and_handler(irq, &mx25_tsadc_irq_chip, + handle_level_irq); + +#ifdef CONFIG_ARM + set_irq_flags(irq, IRQF_VALID); +#else + irq_set_noprobe(irq); +#endif + + return 0; +} + +static struct irq_domain_ops mx25_tsadc_domain_ops = { + .map = mx25_tsadc_domain_map, + .xlate = irq_domain_xlate_onecell, +}; + +static int mx25_tsadc_setup_irq(struct platform_device *pdev, + struct mx25_tsadc_priv *priv) +{ + struct device *dev = &pdev->dev; + struct device_node *np = dev->of_node; + int irq; + + irq = platform_get_irq(pdev, 0); + if (irq < 0) { + dev_err(dev, "Failed to get irq\n"); + return irq; + } + + priv->domain = irq_domain_add_simple(np, 2, 0, &mx25_tsadc_domain_ops, + priv); + if (!priv->domain) { + dev_err(dev, "Failed to add irq domain\n"); + return -ENOMEM; + } + + irq_set_chained_handler(irq, mx25_tsadc_irq_handler); + irq_set_handler_data(irq, priv); + + return 0; +} + +static int mx25_tsadc_probe(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + struct device_node *np = dev->of_node; + struct mx25_tsadc_priv *priv; + struct resource *iores; + int ret; + void __iomem *iomem; + + priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); + if (!priv) + return -ENOMEM; + + iores = platform_get_resource(pdev, IORESOURCE_MEM, 0); + iomem = devm_ioremap_resource(dev, iores); + if (IS_ERR(iomem)) { + dev_err(dev, "Failed to remap iomem\n"); + return PTR_ERR(iomem); + } + + priv->regs = regmap_init_mmio(dev, iomem, &mx25_tsadc); + if (IS_ERR(priv->regs)) { + dev_err(dev, "Failed to initialize regmap\n"); + return PTR_ERR(priv->regs); + } + + priv->clk = devm_clk_get(dev, "ipg"); + if (IS_ERR(priv->clk)) { + dev_err(dev, "Failed to get ipg clock\n"); + return PTR_ERR(priv->clk); + } + + /* Enable clock and reset the component */ + regmap_update_bits(priv->regs, MX25_TSC_TGCR, MX25_TGCR_CLK_EN, + MX25_TGCR_CLK_EN); + regmap_update_bits(priv->regs, MX25_TSC_TGCR, MX25_TGCR_TSC_RST, + MX25_TGCR_TSC_RST); + + /* Setup powersaving mode, but enable internal reference voltage */ + regmap_update_bits(priv->regs, MX25_TSC_TGCR, MX25_TGCR_POWERMODE_MASK, + MX25_TGCR_POWERMODE_SAVE); + regmap_update_bits(priv->regs, MX25_TSC_TGCR, MX25_TGCR_INTREFEN, + MX25_TGCR_INTREFEN); + + ret = mx25_tsadc_setup_irq(pdev, priv); + if (ret) { + dev_err(dev, "Failed to setup irqs\n"); + return ret; + } + + platform_set_drvdata(pdev, priv); + + of_platform_populate(np, NULL, NULL, dev); + + dev_info(dev, "i.MX25/25 Touchscreen and ADC core driver loaded\n"); + + return 0; +} + +static const struct of_device_id mx25_tsadc_ids[] = { + { .compatible = "fsl,imx25-tsadc", }, + { /* Sentinel */ } +}; + +static struct platform_driver mx25_tsadc_driver = { + .driver = { + .name = "mx25-tsadc", + .owner = THIS_MODULE, + .of_match_table = mx25_tsadc_ids, + }, + .probe = mx25_tsadc_probe, +}; +module_platform_driver(mx25_tsadc_driver); + +MODULE_DESCRIPTION("MFD for ADC/TSC for Freescale mx25"); +MODULE_AUTHOR("Markus Pargmann <mpa@pengutronix.de>"); +MODULE_LICENSE("GPL v2"); diff --git a/include/linux/mfd/imx25-tsadc.h b/include/linux/mfd/imx25-tsadc.h new file mode 100644 index 0000000..6fba341 --- /dev/null +++ b/include/linux/mfd/imx25-tsadc.h @@ -0,0 +1,138 @@ +#ifndef _LINUX_INCLUDE_INPUT_IMX25_TSADC_H_ +#define _LINUX_INCLUDE_INPUT_IMX25_TSADC_H_ + +struct regmap; +struct device; +struct clk; + +struct regmap *mx25_tsadc_get_regmap(struct device *dev); +struct clk *mx25_tsadc_get_ipg(struct device *dev); + +#define MX25_TSC_TGCR 0x00 +#define MX25_TSC_TGSR 0x04 +#define MX25_TSC_TICR 0x08 + +/* The same register layout for TC and GC queue */ +#define MX25_ADCQ_FIFO 0x00 +#define MX25_ADCQ_CR 0x04 +#define MX25_ADCQ_SR 0x08 +#define MX25_ADCQ_MR 0x0c +#define MX25_ADCQ_ITEM_7_0 0x20 +#define MX25_ADCQ_ITEM_15_8 0x24 +#define MX25_ADCQ_CFG(n) (0x40 + ((n) * 0x4)) + +/* Register values */ +/* Queue Config register */ +#define MX25_ADCQ_MR_MASK 0xffffffff + +/* TGCR */ +#define MX25_TGCR_PDBTIME(x) ((x) << 25) +#define MX25_TGCR_PDBTIME_MASK MX25_TGCR_PDBTIME(0x7f) +#define MX25_TGCR_PDBEN (1 << 24) +#define MX25_TGCR_PDEN (1 << 23) +#define MX25_TGCR_ADCCLKCFG(x) ((x) << 16) +#define MX25_TGCR_GET_ADCCLK(x) (((x) >> 16) & 0x1f) +#define MX25_TGCR_INTREFEN (1 << 10) +#define MX25_TGCR_POWERMODE_MASK (3 << 8) +#define MX25_TGCR_POWERMODE_SAVE (1 << 8) +#define MX25_TGCR_POWERMODE_ON (2 << 8) +#define MX25_TGCR_STLC (1 << 5) +#define MX25_TGCR_SLPC (1 << 4) +#define MX25_TGCR_FUNC_RST (1 << 2) +#define MX25_TGCR_TSC_RST (1 << 1) +#define MX25_TGCR_CLK_EN (1 << 0) + +/* TGSR */ +#define MX25_TGSR_SLP_INT (1 << 2) +#define MX25_TGSR_GCQ_INT (1 << 1) +#define MX25_TGSR_TCQ_INT (1 << 0) + +/* ADCQ_ITEM_* */ +#define _MX25_ADCQ_ITEM(item, x) ((x) << ((item) * 4)) +#define MX25_ADCQ_ITEM(item, x) ((item) >= 8 ? \ + _MX25_ADCQ_ITEM((item) - 8, (x)) : _MX25_ADCQ_ITEM((item), (x))) + +/* ADCQ_FIFO (TCQFIFO and GCQFIFO) */ +#define MX25_ADCQ_FIFO_DATA(x) (((x) >> 4) & 0xfff) +#define MX25_ADCQ_FIFO_ID(x) ((x) & 0xf) + +/* ADCQ_CR (TCQR and GCQR) */ +#define MX25_ADCQ_CR_PDCFG_LEVEL (1 << 19) +#define MX25_ADCQ_CR_PDMSK (1 << 18) +#define MX25_ADCQ_CR_FRST (1 << 17) +#define MX25_ADCQ_CR_QRST (1 << 16) +#define MX25_ADCQ_CR_RWAIT_MASK (0xf << 12) +#define MX25_ADCQ_CR_RWAIT(x) ((x) << 12) +#define MX25_ADCQ_CR_WMRK_MASK (0xf << 8) +#define MX25_ADCQ_CR_WMRK(x) ((x) << 8) +#define MX25_ADCQ_CR_LITEMID_MASK (0xf << 4) +#define MX25_ADCQ_CR_LITEMID(x) ((x) << 4) +#define MX25_ADCQ_CR_RPT (1 << 3) +#define MX25_ADCQ_CR_FQS (1 << 2) +#define MX25_ADCQ_CR_QSM_MASK 0x3 +#define MX25_ADCQ_CR_QSM_PD 0x1 +#define MX25_ADCQ_CR_QSM_FQS 0x2 +#define MX25_ADCQ_CR_QSM_FQS_PD 0x3 + +/* ADCQ_SR (TCQSR and GCQSR) */ +#define MX25_ADCQ_SR_FDRY (1 << 15) +#define MX25_ADCQ_SR_FULL (1 << 14) +#define MX25_ADCQ_SR_EMPT (1 << 13) +#define MX25_ADCQ_SR_FDN(x) (((x) >> 8) & 0x1f) +#define MX25_ADCQ_SR_FRR (1 << 6) +#define MX25_ADCQ_SR_FUR (1 << 5) +#define MX25_ADCQ_SR_FOR (1 << 4) +#define MX25_ADCQ_SR_EOQ (1 << 1) +#define MX25_ADCQ_SR_PD (1 << 0) + +/* ADCQ_MR (TCQMR and GCQMR) */ +#define MX25_ADCQ_MR_FDRY_DMA (1 << 31) +#define MX25_ADCQ_MR_FER_DMA (1 << 22) +#define MX25_ADCQ_MR_FUR_DMA (1 << 21) +#define MX25_ADCQ_MR_FOR_DMA (1 << 20) +#define MX25_ADCQ_MR_EOQ_DMA (1 << 17) +#define MX25_ADCQ_MR_PD_DMA (1 << 16) +#define MX25_ADCQ_MR_FDRY_IRQ (1 << 15) +#define MX25_ADCQ_MR_FER_IRQ (1 << 6) +#define MX25_ADCQ_MR_FUR_IRQ (1 << 5) +#define MX25_ADCQ_MR_FOR_IRQ (1 << 4) +#define MX25_ADCQ_MR_EOQ_IRQ (1 << 1) +#define MX25_ADCQ_MR_PD_IRQ (1 << 0) + +/* ADCQ_CFG (TICR, TCC0-7,GCC0-7) */ +#define MX25_ADCQ_CFG_SETTLING_TIME(x) ((x) << 24) +#define MX25_ADCQ_CFG_IGS (1 << 20) +#define MX25_ADCQ_CFG_NOS_MASK (0xf << 16) +#define MX25_ADCQ_CFG_NOS(x) (((x) - 1) << 16) +#define MX25_ADCQ_CFG_WIPER (1 << 15) +#define MX25_ADCQ_CFG_YNLR (1 << 14) +#define MX25_ADCQ_CFG_YPLL_HIGH 0 +#define MX25_ADCQ_CFG_YPLL_OFF (1 << 12) +#define MX25_ADCQ_CFG_YPLL_LOW (3 << 12) +#define MX25_ADCQ_CFG_XNUR_HIGH 0 +#define MX25_ADCQ_CFG_XNUR_OFF (1 << 10) +#define MX25_ADCQ_CFG_XNUR_LOW (3 << 10) +#define MX25_ADCQ_CFG_XPUL_OFF (1 << 9) +#define MX25_ADCQ_CFG_XPUL_HIGH 0 +#define MX25_ADCQ_CFG_REFP_YP 0 +#define MX25_ADCQ_CFG_REFP_XP (1 << 7) +#define MX25_ADCQ_CFG_REFP_EXT (2 << 7) +#define MX25_ADCQ_CFG_REFP_INT (3 << 7) +#define MX25_ADCQ_CFG_REFP_MASK (3 << 7) +#define MX25_ADCQ_CFG_IN_XP 0 +#define MX25_ADCQ_CFG_IN_YP (1 << 4) +#define MX25_ADCQ_CFG_IN_XN (2 << 4) +#define MX25_ADCQ_CFG_IN_YN (3 << 4) +#define MX25_ADCQ_CFG_IN_WIPER (4 << 4) +#define MX25_ADCQ_CFG_IN_AUX0 (5 << 4) +#define MX25_ADCQ_CFG_IN_AUX1 (6 << 4) +#define MX25_ADCQ_CFG_IN_AUX2 (7 << 4) +#define MX25_ADCQ_CFG_REFN_XN 0 +#define MX25_ADCQ_CFG_REFN_YN (1 << 2) +#define MX25_ADCQ_CFG_REFN_NGND (2 << 2) +#define MX25_ADCQ_CFG_REFN_NGND2 (3 << 2) +#define MX25_ADCQ_CFG_REFN_MASK (3 << 2) +#define MX25_ADCQ_CFG_PENIACK (1 << 1) + + +#endif /* _LINUX_INCLUDE_INPUT_IMX25_TSADC_H_ */ -- 1.8.5.3 ^ permalink raw reply related [flat|nested] 76+ messages in thread
* Re: [PATCH 1/3] mfd: fsl imx25 Touchscreen ADC driver 2014-02-20 16:21 ` Markus Pargmann @ 2014-02-20 17:17 ` Fabio Estevam -1 siblings, 0 replies; 76+ messages in thread From: Fabio Estevam @ 2014-02-20 17:17 UTC (permalink / raw) To: Markus Pargmann Cc: devicetree, linux-input, linux-iio, Dmitry Torokhov, Samuel Ortiz, Lee Jones, Jonathan Cameron, linux-arm-kernel, Sascha Hauer Hi Markus, On Thu, Feb 20, 2014 at 1:21 PM, Markus Pargmann <mpa@pengutronix.de> wrote: > This is the core driver for imx25 touchscreen/adc driver. The module > has one shared ADC and two different conversion queues which use the > ADC. The two queues are identical. Both can be used for general purpose > ADC but one is meant to be used for touchscreens. > > This driver is the core which manages the central components and > registers of the TSC/ADC unit. It manages the IRQs and forwards them to > the correct components. > > Signed-off-by: Markus Pargmann <mpa@pengutronix.de> That's great :-) Nice work! > --- > .../devicetree/bindings/mfd/fsl-imx25-tsadc.txt | 46 ++++ > drivers/mfd/Kconfig | 9 + > drivers/mfd/Makefile | 2 + > drivers/mfd/fsl-imx25-tsadc.c | 234 +++++++++++++++++++++ > include/linux/mfd/imx25-tsadc.h | 138 ++++++++++++ > 5 files changed, 429 insertions(+) > create mode 100644 Documentation/devicetree/bindings/mfd/fsl-imx25-tsadc.txt > create mode 100644 drivers/mfd/fsl-imx25-tsadc.c > create mode 100644 include/linux/mfd/imx25-tsadc.h > > diff --git a/Documentation/devicetree/bindings/mfd/fsl-imx25-tsadc.txt b/Documentation/devicetree/bindings/mfd/fsl-imx25-tsadc.txt > new file mode 100644 > index 0000000..a857af0e > --- /dev/null > +++ b/Documentation/devicetree/bindings/mfd/fsl-imx25-tsadc.txt > @@ -0,0 +1,46 @@ > +Freescale mx25 ADC/TSC multifunction device > + > +This device combines two general purpose conversion queues one used for general > +ADC and the other used for touchscreens. > + > +Required properties: > + - compatible: Should be "fsl,imx25-tsadc". > + - reg: Memory range of the device. > + - interrupts: Interrupt for this device as described in > + interrupts/interrupts.txt > + - clocks: An 'ipg' clock defined as described in clocks/clock.txt > + - interrupt-controller: This device is an interrupt controller. It controls > + the interrupts of both conversion queues. > + - #interrupt-cells: Should be '<1>'. > + - #address-cells: Should be '<1>'. > + - #size-cells: Should be '<1>'. > + - ranges > + > +This device includes two conversion queues which can be added as subnodes. > +The first queue is for the touchscreen, the second for general purpose ADC. > + > +Example: > + tscadc: tscadc@50030000 { > + compatible = "fsl,imx25-tsadc"; > + reg = <0x50030000 0xc>; > + interrupts = <46>; > + clocks = <&clks 119>; > + clock-names = "ipg"; > + interrupt-controller; > + #interrupt-cells = <1>; > + #address-cells = <1>; > + #size-cells = <1>; > + ranges; > + > + tsc: tcq@50030400 { > + compatible = "fsl,imx25-tcq"; > + reg = <0x50030400 0x60>; > + ... > + }; > + > + adc: gcq@50030800 { > + compatible = "fsl,imx25-gcq"; > + reg = <0x50030800 0x60>; > + ... > + }; > + }; The meaning of 'tcq' and 'gcq' acronyms are not obvious. Could they be written more explicitily? Also, what does the '...' mean? > +static int mx25_tsadc_domain_map(struct irq_domain *d, unsigned int irq, > + irq_hw_number_t hwirq) > +{ > + struct mx25_tsadc_priv *priv = d->host_data; > + > + irq_set_chip_data(irq, priv); > + irq_set_chip_and_handler(irq, &mx25_tsadc_irq_chip, > + handle_level_irq); > + > +#ifdef CONFIG_ARM > + set_irq_flags(irq, IRQF_VALID); > +#else > + irq_set_noprobe(irq); > +#endif Do we really need these ifdef's? Can't we just assume that CONFIG_ARM is always selected for this driver? > +static int mx25_tsadc_probe(struct platform_device *pdev) > +{ > + struct device *dev = &pdev->dev; > + struct device_node *np = dev->of_node; > + struct mx25_tsadc_priv *priv; > + struct resource *iores; > + int ret; > + void __iomem *iomem; > + > + priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); > + if (!priv) > + return -ENOMEM; > + > + iores = platform_get_resource(pdev, IORESOURCE_MEM, 0); > + iomem = devm_ioremap_resource(dev, iores); > + if (IS_ERR(iomem)) { > + dev_err(dev, "Failed to remap iomem\n"); > + return PTR_ERR(iomem); > + } > + > + priv->regs = regmap_init_mmio(dev, iomem, &mx25_tsadc); > + if (IS_ERR(priv->regs)) { > + dev_err(dev, "Failed to initialize regmap\n"); > + return PTR_ERR(priv->regs); > + } > + > + priv->clk = devm_clk_get(dev, "ipg"); > + if (IS_ERR(priv->clk)) { > + dev_err(dev, "Failed to get ipg clock\n"); > + return PTR_ERR(priv->clk); > + } > + > + /* Enable clock and reset the component */ > + regmap_update_bits(priv->regs, MX25_TSC_TGCR, MX25_TGCR_CLK_EN, > + MX25_TGCR_CLK_EN); > + regmap_update_bits(priv->regs, MX25_TSC_TGCR, MX25_TGCR_TSC_RST, > + MX25_TGCR_TSC_RST); > + > + /* Setup powersaving mode, but enable internal reference voltage */ > + regmap_update_bits(priv->regs, MX25_TSC_TGCR, MX25_TGCR_POWERMODE_MASK, > + MX25_TGCR_POWERMODE_SAVE); > + regmap_update_bits(priv->regs, MX25_TSC_TGCR, MX25_TGCR_INTREFEN, > + MX25_TGCR_INTREFEN); > + > + ret = mx25_tsadc_setup_irq(pdev, priv); > + if (ret) { > + dev_err(dev, "Failed to setup irqs\n"); > + return ret; > + } > + > + platform_set_drvdata(pdev, priv); > + > + of_platform_populate(np, NULL, NULL, dev); > + > + dev_info(dev, "i.MX25/25 Touchscreen and ADC core driver loaded\n"); You could remove the double '25/25'. > + > + return 0; > +} > + > +static const struct of_device_id mx25_tsadc_ids[] = { > + { .compatible = "fsl,imx25-tsadc", }, > + { /* Sentinel */ } > +}; > + > +static struct platform_driver mx25_tsadc_driver = { > + .driver = { > + .name = "mx25-tsadc", > + .owner = THIS_MODULE, > + .of_match_table = mx25_tsadc_ids, > + }, > + .probe = mx25_tsadc_probe, > +}; > +module_platform_driver(mx25_tsadc_driver); > + > +MODULE_DESCRIPTION("MFD for ADC/TSC for Freescale mx25"); > +MODULE_AUTHOR("Markus Pargmann <mpa@pengutronix.de>"); > +MODULE_LICENSE("GPL v2"); MODULE_ALIAS() as well? ^ permalink raw reply [flat|nested] 76+ messages in thread
* [PATCH 1/3] mfd: fsl imx25 Touchscreen ADC driver @ 2014-02-20 17:17 ` Fabio Estevam 0 siblings, 0 replies; 76+ messages in thread From: Fabio Estevam @ 2014-02-20 17:17 UTC (permalink / raw) To: linux-arm-kernel Hi Markus, On Thu, Feb 20, 2014 at 1:21 PM, Markus Pargmann <mpa@pengutronix.de> wrote: > This is the core driver for imx25 touchscreen/adc driver. The module > has one shared ADC and two different conversion queues which use the > ADC. The two queues are identical. Both can be used for general purpose > ADC but one is meant to be used for touchscreens. > > This driver is the core which manages the central components and > registers of the TSC/ADC unit. It manages the IRQs and forwards them to > the correct components. > > Signed-off-by: Markus Pargmann <mpa@pengutronix.de> That's great :-) Nice work! > --- > .../devicetree/bindings/mfd/fsl-imx25-tsadc.txt | 46 ++++ > drivers/mfd/Kconfig | 9 + > drivers/mfd/Makefile | 2 + > drivers/mfd/fsl-imx25-tsadc.c | 234 +++++++++++++++++++++ > include/linux/mfd/imx25-tsadc.h | 138 ++++++++++++ > 5 files changed, 429 insertions(+) > create mode 100644 Documentation/devicetree/bindings/mfd/fsl-imx25-tsadc.txt > create mode 100644 drivers/mfd/fsl-imx25-tsadc.c > create mode 100644 include/linux/mfd/imx25-tsadc.h > > diff --git a/Documentation/devicetree/bindings/mfd/fsl-imx25-tsadc.txt b/Documentation/devicetree/bindings/mfd/fsl-imx25-tsadc.txt > new file mode 100644 > index 0000000..a857af0e > --- /dev/null > +++ b/Documentation/devicetree/bindings/mfd/fsl-imx25-tsadc.txt > @@ -0,0 +1,46 @@ > +Freescale mx25 ADC/TSC multifunction device > + > +This device combines two general purpose conversion queues one used for general > +ADC and the other used for touchscreens. > + > +Required properties: > + - compatible: Should be "fsl,imx25-tsadc". > + - reg: Memory range of the device. > + - interrupts: Interrupt for this device as described in > + interrupts/interrupts.txt > + - clocks: An 'ipg' clock defined as described in clocks/clock.txt > + - interrupt-controller: This device is an interrupt controller. It controls > + the interrupts of both conversion queues. > + - #interrupt-cells: Should be '<1>'. > + - #address-cells: Should be '<1>'. > + - #size-cells: Should be '<1>'. > + - ranges > + > +This device includes two conversion queues which can be added as subnodes. > +The first queue is for the touchscreen, the second for general purpose ADC. > + > +Example: > + tscadc: tscadc at 50030000 { > + compatible = "fsl,imx25-tsadc"; > + reg = <0x50030000 0xc>; > + interrupts = <46>; > + clocks = <&clks 119>; > + clock-names = "ipg"; > + interrupt-controller; > + #interrupt-cells = <1>; > + #address-cells = <1>; > + #size-cells = <1>; > + ranges; > + > + tsc: tcq at 50030400 { > + compatible = "fsl,imx25-tcq"; > + reg = <0x50030400 0x60>; > + ... > + }; > + > + adc: gcq at 50030800 { > + compatible = "fsl,imx25-gcq"; > + reg = <0x50030800 0x60>; > + ... > + }; > + }; The meaning of 'tcq' and 'gcq' acronyms are not obvious. Could they be written more explicitily? Also, what does the '...' mean? > +static int mx25_tsadc_domain_map(struct irq_domain *d, unsigned int irq, > + irq_hw_number_t hwirq) > +{ > + struct mx25_tsadc_priv *priv = d->host_data; > + > + irq_set_chip_data(irq, priv); > + irq_set_chip_and_handler(irq, &mx25_tsadc_irq_chip, > + handle_level_irq); > + > +#ifdef CONFIG_ARM > + set_irq_flags(irq, IRQF_VALID); > +#else > + irq_set_noprobe(irq); > +#endif Do we really need these ifdef's? Can't we just assume that CONFIG_ARM is always selected for this driver? > +static int mx25_tsadc_probe(struct platform_device *pdev) > +{ > + struct device *dev = &pdev->dev; > + struct device_node *np = dev->of_node; > + struct mx25_tsadc_priv *priv; > + struct resource *iores; > + int ret; > + void __iomem *iomem; > + > + priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); > + if (!priv) > + return -ENOMEM; > + > + iores = platform_get_resource(pdev, IORESOURCE_MEM, 0); > + iomem = devm_ioremap_resource(dev, iores); > + if (IS_ERR(iomem)) { > + dev_err(dev, "Failed to remap iomem\n"); > + return PTR_ERR(iomem); > + } > + > + priv->regs = regmap_init_mmio(dev, iomem, &mx25_tsadc); > + if (IS_ERR(priv->regs)) { > + dev_err(dev, "Failed to initialize regmap\n"); > + return PTR_ERR(priv->regs); > + } > + > + priv->clk = devm_clk_get(dev, "ipg"); > + if (IS_ERR(priv->clk)) { > + dev_err(dev, "Failed to get ipg clock\n"); > + return PTR_ERR(priv->clk); > + } > + > + /* Enable clock and reset the component */ > + regmap_update_bits(priv->regs, MX25_TSC_TGCR, MX25_TGCR_CLK_EN, > + MX25_TGCR_CLK_EN); > + regmap_update_bits(priv->regs, MX25_TSC_TGCR, MX25_TGCR_TSC_RST, > + MX25_TGCR_TSC_RST); > + > + /* Setup powersaving mode, but enable internal reference voltage */ > + regmap_update_bits(priv->regs, MX25_TSC_TGCR, MX25_TGCR_POWERMODE_MASK, > + MX25_TGCR_POWERMODE_SAVE); > + regmap_update_bits(priv->regs, MX25_TSC_TGCR, MX25_TGCR_INTREFEN, > + MX25_TGCR_INTREFEN); > + > + ret = mx25_tsadc_setup_irq(pdev, priv); > + if (ret) { > + dev_err(dev, "Failed to setup irqs\n"); > + return ret; > + } > + > + platform_set_drvdata(pdev, priv); > + > + of_platform_populate(np, NULL, NULL, dev); > + > + dev_info(dev, "i.MX25/25 Touchscreen and ADC core driver loaded\n"); You could remove the double '25/25'. > + > + return 0; > +} > + > +static const struct of_device_id mx25_tsadc_ids[] = { > + { .compatible = "fsl,imx25-tsadc", }, > + { /* Sentinel */ } > +}; > + > +static struct platform_driver mx25_tsadc_driver = { > + .driver = { > + .name = "mx25-tsadc", > + .owner = THIS_MODULE, > + .of_match_table = mx25_tsadc_ids, > + }, > + .probe = mx25_tsadc_probe, > +}; > +module_platform_driver(mx25_tsadc_driver); > + > +MODULE_DESCRIPTION("MFD for ADC/TSC for Freescale mx25"); > +MODULE_AUTHOR("Markus Pargmann <mpa@pengutronix.de>"); > +MODULE_LICENSE("GPL v2"); MODULE_ALIAS() as well? ^ permalink raw reply [flat|nested] 76+ messages in thread
[parent not found: <CAOMZO5BDyyvXs9CxJQOkuEpxZ8fqamCPB67sNhJxES+XU2XkXQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>]
* Re: [PATCH 1/3] mfd: fsl imx25 Touchscreen ADC driver 2014-02-20 17:17 ` Fabio Estevam (?) @ 2014-02-21 9:18 ` Markus Pargmann -1 siblings, 0 replies; 76+ messages in thread From: Markus Pargmann @ 2014-02-21 9:18 UTC (permalink / raw) To: Fabio Estevam Cc: devicetree-u79uwXL29TY76Z2rM5mHXA, linux-input-u79uwXL29TY76Z2rM5mHXA, linux-iio-u79uwXL29TY76Z2rM5mHXA, Dmitry Torokhov, Samuel Ortiz, Lee Jones, Jonathan Cameron, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, Sascha Hauer [-- Attachment #1: Type: text/plain, Size: 8010 bytes --] Hi Fabio, On Thu, Feb 20, 2014 at 02:17:33PM -0300, Fabio Estevam wrote: > Hi Markus, > > On Thu, Feb 20, 2014 at 1:21 PM, Markus Pargmann <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> wrote: > > This is the core driver for imx25 touchscreen/adc driver. The module > > has one shared ADC and two different conversion queues which use the > > ADC. The two queues are identical. Both can be used for general purpose > > ADC but one is meant to be used for touchscreens. > > > > This driver is the core which manages the central components and > > registers of the TSC/ADC unit. It manages the IRQs and forwards them to > > the correct components. > > > > Signed-off-by: Markus Pargmann <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> > > That's great :-) Nice work! Thanks :) > > --- > > .../devicetree/bindings/mfd/fsl-imx25-tsadc.txt | 46 ++++ > > drivers/mfd/Kconfig | 9 + > > drivers/mfd/Makefile | 2 + > > drivers/mfd/fsl-imx25-tsadc.c | 234 +++++++++++++++++++++ > > include/linux/mfd/imx25-tsadc.h | 138 ++++++++++++ > > 5 files changed, 429 insertions(+) > > create mode 100644 Documentation/devicetree/bindings/mfd/fsl-imx25-tsadc.txt > > create mode 100644 drivers/mfd/fsl-imx25-tsadc.c > > create mode 100644 include/linux/mfd/imx25-tsadc.h > > > > diff --git a/Documentation/devicetree/bindings/mfd/fsl-imx25-tsadc.txt b/Documentation/devicetree/bindings/mfd/fsl-imx25-tsadc.txt > > new file mode 100644 > > index 0000000..a857af0e > > --- /dev/null > > +++ b/Documentation/devicetree/bindings/mfd/fsl-imx25-tsadc.txt > > @@ -0,0 +1,46 @@ > > +Freescale mx25 ADC/TSC multifunction device > > + > > +This device combines two general purpose conversion queues one used for general > > +ADC and the other used for touchscreens. > > + > > +Required properties: > > + - compatible: Should be "fsl,imx25-tsadc". > > + - reg: Memory range of the device. > > + - interrupts: Interrupt for this device as described in > > + interrupts/interrupts.txt > > + - clocks: An 'ipg' clock defined as described in clocks/clock.txt > > + - interrupt-controller: This device is an interrupt controller. It controls > > + the interrupts of both conversion queues. > > + - #interrupt-cells: Should be '<1>'. > > + - #address-cells: Should be '<1>'. > > + - #size-cells: Should be '<1>'. > > + - ranges > > + > > +This device includes two conversion queues which can be added as subnodes. > > +The first queue is for the touchscreen, the second for general purpose ADC. > > + > > +Example: > > + tscadc: tscadc@50030000 { > > + compatible = "fsl,imx25-tsadc"; > > + reg = <0x50030000 0xc>; > > + interrupts = <46>; > > + clocks = <&clks 119>; > > + clock-names = "ipg"; > > + interrupt-controller; > > + #interrupt-cells = <1>; > > + #address-cells = <1>; > > + #size-cells = <1>; > > + ranges; > > + > > + tsc: tcq@50030400 { > > + compatible = "fsl,imx25-tcq"; > > + reg = <0x50030400 0x60>; > > + ... > > + }; > > + > > + adc: gcq@50030800 { > > + compatible = "fsl,imx25-gcq"; > > + reg = <0x50030800 0x60>; > > + ... > > + }; > > + }; > > The meaning of 'tcq' and 'gcq' acronyms are not obvious. Could they be > written more explicitily? I assume you mean the node names? Perhaps something like 'adcqueue'? > > Also, what does the '...' mean? > > > +static int mx25_tsadc_domain_map(struct irq_domain *d, unsigned int irq, > > + irq_hw_number_t hwirq) > > +{ > > + struct mx25_tsadc_priv *priv = d->host_data; > > + > > + irq_set_chip_data(irq, priv); > > + irq_set_chip_and_handler(irq, &mx25_tsadc_irq_chip, > > + handle_level_irq); > > + > > +#ifdef CONFIG_ARM > > + set_irq_flags(irq, IRQF_VALID); > > +#else > > + irq_set_noprobe(irq); > > +#endif > > Do we really need these ifdef's? Can't we just assume that CONFIG_ARM > is always selected for this driver? Yes right, this is not necessary here. > > > +static int mx25_tsadc_probe(struct platform_device *pdev) > > +{ > > + struct device *dev = &pdev->dev; > > + struct device_node *np = dev->of_node; > > + struct mx25_tsadc_priv *priv; > > + struct resource *iores; > > + int ret; > > + void __iomem *iomem; > > + > > + priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); > > + if (!priv) > > + return -ENOMEM; > > + > > + iores = platform_get_resource(pdev, IORESOURCE_MEM, 0); > > + iomem = devm_ioremap_resource(dev, iores); > > + if (IS_ERR(iomem)) { > > + dev_err(dev, "Failed to remap iomem\n"); > > + return PTR_ERR(iomem); > > + } > > + > > + priv->regs = regmap_init_mmio(dev, iomem, &mx25_tsadc); > > + if (IS_ERR(priv->regs)) { > > + dev_err(dev, "Failed to initialize regmap\n"); > > + return PTR_ERR(priv->regs); > > + } > > + > > + priv->clk = devm_clk_get(dev, "ipg"); > > + if (IS_ERR(priv->clk)) { > > + dev_err(dev, "Failed to get ipg clock\n"); > > + return PTR_ERR(priv->clk); > > + } > > + > > + /* Enable clock and reset the component */ > > + regmap_update_bits(priv->regs, MX25_TSC_TGCR, MX25_TGCR_CLK_EN, > > + MX25_TGCR_CLK_EN); > > + regmap_update_bits(priv->regs, MX25_TSC_TGCR, MX25_TGCR_TSC_RST, > > + MX25_TGCR_TSC_RST); > > + > > + /* Setup powersaving mode, but enable internal reference voltage */ > > + regmap_update_bits(priv->regs, MX25_TSC_TGCR, MX25_TGCR_POWERMODE_MASK, > > + MX25_TGCR_POWERMODE_SAVE); > > + regmap_update_bits(priv->regs, MX25_TSC_TGCR, MX25_TGCR_INTREFEN, > > + MX25_TGCR_INTREFEN); > > + > > + ret = mx25_tsadc_setup_irq(pdev, priv); > > + if (ret) { > > + dev_err(dev, "Failed to setup irqs\n"); > > + return ret; > > + } > > + > > + platform_set_drvdata(pdev, priv); > > + > > + of_platform_populate(np, NULL, NULL, dev); > > + > > + dev_info(dev, "i.MX25/25 Touchscreen and ADC core driver loaded\n"); > > You could remove the double '25/25'. Yes, fixed. > > > + > > + return 0; > > +} > > + > > +static const struct of_device_id mx25_tsadc_ids[] = { > > + { .compatible = "fsl,imx25-tsadc", }, > > + { /* Sentinel */ } > > +}; > > + > > +static struct platform_driver mx25_tsadc_driver = { > > + .driver = { > > + .name = "mx25-tsadc", > > + .owner = THIS_MODULE, > > + .of_match_table = mx25_tsadc_ids, > > + }, > > + .probe = mx25_tsadc_probe, > > +}; > > +module_platform_driver(mx25_tsadc_driver); > > + > > +MODULE_DESCRIPTION("MFD for ADC/TSC for Freescale mx25"); > > +MODULE_AUTHOR("Markus Pargmann <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>"); > > +MODULE_LICENSE("GPL v2"); > > MODULE_ALIAS() as well? I am not sure if this is necessary, but I added MODULE_ALIAS("platform:mx25-tsadc") Thanks, Markus -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 836 bytes --] ^ permalink raw reply [flat|nested] 76+ messages in thread
* [PATCH 1/3] mfd: fsl imx25 Touchscreen ADC driver @ 2014-02-21 9:18 ` Markus Pargmann 0 siblings, 0 replies; 76+ messages in thread From: Markus Pargmann @ 2014-02-21 9:18 UTC (permalink / raw) To: linux-arm-kernel Hi Fabio, On Thu, Feb 20, 2014 at 02:17:33PM -0300, Fabio Estevam wrote: > Hi Markus, > > On Thu, Feb 20, 2014 at 1:21 PM, Markus Pargmann <mpa@pengutronix.de> wrote: > > This is the core driver for imx25 touchscreen/adc driver. The module > > has one shared ADC and two different conversion queues which use the > > ADC. The two queues are identical. Both can be used for general purpose > > ADC but one is meant to be used for touchscreens. > > > > This driver is the core which manages the central components and > > registers of the TSC/ADC unit. It manages the IRQs and forwards them to > > the correct components. > > > > Signed-off-by: Markus Pargmann <mpa@pengutronix.de> > > That's great :-) Nice work! Thanks :) > > --- > > .../devicetree/bindings/mfd/fsl-imx25-tsadc.txt | 46 ++++ > > drivers/mfd/Kconfig | 9 + > > drivers/mfd/Makefile | 2 + > > drivers/mfd/fsl-imx25-tsadc.c | 234 +++++++++++++++++++++ > > include/linux/mfd/imx25-tsadc.h | 138 ++++++++++++ > > 5 files changed, 429 insertions(+) > > create mode 100644 Documentation/devicetree/bindings/mfd/fsl-imx25-tsadc.txt > > create mode 100644 drivers/mfd/fsl-imx25-tsadc.c > > create mode 100644 include/linux/mfd/imx25-tsadc.h > > > > diff --git a/Documentation/devicetree/bindings/mfd/fsl-imx25-tsadc.txt b/Documentation/devicetree/bindings/mfd/fsl-imx25-tsadc.txt > > new file mode 100644 > > index 0000000..a857af0e > > --- /dev/null > > +++ b/Documentation/devicetree/bindings/mfd/fsl-imx25-tsadc.txt > > @@ -0,0 +1,46 @@ > > +Freescale mx25 ADC/TSC multifunction device > > + > > +This device combines two general purpose conversion queues one used for general > > +ADC and the other used for touchscreens. > > + > > +Required properties: > > + - compatible: Should be "fsl,imx25-tsadc". > > + - reg: Memory range of the device. > > + - interrupts: Interrupt for this device as described in > > + interrupts/interrupts.txt > > + - clocks: An 'ipg' clock defined as described in clocks/clock.txt > > + - interrupt-controller: This device is an interrupt controller. It controls > > + the interrupts of both conversion queues. > > + - #interrupt-cells: Should be '<1>'. > > + - #address-cells: Should be '<1>'. > > + - #size-cells: Should be '<1>'. > > + - ranges > > + > > +This device includes two conversion queues which can be added as subnodes. > > +The first queue is for the touchscreen, the second for general purpose ADC. > > + > > +Example: > > + tscadc: tscadc at 50030000 { > > + compatible = "fsl,imx25-tsadc"; > > + reg = <0x50030000 0xc>; > > + interrupts = <46>; > > + clocks = <&clks 119>; > > + clock-names = "ipg"; > > + interrupt-controller; > > + #interrupt-cells = <1>; > > + #address-cells = <1>; > > + #size-cells = <1>; > > + ranges; > > + > > + tsc: tcq at 50030400 { > > + compatible = "fsl,imx25-tcq"; > > + reg = <0x50030400 0x60>; > > + ... > > + }; > > + > > + adc: gcq at 50030800 { > > + compatible = "fsl,imx25-gcq"; > > + reg = <0x50030800 0x60>; > > + ... > > + }; > > + }; > > The meaning of 'tcq' and 'gcq' acronyms are not obvious. Could they be > written more explicitily? I assume you mean the node names? Perhaps something like 'adcqueue'? > > Also, what does the '...' mean? > > > +static int mx25_tsadc_domain_map(struct irq_domain *d, unsigned int irq, > > + irq_hw_number_t hwirq) > > +{ > > + struct mx25_tsadc_priv *priv = d->host_data; > > + > > + irq_set_chip_data(irq, priv); > > + irq_set_chip_and_handler(irq, &mx25_tsadc_irq_chip, > > + handle_level_irq); > > + > > +#ifdef CONFIG_ARM > > + set_irq_flags(irq, IRQF_VALID); > > +#else > > + irq_set_noprobe(irq); > > +#endif > > Do we really need these ifdef's? Can't we just assume that CONFIG_ARM > is always selected for this driver? Yes right, this is not necessary here. > > > +static int mx25_tsadc_probe(struct platform_device *pdev) > > +{ > > + struct device *dev = &pdev->dev; > > + struct device_node *np = dev->of_node; > > + struct mx25_tsadc_priv *priv; > > + struct resource *iores; > > + int ret; > > + void __iomem *iomem; > > + > > + priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); > > + if (!priv) > > + return -ENOMEM; > > + > > + iores = platform_get_resource(pdev, IORESOURCE_MEM, 0); > > + iomem = devm_ioremap_resource(dev, iores); > > + if (IS_ERR(iomem)) { > > + dev_err(dev, "Failed to remap iomem\n"); > > + return PTR_ERR(iomem); > > + } > > + > > + priv->regs = regmap_init_mmio(dev, iomem, &mx25_tsadc); > > + if (IS_ERR(priv->regs)) { > > + dev_err(dev, "Failed to initialize regmap\n"); > > + return PTR_ERR(priv->regs); > > + } > > + > > + priv->clk = devm_clk_get(dev, "ipg"); > > + if (IS_ERR(priv->clk)) { > > + dev_err(dev, "Failed to get ipg clock\n"); > > + return PTR_ERR(priv->clk); > > + } > > + > > + /* Enable clock and reset the component */ > > + regmap_update_bits(priv->regs, MX25_TSC_TGCR, MX25_TGCR_CLK_EN, > > + MX25_TGCR_CLK_EN); > > + regmap_update_bits(priv->regs, MX25_TSC_TGCR, MX25_TGCR_TSC_RST, > > + MX25_TGCR_TSC_RST); > > + > > + /* Setup powersaving mode, but enable internal reference voltage */ > > + regmap_update_bits(priv->regs, MX25_TSC_TGCR, MX25_TGCR_POWERMODE_MASK, > > + MX25_TGCR_POWERMODE_SAVE); > > + regmap_update_bits(priv->regs, MX25_TSC_TGCR, MX25_TGCR_INTREFEN, > > + MX25_TGCR_INTREFEN); > > + > > + ret = mx25_tsadc_setup_irq(pdev, priv); > > + if (ret) { > > + dev_err(dev, "Failed to setup irqs\n"); > > + return ret; > > + } > > + > > + platform_set_drvdata(pdev, priv); > > + > > + of_platform_populate(np, NULL, NULL, dev); > > + > > + dev_info(dev, "i.MX25/25 Touchscreen and ADC core driver loaded\n"); > > You could remove the double '25/25'. Yes, fixed. > > > + > > + return 0; > > +} > > + > > +static const struct of_device_id mx25_tsadc_ids[] = { > > + { .compatible = "fsl,imx25-tsadc", }, > > + { /* Sentinel */ } > > +}; > > + > > +static struct platform_driver mx25_tsadc_driver = { > > + .driver = { > > + .name = "mx25-tsadc", > > + .owner = THIS_MODULE, > > + .of_match_table = mx25_tsadc_ids, > > + }, > > + .probe = mx25_tsadc_probe, > > +}; > > +module_platform_driver(mx25_tsadc_driver); > > + > > +MODULE_DESCRIPTION("MFD for ADC/TSC for Freescale mx25"); > > +MODULE_AUTHOR("Markus Pargmann <mpa@pengutronix.de>"); > > +MODULE_LICENSE("GPL v2"); > > MODULE_ALIAS() as well? I am not sure if this is necessary, but I added MODULE_ALIAS("platform:mx25-tsadc") Thanks, Markus -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140221/1033be41/attachment.sig> ^ permalink raw reply [flat|nested] 76+ messages in thread
* Re: [PATCH 1/3] mfd: fsl imx25 Touchscreen ADC driver @ 2014-02-21 9:18 ` Markus Pargmann 0 siblings, 0 replies; 76+ messages in thread From: Markus Pargmann @ 2014-02-21 9:18 UTC (permalink / raw) To: Fabio Estevam Cc: devicetree, linux-input, linux-iio, Dmitry Torokhov, Samuel Ortiz, Lee Jones, Jonathan Cameron, linux-arm-kernel, Sascha Hauer [-- Attachment #1: Type: text/plain, Size: 7935 bytes --] Hi Fabio, On Thu, Feb 20, 2014 at 02:17:33PM -0300, Fabio Estevam wrote: > Hi Markus, > > On Thu, Feb 20, 2014 at 1:21 PM, Markus Pargmann <mpa@pengutronix.de> wrote: > > This is the core driver for imx25 touchscreen/adc driver. The module > > has one shared ADC and two different conversion queues which use the > > ADC. The two queues are identical. Both can be used for general purpose > > ADC but one is meant to be used for touchscreens. > > > > This driver is the core which manages the central components and > > registers of the TSC/ADC unit. It manages the IRQs and forwards them to > > the correct components. > > > > Signed-off-by: Markus Pargmann <mpa@pengutronix.de> > > That's great :-) Nice work! Thanks :) > > --- > > .../devicetree/bindings/mfd/fsl-imx25-tsadc.txt | 46 ++++ > > drivers/mfd/Kconfig | 9 + > > drivers/mfd/Makefile | 2 + > > drivers/mfd/fsl-imx25-tsadc.c | 234 +++++++++++++++++++++ > > include/linux/mfd/imx25-tsadc.h | 138 ++++++++++++ > > 5 files changed, 429 insertions(+) > > create mode 100644 Documentation/devicetree/bindings/mfd/fsl-imx25-tsadc.txt > > create mode 100644 drivers/mfd/fsl-imx25-tsadc.c > > create mode 100644 include/linux/mfd/imx25-tsadc.h > > > > diff --git a/Documentation/devicetree/bindings/mfd/fsl-imx25-tsadc.txt b/Documentation/devicetree/bindings/mfd/fsl-imx25-tsadc.txt > > new file mode 100644 > > index 0000000..a857af0e > > --- /dev/null > > +++ b/Documentation/devicetree/bindings/mfd/fsl-imx25-tsadc.txt > > @@ -0,0 +1,46 @@ > > +Freescale mx25 ADC/TSC multifunction device > > + > > +This device combines two general purpose conversion queues one used for general > > +ADC and the other used for touchscreens. > > + > > +Required properties: > > + - compatible: Should be "fsl,imx25-tsadc". > > + - reg: Memory range of the device. > > + - interrupts: Interrupt for this device as described in > > + interrupts/interrupts.txt > > + - clocks: An 'ipg' clock defined as described in clocks/clock.txt > > + - interrupt-controller: This device is an interrupt controller. It controls > > + the interrupts of both conversion queues. > > + - #interrupt-cells: Should be '<1>'. > > + - #address-cells: Should be '<1>'. > > + - #size-cells: Should be '<1>'. > > + - ranges > > + > > +This device includes two conversion queues which can be added as subnodes. > > +The first queue is for the touchscreen, the second for general purpose ADC. > > + > > +Example: > > + tscadc: tscadc@50030000 { > > + compatible = "fsl,imx25-tsadc"; > > + reg = <0x50030000 0xc>; > > + interrupts = <46>; > > + clocks = <&clks 119>; > > + clock-names = "ipg"; > > + interrupt-controller; > > + #interrupt-cells = <1>; > > + #address-cells = <1>; > > + #size-cells = <1>; > > + ranges; > > + > > + tsc: tcq@50030400 { > > + compatible = "fsl,imx25-tcq"; > > + reg = <0x50030400 0x60>; > > + ... > > + }; > > + > > + adc: gcq@50030800 { > > + compatible = "fsl,imx25-gcq"; > > + reg = <0x50030800 0x60>; > > + ... > > + }; > > + }; > > The meaning of 'tcq' and 'gcq' acronyms are not obvious. Could they be > written more explicitily? I assume you mean the node names? Perhaps something like 'adcqueue'? > > Also, what does the '...' mean? > > > +static int mx25_tsadc_domain_map(struct irq_domain *d, unsigned int irq, > > + irq_hw_number_t hwirq) > > +{ > > + struct mx25_tsadc_priv *priv = d->host_data; > > + > > + irq_set_chip_data(irq, priv); > > + irq_set_chip_and_handler(irq, &mx25_tsadc_irq_chip, > > + handle_level_irq); > > + > > +#ifdef CONFIG_ARM > > + set_irq_flags(irq, IRQF_VALID); > > +#else > > + irq_set_noprobe(irq); > > +#endif > > Do we really need these ifdef's? Can't we just assume that CONFIG_ARM > is always selected for this driver? Yes right, this is not necessary here. > > > +static int mx25_tsadc_probe(struct platform_device *pdev) > > +{ > > + struct device *dev = &pdev->dev; > > + struct device_node *np = dev->of_node; > > + struct mx25_tsadc_priv *priv; > > + struct resource *iores; > > + int ret; > > + void __iomem *iomem; > > + > > + priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); > > + if (!priv) > > + return -ENOMEM; > > + > > + iores = platform_get_resource(pdev, IORESOURCE_MEM, 0); > > + iomem = devm_ioremap_resource(dev, iores); > > + if (IS_ERR(iomem)) { > > + dev_err(dev, "Failed to remap iomem\n"); > > + return PTR_ERR(iomem); > > + } > > + > > + priv->regs = regmap_init_mmio(dev, iomem, &mx25_tsadc); > > + if (IS_ERR(priv->regs)) { > > + dev_err(dev, "Failed to initialize regmap\n"); > > + return PTR_ERR(priv->regs); > > + } > > + > > + priv->clk = devm_clk_get(dev, "ipg"); > > + if (IS_ERR(priv->clk)) { > > + dev_err(dev, "Failed to get ipg clock\n"); > > + return PTR_ERR(priv->clk); > > + } > > + > > + /* Enable clock and reset the component */ > > + regmap_update_bits(priv->regs, MX25_TSC_TGCR, MX25_TGCR_CLK_EN, > > + MX25_TGCR_CLK_EN); > > + regmap_update_bits(priv->regs, MX25_TSC_TGCR, MX25_TGCR_TSC_RST, > > + MX25_TGCR_TSC_RST); > > + > > + /* Setup powersaving mode, but enable internal reference voltage */ > > + regmap_update_bits(priv->regs, MX25_TSC_TGCR, MX25_TGCR_POWERMODE_MASK, > > + MX25_TGCR_POWERMODE_SAVE); > > + regmap_update_bits(priv->regs, MX25_TSC_TGCR, MX25_TGCR_INTREFEN, > > + MX25_TGCR_INTREFEN); > > + > > + ret = mx25_tsadc_setup_irq(pdev, priv); > > + if (ret) { > > + dev_err(dev, "Failed to setup irqs\n"); > > + return ret; > > + } > > + > > + platform_set_drvdata(pdev, priv); > > + > > + of_platform_populate(np, NULL, NULL, dev); > > + > > + dev_info(dev, "i.MX25/25 Touchscreen and ADC core driver loaded\n"); > > You could remove the double '25/25'. Yes, fixed. > > > + > > + return 0; > > +} > > + > > +static const struct of_device_id mx25_tsadc_ids[] = { > > + { .compatible = "fsl,imx25-tsadc", }, > > + { /* Sentinel */ } > > +}; > > + > > +static struct platform_driver mx25_tsadc_driver = { > > + .driver = { > > + .name = "mx25-tsadc", > > + .owner = THIS_MODULE, > > + .of_match_table = mx25_tsadc_ids, > > + }, > > + .probe = mx25_tsadc_probe, > > +}; > > +module_platform_driver(mx25_tsadc_driver); > > + > > +MODULE_DESCRIPTION("MFD for ADC/TSC for Freescale mx25"); > > +MODULE_AUTHOR("Markus Pargmann <mpa@pengutronix.de>"); > > +MODULE_LICENSE("GPL v2"); > > MODULE_ALIAS() as well? I am not sure if this is necessary, but I added MODULE_ALIAS("platform:mx25-tsadc") Thanks, Markus -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 836 bytes --] ^ permalink raw reply [flat|nested] 76+ messages in thread
* Re: [PATCH 1/3] mfd: fsl imx25 Touchscreen ADC driver 2014-02-20 17:17 ` Fabio Estevam (?) @ 2014-02-21 10:18 ` Markus Pargmann -1 siblings, 0 replies; 76+ messages in thread From: Markus Pargmann @ 2014-02-21 10:18 UTC (permalink / raw) To: Fabio Estevam Cc: devicetree-u79uwXL29TY76Z2rM5mHXA, linux-input-u79uwXL29TY76Z2rM5mHXA, linux-iio-u79uwXL29TY76Z2rM5mHXA, Dmitry Torokhov, Samuel Ortiz, Lee Jones, Jonathan Cameron, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, Sascha Hauer [-- Attachment #1: Type: text/plain, Size: 4217 bytes --] Hi Fabio, On Thu, Feb 20, 2014 at 02:17:33PM -0300, Fabio Estevam wrote: > Hi Markus, > > On Thu, Feb 20, 2014 at 1:21 PM, Markus Pargmann <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> wrote: > > This is the core driver for imx25 touchscreen/adc driver. The module > > has one shared ADC and two different conversion queues which use the > > ADC. The two queues are identical. Both can be used for general purpose > > ADC but one is meant to be used for touchscreens. > > > > This driver is the core which manages the central components and > > registers of the TSC/ADC unit. It manages the IRQs and forwards them to > > the correct components. > > > > Signed-off-by: Markus Pargmann <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> > > That's great :-) Nice work! > > > --- > > .../devicetree/bindings/mfd/fsl-imx25-tsadc.txt | 46 ++++ > > drivers/mfd/Kconfig | 9 + > > drivers/mfd/Makefile | 2 + > > drivers/mfd/fsl-imx25-tsadc.c | 234 +++++++++++++++++++++ > > include/linux/mfd/imx25-tsadc.h | 138 ++++++++++++ > > 5 files changed, 429 insertions(+) > > create mode 100644 Documentation/devicetree/bindings/mfd/fsl-imx25-tsadc.txt > > create mode 100644 drivers/mfd/fsl-imx25-tsadc.c > > create mode 100644 include/linux/mfd/imx25-tsadc.h > > > > diff --git a/Documentation/devicetree/bindings/mfd/fsl-imx25-tsadc.txt b/Documentation/devicetree/bindings/mfd/fsl-imx25-tsadc.txt > > new file mode 100644 > > index 0000000..a857af0e > > --- /dev/null > > +++ b/Documentation/devicetree/bindings/mfd/fsl-imx25-tsadc.txt > > @@ -0,0 +1,46 @@ > > +Freescale mx25 ADC/TSC multifunction device > > + > > +This device combines two general purpose conversion queues one used for general > > +ADC and the other used for touchscreens. > > + > > +Required properties: > > + - compatible: Should be "fsl,imx25-tsadc". > > + - reg: Memory range of the device. > > + - interrupts: Interrupt for this device as described in > > + interrupts/interrupts.txt > > + - clocks: An 'ipg' clock defined as described in clocks/clock.txt > > + - interrupt-controller: This device is an interrupt controller. It controls > > + the interrupts of both conversion queues. > > + - #interrupt-cells: Should be '<1>'. > > + - #address-cells: Should be '<1>'. > > + - #size-cells: Should be '<1>'. > > + - ranges > > + > > +This device includes two conversion queues which can be added as subnodes. > > +The first queue is for the touchscreen, the second for general purpose ADC. > > + > > +Example: > > + tscadc: tscadc@50030000 { > > + compatible = "fsl,imx25-tsadc"; > > + reg = <0x50030000 0xc>; > > + interrupts = <46>; > > + clocks = <&clks 119>; > > + clock-names = "ipg"; > > + interrupt-controller; > > + #interrupt-cells = <1>; > > + #address-cells = <1>; > > + #size-cells = <1>; > > + ranges; > > + > > + tsc: tcq@50030400 { > > + compatible = "fsl,imx25-tcq"; > > + reg = <0x50030400 0x60>; > > + ... > > + }; > > + > > + adc: gcq@50030800 { > > + compatible = "fsl,imx25-gcq"; > > + reg = <0x50030800 0x60>; > > + ... > > + }; > > + }; > > The meaning of 'tcq' and 'gcq' acronyms are not obvious. Could they be > written more explicitily? > > Also, what does the '...' mean? I forgot to answer this one. The bindings for tcq and gcq are described in the other files, so I didn't want to show any details that are not relevant for this driver. Regards, Markus -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 836 bytes --] ^ permalink raw reply [flat|nested] 76+ messages in thread
* [PATCH 1/3] mfd: fsl imx25 Touchscreen ADC driver @ 2014-02-21 10:18 ` Markus Pargmann 0 siblings, 0 replies; 76+ messages in thread From: Markus Pargmann @ 2014-02-21 10:18 UTC (permalink / raw) To: linux-arm-kernel Hi Fabio, On Thu, Feb 20, 2014 at 02:17:33PM -0300, Fabio Estevam wrote: > Hi Markus, > > On Thu, Feb 20, 2014 at 1:21 PM, Markus Pargmann <mpa@pengutronix.de> wrote: > > This is the core driver for imx25 touchscreen/adc driver. The module > > has one shared ADC and two different conversion queues which use the > > ADC. The two queues are identical. Both can be used for general purpose > > ADC but one is meant to be used for touchscreens. > > > > This driver is the core which manages the central components and > > registers of the TSC/ADC unit. It manages the IRQs and forwards them to > > the correct components. > > > > Signed-off-by: Markus Pargmann <mpa@pengutronix.de> > > That's great :-) Nice work! > > > --- > > .../devicetree/bindings/mfd/fsl-imx25-tsadc.txt | 46 ++++ > > drivers/mfd/Kconfig | 9 + > > drivers/mfd/Makefile | 2 + > > drivers/mfd/fsl-imx25-tsadc.c | 234 +++++++++++++++++++++ > > include/linux/mfd/imx25-tsadc.h | 138 ++++++++++++ > > 5 files changed, 429 insertions(+) > > create mode 100644 Documentation/devicetree/bindings/mfd/fsl-imx25-tsadc.txt > > create mode 100644 drivers/mfd/fsl-imx25-tsadc.c > > create mode 100644 include/linux/mfd/imx25-tsadc.h > > > > diff --git a/Documentation/devicetree/bindings/mfd/fsl-imx25-tsadc.txt b/Documentation/devicetree/bindings/mfd/fsl-imx25-tsadc.txt > > new file mode 100644 > > index 0000000..a857af0e > > --- /dev/null > > +++ b/Documentation/devicetree/bindings/mfd/fsl-imx25-tsadc.txt > > @@ -0,0 +1,46 @@ > > +Freescale mx25 ADC/TSC multifunction device > > + > > +This device combines two general purpose conversion queues one used for general > > +ADC and the other used for touchscreens. > > + > > +Required properties: > > + - compatible: Should be "fsl,imx25-tsadc". > > + - reg: Memory range of the device. > > + - interrupts: Interrupt for this device as described in > > + interrupts/interrupts.txt > > + - clocks: An 'ipg' clock defined as described in clocks/clock.txt > > + - interrupt-controller: This device is an interrupt controller. It controls > > + the interrupts of both conversion queues. > > + - #interrupt-cells: Should be '<1>'. > > + - #address-cells: Should be '<1>'. > > + - #size-cells: Should be '<1>'. > > + - ranges > > + > > +This device includes two conversion queues which can be added as subnodes. > > +The first queue is for the touchscreen, the second for general purpose ADC. > > + > > +Example: > > + tscadc: tscadc at 50030000 { > > + compatible = "fsl,imx25-tsadc"; > > + reg = <0x50030000 0xc>; > > + interrupts = <46>; > > + clocks = <&clks 119>; > > + clock-names = "ipg"; > > + interrupt-controller; > > + #interrupt-cells = <1>; > > + #address-cells = <1>; > > + #size-cells = <1>; > > + ranges; > > + > > + tsc: tcq at 50030400 { > > + compatible = "fsl,imx25-tcq"; > > + reg = <0x50030400 0x60>; > > + ... > > + }; > > + > > + adc: gcq at 50030800 { > > + compatible = "fsl,imx25-gcq"; > > + reg = <0x50030800 0x60>; > > + ... > > + }; > > + }; > > The meaning of 'tcq' and 'gcq' acronyms are not obvious. Could they be > written more explicitily? > > Also, what does the '...' mean? I forgot to answer this one. The bindings for tcq and gcq are described in the other files, so I didn't want to show any details that are not relevant for this driver. Regards, Markus -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140221/5230b884/attachment.sig> ^ permalink raw reply [flat|nested] 76+ messages in thread
* Re: [PATCH 1/3] mfd: fsl imx25 Touchscreen ADC driver @ 2014-02-21 10:18 ` Markus Pargmann 0 siblings, 0 replies; 76+ messages in thread From: Markus Pargmann @ 2014-02-21 10:18 UTC (permalink / raw) To: Fabio Estevam Cc: devicetree, linux-input, linux-iio, Dmitry Torokhov, Samuel Ortiz, Lee Jones, Jonathan Cameron, linux-arm-kernel, Sascha Hauer [-- Attachment #1: Type: text/plain, Size: 4167 bytes --] Hi Fabio, On Thu, Feb 20, 2014 at 02:17:33PM -0300, Fabio Estevam wrote: > Hi Markus, > > On Thu, Feb 20, 2014 at 1:21 PM, Markus Pargmann <mpa@pengutronix.de> wrote: > > This is the core driver for imx25 touchscreen/adc driver. The module > > has one shared ADC and two different conversion queues which use the > > ADC. The two queues are identical. Both can be used for general purpose > > ADC but one is meant to be used for touchscreens. > > > > This driver is the core which manages the central components and > > registers of the TSC/ADC unit. It manages the IRQs and forwards them to > > the correct components. > > > > Signed-off-by: Markus Pargmann <mpa@pengutronix.de> > > That's great :-) Nice work! > > > --- > > .../devicetree/bindings/mfd/fsl-imx25-tsadc.txt | 46 ++++ > > drivers/mfd/Kconfig | 9 + > > drivers/mfd/Makefile | 2 + > > drivers/mfd/fsl-imx25-tsadc.c | 234 +++++++++++++++++++++ > > include/linux/mfd/imx25-tsadc.h | 138 ++++++++++++ > > 5 files changed, 429 insertions(+) > > create mode 100644 Documentation/devicetree/bindings/mfd/fsl-imx25-tsadc.txt > > create mode 100644 drivers/mfd/fsl-imx25-tsadc.c > > create mode 100644 include/linux/mfd/imx25-tsadc.h > > > > diff --git a/Documentation/devicetree/bindings/mfd/fsl-imx25-tsadc.txt b/Documentation/devicetree/bindings/mfd/fsl-imx25-tsadc.txt > > new file mode 100644 > > index 0000000..a857af0e > > --- /dev/null > > +++ b/Documentation/devicetree/bindings/mfd/fsl-imx25-tsadc.txt > > @@ -0,0 +1,46 @@ > > +Freescale mx25 ADC/TSC multifunction device > > + > > +This device combines two general purpose conversion queues one used for general > > +ADC and the other used for touchscreens. > > + > > +Required properties: > > + - compatible: Should be "fsl,imx25-tsadc". > > + - reg: Memory range of the device. > > + - interrupts: Interrupt for this device as described in > > + interrupts/interrupts.txt > > + - clocks: An 'ipg' clock defined as described in clocks/clock.txt > > + - interrupt-controller: This device is an interrupt controller. It controls > > + the interrupts of both conversion queues. > > + - #interrupt-cells: Should be '<1>'. > > + - #address-cells: Should be '<1>'. > > + - #size-cells: Should be '<1>'. > > + - ranges > > + > > +This device includes two conversion queues which can be added as subnodes. > > +The first queue is for the touchscreen, the second for general purpose ADC. > > + > > +Example: > > + tscadc: tscadc@50030000 { > > + compatible = "fsl,imx25-tsadc"; > > + reg = <0x50030000 0xc>; > > + interrupts = <46>; > > + clocks = <&clks 119>; > > + clock-names = "ipg"; > > + interrupt-controller; > > + #interrupt-cells = <1>; > > + #address-cells = <1>; > > + #size-cells = <1>; > > + ranges; > > + > > + tsc: tcq@50030400 { > > + compatible = "fsl,imx25-tcq"; > > + reg = <0x50030400 0x60>; > > + ... > > + }; > > + > > + adc: gcq@50030800 { > > + compatible = "fsl,imx25-gcq"; > > + reg = <0x50030800 0x60>; > > + ... > > + }; > > + }; > > The meaning of 'tcq' and 'gcq' acronyms are not obvious. Could they be > written more explicitily? > > Also, what does the '...' mean? I forgot to answer this one. The bindings for tcq and gcq are described in the other files, so I didn't want to show any details that are not relevant for this driver. Regards, Markus -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 836 bytes --] ^ permalink raw reply [flat|nested] 76+ messages in thread
* [PATCH 2/3] input: touchscreen: imx25 tcq driver 2014-02-20 16:21 ` Markus Pargmann @ 2014-02-20 16:21 ` Markus Pargmann -1 siblings, 0 replies; 76+ messages in thread From: Markus Pargmann @ 2014-02-20 16:21 UTC (permalink / raw) To: devicetree, linux-input, linux-iio Cc: Dmitry Torokhov, Samuel Ortiz, Lee Jones, Jonathan Cameron, linux-arm-kernel, kernel, Markus Pargmann This is a driver for the imx25 ADC/TSC module. It controls the touchscreen conversion queue and creates a touchscreen input device. The driver currently only supports 4 wire touchscreens. The driver uses a simple conversion queue of precharge, touch detection, X measurement, Y measurement, precharge and another touch detection. This driver uses the regmap from the parent to setup some touch specific settings in the core driver and setup a idle configuration with touch detection. Signed-off-by: Markus Pargmann <mpa@pengutronix.de> --- .../bindings/input/touchscreen/fsl-mx25-tcq.txt | 29 + drivers/input/touchscreen/Kconfig | 6 + drivers/input/touchscreen/Makefile | 1 + drivers/input/touchscreen/fsl-imx25-tcq.c | 589 +++++++++++++++++++++ 4 files changed, 625 insertions(+) create mode 100644 Documentation/devicetree/bindings/input/touchscreen/fsl-mx25-tcq.txt create mode 100644 drivers/input/touchscreen/fsl-imx25-tcq.c diff --git a/Documentation/devicetree/bindings/input/touchscreen/fsl-mx25-tcq.txt b/Documentation/devicetree/bindings/input/touchscreen/fsl-mx25-tcq.txt new file mode 100644 index 0000000..4214a99 --- /dev/null +++ b/Documentation/devicetree/bindings/input/touchscreen/fsl-mx25-tcq.txt @@ -0,0 +1,29 @@ +Freescale mx25 TS conversion queue module + +mx25 touchscreen conversion queue module which controls the ADC unit of the +mx25 for attached touchscreens. + +Required properties: + - compatible: Should be "fsl,imx25-tcq". + - reg: Memory range of the device. + - interrupts: Should be the interrupt number associated with this module within + the tscadc unit (<0>). + - interrupt-parent: Should be a phandle to the tscadc unit. + - fsl,wires: Should be '<4>' or '<5>' + +Optional properties: + - fsl,pen-debounce: Pen debounce time. + - fsl,pen-threshold: Pen-down threshold for the touchscreen. + - fsl,settling-time: Settling time in nanoseconds. + +This device includes two conversion queues which can be added as subnodes. +The first queue is for the touchscreen, the second for general purpose ADC. + +Example: + tsc: tcq@50030400 { + compatible = "fsl,imx25-tcq"; + reg = <0x50030400 0x60>; + interrupt-parent = <&tscadc>; + interrupts = <0>; + fsl,wires = <4>; + }; diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig index 07e9e82..d52c055 100644 --- a/drivers/input/touchscreen/Kconfig +++ b/drivers/input/touchscreen/Kconfig @@ -715,6 +715,12 @@ config TOUCHSCREEN_USB_COMPOSITE To compile this driver as a module, choose M here: the module will be called usbtouchscreen. +config TOUCHSCREEN_MX25 + tristate "Freescale i.MX25 touchscreen input driver" + depends on MFD_MX25_TSADC + help + Enable support for touchscreen connected to your i.MX25. + config TOUCHSCREEN_MC13783 tristate "Freescale MC13783 touchscreen input driver" depends on MFD_MC13XXX diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile index 62801f2..c891f30 100644 --- a/drivers/input/touchscreen/Makefile +++ b/drivers/input/touchscreen/Makefile @@ -38,6 +38,7 @@ obj-$(CONFIG_TOUCHSCREEN_INEXIO) += inexio.o obj-$(CONFIG_TOUCHSCREEN_INTEL_MID) += intel-mid-touch.o obj-$(CONFIG_TOUCHSCREEN_LPC32XX) += lpc32xx_ts.o obj-$(CONFIG_TOUCHSCREEN_MAX11801) += max11801_ts.o +obj-$(CONFIG_TOUCHSCREEN_MX25) += fsl-imx25-tcq.o obj-$(CONFIG_TOUCHSCREEN_MC13783) += mc13783_ts.o obj-$(CONFIG_TOUCHSCREEN_MCS5000) += mcs5000_ts.o obj-$(CONFIG_TOUCHSCREEN_MIGOR) += migor_ts.o diff --git a/drivers/input/touchscreen/fsl-imx25-tcq.c b/drivers/input/touchscreen/fsl-imx25-tcq.c new file mode 100644 index 0000000..436cc8b --- /dev/null +++ b/drivers/input/touchscreen/fsl-imx25-tcq.c @@ -0,0 +1,589 @@ +/* + * Copyright 2014 Markus Pargmann, Pengutronix <mpa@pengutronix.de> + * Based on driver from 2011 Juergen Beisert, Pengutronix <kernel@pengutronix.de> + * + * The code contained herein is licensed under the GNU General Public + * License. You may obtain a copy of the GNU General Public License + * Version 2 or later at the following locations: + * + * http://www.opensource.org/licenses/gpl-license.html + * http://www.gnu.org/copyleft/gpl.html + * + * This is the driver for the imx25 TCQ (Touchscreen Conversion Queue) + * connected to the imx25 ADC. + */ + +#include <linux/clk.h> +#include <linux/interrupt.h> +#include <linux/input.h> +#include <linux/mfd/imx25-tsadc.h> +#include <linux/module.h> +#include <linux/of.h> +#include <linux/platform_device.h> +#include <linux/regmap.h> + +static const char mx25_tcq_name[] = "mx25-tcq"; + +enum mx25_tcq_mode { + MX25_TS_4WIRE, +}; + +struct mx25_tcq_priv { + struct regmap *regs; + struct regmap *core_regs; + struct input_dev *idev; + enum mx25_tcq_mode mode; + unsigned int pen_threshold; + unsigned int sample_count; + unsigned int expected_samples; + unsigned int repeat_wait; + unsigned int pen_debounce; + unsigned int settling_time; + struct clk *clk; +}; + +static struct regmap_config mx25_tcq_regconfig = { + .fast_io = true, + .max_register = 0x5c, + .reg_bits = 32, + .val_bits = 32, + .reg_stride = 4, +}; + +static struct of_device_id mx25_tcq_ids[] = { + { .compatible = "fsl,imx25-tcq", }, + { /* Senitel */ } +}; + +#define TSC_4WIRE_PRE_INDEX 0 +#define TSC_4WIRE_X_INDEX 1 +#define TSC_4WIRE_Y_INDEX 2 +#define TSC_4WIRE_POST_INDEX 3 +#define TSC_4WIRE_LEAVE 4 + +#define MX25_TSC_DEF_THRESHOLD 80 +#define TSC_MAX_SAMPLES 16 + + +enum mx25_adc_configurations { + MX25_CFG_PRECHARGE = 0, + MX25_CFG_TOUCH_DETECT, + MX25_CFG_X_MEASUREMENT, + MX25_CFG_Y_MEASUREMENT, +}; + +#define MX25_PRECHARGE_VALUE (\ + MX25_ADCQ_CFG_YPLL_OFF | \ + MX25_ADCQ_CFG_XNUR_OFF | \ + MX25_ADCQ_CFG_XPUL_HIGH | \ + MX25_ADCQ_CFG_REFP_INT | \ + MX25_ADCQ_CFG_IN_XP | \ + MX25_ADCQ_CFG_REFN_NGND2 | \ + MX25_ADCQ_CFG_IGS) + +#define MX25_TOUCH_DETECT_VALUE (\ + MX25_ADCQ_CFG_YNLR | \ + MX25_ADCQ_CFG_YPLL_OFF | \ + MX25_ADCQ_CFG_XNUR_OFF | \ + MX25_ADCQ_CFG_XPUL_OFF | \ + MX25_ADCQ_CFG_REFP_INT | \ + MX25_ADCQ_CFG_IN_XP | \ + MX25_ADCQ_CFG_REFN_NGND2 | \ + MX25_ADCQ_CFG_PENIACK) + +static void imx25_setup_queue_cfgs(struct mx25_tcq_priv *priv, + unsigned int settling_time) +{ + u32 precharge_cfg = + MX25_PRECHARGE_VALUE | + MX25_ADCQ_CFG_SETTLING_TIME(settling_time); + u32 touch_detect_cfg = + MX25_TOUCH_DETECT_VALUE | + MX25_ADCQ_CFG_NOS(1) | + MX25_ADCQ_CFG_SETTLING_TIME(settling_time); + + regmap_write(priv->core_regs, MX25_TSC_TICR, precharge_cfg); + + /* PRECHARGE */ + regmap_write(priv->regs, MX25_ADCQ_CFG(MX25_CFG_PRECHARGE), + precharge_cfg); + + /* TOUCH_DETECT */ + regmap_write(priv->regs, MX25_ADCQ_CFG(MX25_CFG_TOUCH_DETECT), + touch_detect_cfg); + + /* X Measurement */ + regmap_write(priv->regs, MX25_ADCQ_CFG(MX25_CFG_X_MEASUREMENT), + MX25_ADCQ_CFG_YPLL_OFF | + MX25_ADCQ_CFG_XNUR_LOW | + MX25_ADCQ_CFG_XPUL_HIGH | + MX25_ADCQ_CFG_REFP_XP | + MX25_ADCQ_CFG_IN_YP | + MX25_ADCQ_CFG_REFN_XN | + MX25_ADCQ_CFG_NOS(priv->sample_count) | + MX25_ADCQ_CFG_SETTLING_TIME(settling_time)); + + /* Y Measurement */ + regmap_write(priv->regs, MX25_ADCQ_CFG(MX25_CFG_Y_MEASUREMENT), + MX25_ADCQ_CFG_YNLR | + MX25_ADCQ_CFG_YPLL_HIGH | + MX25_ADCQ_CFG_XNUR_OFF | + MX25_ADCQ_CFG_XPUL_OFF | + MX25_ADCQ_CFG_REFP_YP | + MX25_ADCQ_CFG_IN_XP | + MX25_ADCQ_CFG_REFN_YN | + MX25_ADCQ_CFG_NOS(priv->sample_count) | + MX25_ADCQ_CFG_SETTLING_TIME(settling_time)); + + /* Enable the touch detection right now */ + regmap_write(priv->core_regs, MX25_TSC_TICR, touch_detect_cfg | + MX25_ADCQ_CFG_IGS); +} + +static int imx25_setup_queue_4wire(struct mx25_tcq_priv *priv, + unsigned settling_time, int *items) +{ + imx25_setup_queue_cfgs(priv, settling_time); + + /* Setup the conversion queue */ + regmap_write(priv->regs, MX25_ADCQ_ITEM_7_0, + MX25_ADCQ_ITEM(0, MX25_CFG_PRECHARGE) | + MX25_ADCQ_ITEM(1, MX25_CFG_TOUCH_DETECT) | + MX25_ADCQ_ITEM(2, MX25_CFG_X_MEASUREMENT) | + MX25_ADCQ_ITEM(3, MX25_CFG_Y_MEASUREMENT) | + MX25_ADCQ_ITEM(4, MX25_CFG_PRECHARGE) | + MX25_ADCQ_ITEM(5, MX25_CFG_TOUCH_DETECT)); + + /* We measure X/Y with 'sample_count' number of samples and execute a + * touch detection twice, with 1 sample each */ + priv->expected_samples = priv->sample_count * 2 + 2; + *items = 6; + + return 0; +} + +static void mx25_tcq_disable_touch_irq(struct mx25_tcq_priv *priv) +{ + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_PDMSK, + MX25_ADCQ_CR_PDMSK); +} + +static void mx25_tcq_enable_touch_irq(struct mx25_tcq_priv *priv) +{ + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_PDMSK, 0); +} + +static void mx25_tcq_disable_fifo_irq(struct mx25_tcq_priv *priv) +{ + regmap_update_bits(priv->regs, MX25_ADCQ_MR, MX25_ADCQ_MR_FDRY_IRQ, + MX25_ADCQ_MR_FDRY_IRQ); +} + +static void mx25_tcq_enable_fifo_irq(struct mx25_tcq_priv *priv) +{ + regmap_update_bits(priv->regs, MX25_ADCQ_MR, MX25_ADCQ_MR_FDRY_IRQ, 0); +} + +static void mx25_tcq_force_queue_start(struct mx25_tcq_priv *priv) +{ + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FQS, + MX25_ADCQ_CR_FQS); + + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FQS, 0); +} + +static void mx25_tcq_force_queue_stop(struct mx25_tcq_priv *priv) +{ + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FQS, 0); +} + +static void mx25_tcq_fifo_reset(struct mx25_tcq_priv *priv) +{ + u32 tcqcr; + + regmap_read(priv->regs, MX25_ADCQ_CR, &tcqcr); + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FRST, + MX25_ADCQ_CR_FRST); + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FRST, + 0); + regmap_write(priv->regs, MX25_ADCQ_CR, tcqcr); +} + +static void mx25_tcq_re_enable_touch_detection(struct mx25_tcq_priv *priv) +{ + /* stop the queue from looping */ + mx25_tcq_force_queue_stop(priv); + + /* for a clean touch detection, preload the X plane */ + regmap_write(priv->core_regs, MX25_TSC_TICR, MX25_PRECHARGE_VALUE); + + /* waste some time now to pre-load the X plate to high voltage */ + mx25_tcq_fifo_reset(priv); + + /* re-enable the detection right now */ + regmap_write(priv->core_regs, MX25_TSC_TICR, MX25_TOUCH_DETECT_VALUE | + MX25_ADCQ_CFG_IGS); + + regmap_update_bits(priv->regs, MX25_ADCQ_SR, MX25_ADCQ_SR_PD, + MX25_ADCQ_SR_PD); + + /* enable the pen down event to be a source for the interrupt */ + regmap_update_bits(priv->regs, MX25_ADCQ_MR, MX25_ADCQ_MR_PD_IRQ, 0); + + /* lets fire the next IRQ if someone touches the touchscreen */ + mx25_tcq_enable_touch_irq(priv); +} + +static int mx25_tcq_create_event_for_4wire(struct mx25_tcq_priv *priv, + u32 *sample_buf, int samples) +{ + unsigned int x_pos = 0; + unsigned int y_pos = 0; + unsigned int touch_pre = 0; + unsigned int touch_post = 0; + unsigned i; + int ret = 0; + + for (i = 0; i < samples; i++) { + unsigned int index = MX25_ADCQ_FIFO_ID(sample_buf[i]); + unsigned int val = MX25_ADCQ_FIFO_DATA(sample_buf[i]); + + switch (index) { + case 1: + touch_pre = val; + break; + case 2: + x_pos = val; + break; + case 3: + y_pos = val; + break; + case 5: + touch_post = val; + break; + default: + ret = -EINVAL; + break; + } + } + + if (ret == 0 && samples != 0) { + /* + * only if both touch measures are below a treshold, + * the position is valid + */ + if (touch_pre < priv->pen_threshold && + touch_post < priv->pen_threshold) { + /* valid samples, generate a report */ + x_pos /= priv->sample_count; + y_pos /= priv->sample_count; + input_report_abs(priv->idev, ABS_X, x_pos); + input_report_abs(priv->idev, ABS_Y, y_pos); + input_report_key(priv->idev, BTN_TOUCH, + 0xfff - ((touch_pre + touch_post) / 2)); + input_sync(priv->idev); + + /* get next sample */ + mx25_tcq_force_queue_start(priv); + mx25_tcq_enable_fifo_irq(priv); + } else { + if (touch_pre >= priv->pen_threshold && + touch_post >= priv->pen_threshold) { + /* + * if both samples are invalid, + * generate a release report + */ + input_report_key(priv->idev, BTN_TOUCH, 0); + input_sync(priv->idev); + mx25_tcq_re_enable_touch_detection(priv); + } else { + /* + * if only one of both touch measurements are + * below the threshold, still some bouncing + * happens. Take additional samples in this + * case to be sure + */ + mx25_tcq_force_queue_start(priv); + mx25_tcq_enable_fifo_irq(priv); + } + } + } + + return ret; +} + +static irqreturn_t mx25_tcq_irq_thread(int irq, void *dev_id) +{ + struct mx25_tcq_priv *priv = (struct mx25_tcq_priv *) dev_id; + u32 sample_buf[TSC_MAX_SAMPLES]; + int samples = 0; + + /* read all samples */ + while (1) { + u32 stats; + + regmap_read(priv->regs, MX25_ADCQ_SR, &stats); + if (stats & MX25_ADCQ_SR_EMPT) + break; + + if (samples < TSC_MAX_SAMPLES) { + regmap_read(priv->regs, MX25_ADCQ_FIFO, + &sample_buf[samples]); + ++samples; + } else { + u32 discarded; + /* discard samples */ + regmap_read(priv->regs, MX25_ADCQ_FIFO, &discarded); + } + } + + mx25_tcq_create_event_for_4wire(priv, sample_buf, samples); + + return IRQ_HANDLED; +} + +static irqreturn_t mx25_tcq_irq(int irq, void *dev_id) +{ + struct mx25_tcq_priv *priv = (struct mx25_tcq_priv *)dev_id; + u32 stat; + int ret = IRQ_HANDLED; + + regmap_read(priv->regs, MX25_ADCQ_SR, &stat); + + if (stat & (MX25_ADCQ_SR_FRR | MX25_ADCQ_SR_FUR | MX25_ADCQ_SR_FOR)) + mx25_tcq_fifo_reset(priv); + + if (stat & MX25_ADCQ_SR_PD) { + mx25_tcq_disable_touch_irq(priv); + mx25_tcq_force_queue_start(priv); + mx25_tcq_enable_fifo_irq(priv); + } + + if (stat & MX25_ADCQ_SR_FDRY) { + mx25_tcq_disable_fifo_irq(priv); + ret = IRQ_WAKE_THREAD; + } + + regmap_update_bits(priv->regs, MX25_ADCQ_SR, MX25_ADCQ_SR_FRR | + MX25_ADCQ_SR_FUR | MX25_ADCQ_SR_FOR | MX25_ADCQ_SR_PD | + MX25_ADCQ_SR_EOQ, + MX25_ADCQ_SR_FRR | + MX25_ADCQ_SR_FUR | MX25_ADCQ_SR_FOR | MX25_ADCQ_SR_PD | + MX25_ADCQ_SR_EOQ); + + return ret; +} + +/* configure the statemachine for a 4-wire touchscreen */ +static int mx25_tcq_init(struct mx25_tcq_priv *priv) +{ + u32 tgcr; + unsigned int ipg_div; + unsigned int adc_period; + unsigned int repeat_wait; + unsigned int debounce_cnt; + unsigned int settling_time; + int itemct; + int ret; + + regmap_read(priv->core_regs, MX25_TSC_TGCR, &tgcr); + ipg_div = max_t(unsigned int, 4, MX25_TGCR_GET_ADCCLK(tgcr)); + adc_period = clk_get_rate(priv->clk) / (ipg_div * 2 + 2); + repeat_wait = fls(DIV_ROUND_UP(priv->repeat_wait, adc_period)); + debounce_cnt = DIV_ROUND_UP(priv->pen_debounce, adc_period * 8) - 1; + settling_time = DIV_ROUND_UP(priv->settling_time, adc_period); + + + /* Reset */ + regmap_write(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_QRST | + MX25_ADCQ_CR_FRST); + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_QRST | + MX25_ADCQ_CR_FRST, 0); + + /* up to 128 * 8 ADC clocks are possible */ + if (debounce_cnt > 127) + debounce_cnt = 127; + + if (repeat_wait > 15) + repeat_wait = 15; + + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_RWAIT_MASK, + MX25_ADCQ_CR_RWAIT(repeat_wait)); + + ret = imx25_setup_queue_4wire(priv, 0x0, &itemct); + if (ret) + return ret; + + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_LITEMID_MASK | + MX25_ADCQ_CR_WMRK_MASK, + MX25_ADCQ_CR_LITEMID(itemct - 1) | + MX25_ADCQ_CR_WMRK(priv->expected_samples - 1)); + + /* setup debounce count */ + regmap_update_bits(priv->core_regs, MX25_TSC_TGCR, + MX25_TGCR_PDBTIME_MASK, + MX25_TGCR_PDBTIME(debounce_cnt)); + + /* enable debounce */ + regmap_update_bits(priv->core_regs, MX25_TSC_TGCR, MX25_TGCR_PDBEN, + MX25_TGCR_PDBEN); + regmap_update_bits(priv->core_regs, MX25_TSC_TGCR, MX25_TGCR_PDEN, + MX25_TGCR_PDEN); + + /* enable the engine on demand */ + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_QSM_FQS, + MX25_ADCQ_CR_QSM_FQS); + + mx25_tcq_re_enable_touch_detection(priv); + + return 0; +} + +static int mx25_tcq_parse_dt(struct platform_device *pdev, + struct mx25_tcq_priv *priv) +{ + struct device_node *np = pdev->dev.of_node; + u32 wires; + int ret; + + /* Setup defaults */ + priv->pen_threshold = 500; + priv->sample_count = 3; + priv->repeat_wait = 15000000; + priv->pen_debounce = 1000000; + priv->settling_time = 250000; + + ret = of_property_read_u32(np, "fsl,wires", &wires); + if (ret) { + dev_err(&pdev->dev, "Failed to find fsl,wires properties\n"); + return ret; + } + + if (wires == 4) { + priv->mode = MX25_TS_4WIRE; + } else { + dev_err(&pdev->dev, "%u-wire mode not supported\n", wires); + return -EINVAL; + } + + /* These are optional, we don't care about the return values */ + of_property_read_u32(np, "fsl,pen-threshold", &priv->pen_threshold); + of_property_read_u32(np, "fsl,settling-time", &priv->settling_time); + of_property_read_u32(np, "fsl,pen-debounce", &priv->pen_debounce); + + return 0; +} + +static int mx25_tcq_probe(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + struct input_dev *idev; + struct mx25_tcq_priv *priv; + struct resource *res; + void __iomem *mem; + int ret; + int irq; + + priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); + if (!priv) + return -ENOMEM; + + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + mem = devm_ioremap_resource(dev, res); + if (!mem) { + dev_err(dev, "Failed to get iomem"); + return -ENOMEM; + } + + ret = mx25_tcq_parse_dt(pdev, priv); + if (ret) + return ret; + + priv->regs = devm_regmap_init_mmio(dev, mem, &mx25_tcq_regconfig); + if (IS_ERR(priv->regs)) { + dev_err(dev, "Failed to initialize regmap\n"); + return PTR_ERR(priv->regs); + } + + irq = platform_get_irq(pdev, 0); + if (irq < 0) { + dev_err(dev, "Failed to get IRQ\n"); + return irq; + } + + ret = devm_request_threaded_irq(dev, irq, mx25_tcq_irq, + mx25_tcq_irq_thread, IRQF_ONESHOT, pdev->name, priv); + if (ret) { + dev_err(dev, "Failed requesting IRQ\n"); + return ret; + } + + idev = devm_input_allocate_device(dev); + if (!idev) { + dev_err(dev, "Failed to allocate input device\n"); + return -ENOMEM; + } + + idev->name = mx25_tcq_name; + idev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS); + idev->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH); + input_set_abs_params(idev, ABS_X, 0, 0xfff, 0, 0); + input_set_abs_params(idev, ABS_Y, 0, 0xfff, 0, 0); + + idev->id.bustype = BUS_HOST; + + ret = input_register_device(idev); + if (ret) { + dev_err(dev, "Failed to register input device\n"); + return ret; + } + + priv->idev = idev; + + priv->core_regs = mx25_tsadc_get_regmap(pdev->dev.parent); + priv->clk = mx25_tsadc_get_ipg(pdev->dev.parent); + + ret = clk_prepare_enable(priv->clk); + if (ret) { + dev_err(dev, "Failed to enable ipg clock\n"); + return ret; + } + + ret = mx25_tcq_init(priv); + if (ret) { + dev_err(dev, "Failed to init tcq\n"); + goto error_tcq_init; + } + + platform_set_drvdata(pdev, priv); + + return 0; + +error_tcq_init: + clk_disable_unprepare(priv->clk); + return ret; +} + +static int mx25_tcq_remove(struct platform_device *pdev) +{ + struct mx25_tcq_priv *priv = platform_get_drvdata(pdev); + + clk_disable_unprepare(priv->clk); + + return 0; +} + +static struct platform_driver mx25_tcq_driver = { + .driver = { + .name = "mx25-tcq", + .owner = THIS_MODULE, + .of_match_table = mx25_tcq_ids, + }, + .probe = mx25_tcq_probe, + .remove = mx25_tcq_remove, +}; +module_platform_driver(mx25_tcq_driver); + +MODULE_DESCRIPTION("TS input driver for Freescale mx25"); +MODULE_AUTHOR("Markus Pargmann <mpa@pengutronix.de>"); +MODULE_LICENSE("GPL v2"); -- 1.8.5.3 ^ permalink raw reply related [flat|nested] 76+ messages in thread
* [PATCH 2/3] input: touchscreen: imx25 tcq driver @ 2014-02-20 16:21 ` Markus Pargmann 0 siblings, 0 replies; 76+ messages in thread From: Markus Pargmann @ 2014-02-20 16:21 UTC (permalink / raw) To: linux-arm-kernel This is a driver for the imx25 ADC/TSC module. It controls the touchscreen conversion queue and creates a touchscreen input device. The driver currently only supports 4 wire touchscreens. The driver uses a simple conversion queue of precharge, touch detection, X measurement, Y measurement, precharge and another touch detection. This driver uses the regmap from the parent to setup some touch specific settings in the core driver and setup a idle configuration with touch detection. Signed-off-by: Markus Pargmann <mpa@pengutronix.de> --- .../bindings/input/touchscreen/fsl-mx25-tcq.txt | 29 + drivers/input/touchscreen/Kconfig | 6 + drivers/input/touchscreen/Makefile | 1 + drivers/input/touchscreen/fsl-imx25-tcq.c | 589 +++++++++++++++++++++ 4 files changed, 625 insertions(+) create mode 100644 Documentation/devicetree/bindings/input/touchscreen/fsl-mx25-tcq.txt create mode 100644 drivers/input/touchscreen/fsl-imx25-tcq.c diff --git a/Documentation/devicetree/bindings/input/touchscreen/fsl-mx25-tcq.txt b/Documentation/devicetree/bindings/input/touchscreen/fsl-mx25-tcq.txt new file mode 100644 index 0000000..4214a99 --- /dev/null +++ b/Documentation/devicetree/bindings/input/touchscreen/fsl-mx25-tcq.txt @@ -0,0 +1,29 @@ +Freescale mx25 TS conversion queue module + +mx25 touchscreen conversion queue module which controls the ADC unit of the +mx25 for attached touchscreens. + +Required properties: + - compatible: Should be "fsl,imx25-tcq". + - reg: Memory range of the device. + - interrupts: Should be the interrupt number associated with this module within + the tscadc unit (<0>). + - interrupt-parent: Should be a phandle to the tscadc unit. + - fsl,wires: Should be '<4>' or '<5>' + +Optional properties: + - fsl,pen-debounce: Pen debounce time. + - fsl,pen-threshold: Pen-down threshold for the touchscreen. + - fsl,settling-time: Settling time in nanoseconds. + +This device includes two conversion queues which can be added as subnodes. +The first queue is for the touchscreen, the second for general purpose ADC. + +Example: + tsc: tcq at 50030400 { + compatible = "fsl,imx25-tcq"; + reg = <0x50030400 0x60>; + interrupt-parent = <&tscadc>; + interrupts = <0>; + fsl,wires = <4>; + }; diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig index 07e9e82..d52c055 100644 --- a/drivers/input/touchscreen/Kconfig +++ b/drivers/input/touchscreen/Kconfig @@ -715,6 +715,12 @@ config TOUCHSCREEN_USB_COMPOSITE To compile this driver as a module, choose M here: the module will be called usbtouchscreen. +config TOUCHSCREEN_MX25 + tristate "Freescale i.MX25 touchscreen input driver" + depends on MFD_MX25_TSADC + help + Enable support for touchscreen connected to your i.MX25. + config TOUCHSCREEN_MC13783 tristate "Freescale MC13783 touchscreen input driver" depends on MFD_MC13XXX diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile index 62801f2..c891f30 100644 --- a/drivers/input/touchscreen/Makefile +++ b/drivers/input/touchscreen/Makefile @@ -38,6 +38,7 @@ obj-$(CONFIG_TOUCHSCREEN_INEXIO) += inexio.o obj-$(CONFIG_TOUCHSCREEN_INTEL_MID) += intel-mid-touch.o obj-$(CONFIG_TOUCHSCREEN_LPC32XX) += lpc32xx_ts.o obj-$(CONFIG_TOUCHSCREEN_MAX11801) += max11801_ts.o +obj-$(CONFIG_TOUCHSCREEN_MX25) += fsl-imx25-tcq.o obj-$(CONFIG_TOUCHSCREEN_MC13783) += mc13783_ts.o obj-$(CONFIG_TOUCHSCREEN_MCS5000) += mcs5000_ts.o obj-$(CONFIG_TOUCHSCREEN_MIGOR) += migor_ts.o diff --git a/drivers/input/touchscreen/fsl-imx25-tcq.c b/drivers/input/touchscreen/fsl-imx25-tcq.c new file mode 100644 index 0000000..436cc8b --- /dev/null +++ b/drivers/input/touchscreen/fsl-imx25-tcq.c @@ -0,0 +1,589 @@ +/* + * Copyright 2014 Markus Pargmann, Pengutronix <mpa@pengutronix.de> + * Based on driver from 2011 Juergen Beisert, Pengutronix <kernel@pengutronix.de> + * + * The code contained herein is licensed under the GNU General Public + * License. You may obtain a copy of the GNU General Public License + * Version 2 or later at the following locations: + * + * http://www.opensource.org/licenses/gpl-license.html + * http://www.gnu.org/copyleft/gpl.html + * + * This is the driver for the imx25 TCQ (Touchscreen Conversion Queue) + * connected to the imx25 ADC. + */ + +#include <linux/clk.h> +#include <linux/interrupt.h> +#include <linux/input.h> +#include <linux/mfd/imx25-tsadc.h> +#include <linux/module.h> +#include <linux/of.h> +#include <linux/platform_device.h> +#include <linux/regmap.h> + +static const char mx25_tcq_name[] = "mx25-tcq"; + +enum mx25_tcq_mode { + MX25_TS_4WIRE, +}; + +struct mx25_tcq_priv { + struct regmap *regs; + struct regmap *core_regs; + struct input_dev *idev; + enum mx25_tcq_mode mode; + unsigned int pen_threshold; + unsigned int sample_count; + unsigned int expected_samples; + unsigned int repeat_wait; + unsigned int pen_debounce; + unsigned int settling_time; + struct clk *clk; +}; + +static struct regmap_config mx25_tcq_regconfig = { + .fast_io = true, + .max_register = 0x5c, + .reg_bits = 32, + .val_bits = 32, + .reg_stride = 4, +}; + +static struct of_device_id mx25_tcq_ids[] = { + { .compatible = "fsl,imx25-tcq", }, + { /* Senitel */ } +}; + +#define TSC_4WIRE_PRE_INDEX 0 +#define TSC_4WIRE_X_INDEX 1 +#define TSC_4WIRE_Y_INDEX 2 +#define TSC_4WIRE_POST_INDEX 3 +#define TSC_4WIRE_LEAVE 4 + +#define MX25_TSC_DEF_THRESHOLD 80 +#define TSC_MAX_SAMPLES 16 + + +enum mx25_adc_configurations { + MX25_CFG_PRECHARGE = 0, + MX25_CFG_TOUCH_DETECT, + MX25_CFG_X_MEASUREMENT, + MX25_CFG_Y_MEASUREMENT, +}; + +#define MX25_PRECHARGE_VALUE (\ + MX25_ADCQ_CFG_YPLL_OFF | \ + MX25_ADCQ_CFG_XNUR_OFF | \ + MX25_ADCQ_CFG_XPUL_HIGH | \ + MX25_ADCQ_CFG_REFP_INT | \ + MX25_ADCQ_CFG_IN_XP | \ + MX25_ADCQ_CFG_REFN_NGND2 | \ + MX25_ADCQ_CFG_IGS) + +#define MX25_TOUCH_DETECT_VALUE (\ + MX25_ADCQ_CFG_YNLR | \ + MX25_ADCQ_CFG_YPLL_OFF | \ + MX25_ADCQ_CFG_XNUR_OFF | \ + MX25_ADCQ_CFG_XPUL_OFF | \ + MX25_ADCQ_CFG_REFP_INT | \ + MX25_ADCQ_CFG_IN_XP | \ + MX25_ADCQ_CFG_REFN_NGND2 | \ + MX25_ADCQ_CFG_PENIACK) + +static void imx25_setup_queue_cfgs(struct mx25_tcq_priv *priv, + unsigned int settling_time) +{ + u32 precharge_cfg = + MX25_PRECHARGE_VALUE | + MX25_ADCQ_CFG_SETTLING_TIME(settling_time); + u32 touch_detect_cfg = + MX25_TOUCH_DETECT_VALUE | + MX25_ADCQ_CFG_NOS(1) | + MX25_ADCQ_CFG_SETTLING_TIME(settling_time); + + regmap_write(priv->core_regs, MX25_TSC_TICR, precharge_cfg); + + /* PRECHARGE */ + regmap_write(priv->regs, MX25_ADCQ_CFG(MX25_CFG_PRECHARGE), + precharge_cfg); + + /* TOUCH_DETECT */ + regmap_write(priv->regs, MX25_ADCQ_CFG(MX25_CFG_TOUCH_DETECT), + touch_detect_cfg); + + /* X Measurement */ + regmap_write(priv->regs, MX25_ADCQ_CFG(MX25_CFG_X_MEASUREMENT), + MX25_ADCQ_CFG_YPLL_OFF | + MX25_ADCQ_CFG_XNUR_LOW | + MX25_ADCQ_CFG_XPUL_HIGH | + MX25_ADCQ_CFG_REFP_XP | + MX25_ADCQ_CFG_IN_YP | + MX25_ADCQ_CFG_REFN_XN | + MX25_ADCQ_CFG_NOS(priv->sample_count) | + MX25_ADCQ_CFG_SETTLING_TIME(settling_time)); + + /* Y Measurement */ + regmap_write(priv->regs, MX25_ADCQ_CFG(MX25_CFG_Y_MEASUREMENT), + MX25_ADCQ_CFG_YNLR | + MX25_ADCQ_CFG_YPLL_HIGH | + MX25_ADCQ_CFG_XNUR_OFF | + MX25_ADCQ_CFG_XPUL_OFF | + MX25_ADCQ_CFG_REFP_YP | + MX25_ADCQ_CFG_IN_XP | + MX25_ADCQ_CFG_REFN_YN | + MX25_ADCQ_CFG_NOS(priv->sample_count) | + MX25_ADCQ_CFG_SETTLING_TIME(settling_time)); + + /* Enable the touch detection right now */ + regmap_write(priv->core_regs, MX25_TSC_TICR, touch_detect_cfg | + MX25_ADCQ_CFG_IGS); +} + +static int imx25_setup_queue_4wire(struct mx25_tcq_priv *priv, + unsigned settling_time, int *items) +{ + imx25_setup_queue_cfgs(priv, settling_time); + + /* Setup the conversion queue */ + regmap_write(priv->regs, MX25_ADCQ_ITEM_7_0, + MX25_ADCQ_ITEM(0, MX25_CFG_PRECHARGE) | + MX25_ADCQ_ITEM(1, MX25_CFG_TOUCH_DETECT) | + MX25_ADCQ_ITEM(2, MX25_CFG_X_MEASUREMENT) | + MX25_ADCQ_ITEM(3, MX25_CFG_Y_MEASUREMENT) | + MX25_ADCQ_ITEM(4, MX25_CFG_PRECHARGE) | + MX25_ADCQ_ITEM(5, MX25_CFG_TOUCH_DETECT)); + + /* We measure X/Y with 'sample_count' number of samples and execute a + * touch detection twice, with 1 sample each */ + priv->expected_samples = priv->sample_count * 2 + 2; + *items = 6; + + return 0; +} + +static void mx25_tcq_disable_touch_irq(struct mx25_tcq_priv *priv) +{ + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_PDMSK, + MX25_ADCQ_CR_PDMSK); +} + +static void mx25_tcq_enable_touch_irq(struct mx25_tcq_priv *priv) +{ + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_PDMSK, 0); +} + +static void mx25_tcq_disable_fifo_irq(struct mx25_tcq_priv *priv) +{ + regmap_update_bits(priv->regs, MX25_ADCQ_MR, MX25_ADCQ_MR_FDRY_IRQ, + MX25_ADCQ_MR_FDRY_IRQ); +} + +static void mx25_tcq_enable_fifo_irq(struct mx25_tcq_priv *priv) +{ + regmap_update_bits(priv->regs, MX25_ADCQ_MR, MX25_ADCQ_MR_FDRY_IRQ, 0); +} + +static void mx25_tcq_force_queue_start(struct mx25_tcq_priv *priv) +{ + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FQS, + MX25_ADCQ_CR_FQS); + + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FQS, 0); +} + +static void mx25_tcq_force_queue_stop(struct mx25_tcq_priv *priv) +{ + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FQS, 0); +} + +static void mx25_tcq_fifo_reset(struct mx25_tcq_priv *priv) +{ + u32 tcqcr; + + regmap_read(priv->regs, MX25_ADCQ_CR, &tcqcr); + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FRST, + MX25_ADCQ_CR_FRST); + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FRST, + 0); + regmap_write(priv->regs, MX25_ADCQ_CR, tcqcr); +} + +static void mx25_tcq_re_enable_touch_detection(struct mx25_tcq_priv *priv) +{ + /* stop the queue from looping */ + mx25_tcq_force_queue_stop(priv); + + /* for a clean touch detection, preload the X plane */ + regmap_write(priv->core_regs, MX25_TSC_TICR, MX25_PRECHARGE_VALUE); + + /* waste some time now to pre-load the X plate to high voltage */ + mx25_tcq_fifo_reset(priv); + + /* re-enable the detection right now */ + regmap_write(priv->core_regs, MX25_TSC_TICR, MX25_TOUCH_DETECT_VALUE | + MX25_ADCQ_CFG_IGS); + + regmap_update_bits(priv->regs, MX25_ADCQ_SR, MX25_ADCQ_SR_PD, + MX25_ADCQ_SR_PD); + + /* enable the pen down event to be a source for the interrupt */ + regmap_update_bits(priv->regs, MX25_ADCQ_MR, MX25_ADCQ_MR_PD_IRQ, 0); + + /* lets fire the next IRQ if someone touches the touchscreen */ + mx25_tcq_enable_touch_irq(priv); +} + +static int mx25_tcq_create_event_for_4wire(struct mx25_tcq_priv *priv, + u32 *sample_buf, int samples) +{ + unsigned int x_pos = 0; + unsigned int y_pos = 0; + unsigned int touch_pre = 0; + unsigned int touch_post = 0; + unsigned i; + int ret = 0; + + for (i = 0; i < samples; i++) { + unsigned int index = MX25_ADCQ_FIFO_ID(sample_buf[i]); + unsigned int val = MX25_ADCQ_FIFO_DATA(sample_buf[i]); + + switch (index) { + case 1: + touch_pre = val; + break; + case 2: + x_pos = val; + break; + case 3: + y_pos = val; + break; + case 5: + touch_post = val; + break; + default: + ret = -EINVAL; + break; + } + } + + if (ret == 0 && samples != 0) { + /* + * only if both touch measures are below a treshold, + * the position is valid + */ + if (touch_pre < priv->pen_threshold && + touch_post < priv->pen_threshold) { + /* valid samples, generate a report */ + x_pos /= priv->sample_count; + y_pos /= priv->sample_count; + input_report_abs(priv->idev, ABS_X, x_pos); + input_report_abs(priv->idev, ABS_Y, y_pos); + input_report_key(priv->idev, BTN_TOUCH, + 0xfff - ((touch_pre + touch_post) / 2)); + input_sync(priv->idev); + + /* get next sample */ + mx25_tcq_force_queue_start(priv); + mx25_tcq_enable_fifo_irq(priv); + } else { + if (touch_pre >= priv->pen_threshold && + touch_post >= priv->pen_threshold) { + /* + * if both samples are invalid, + * generate a release report + */ + input_report_key(priv->idev, BTN_TOUCH, 0); + input_sync(priv->idev); + mx25_tcq_re_enable_touch_detection(priv); + } else { + /* + * if only one of both touch measurements are + * below the threshold, still some bouncing + * happens. Take additional samples in this + * case to be sure + */ + mx25_tcq_force_queue_start(priv); + mx25_tcq_enable_fifo_irq(priv); + } + } + } + + return ret; +} + +static irqreturn_t mx25_tcq_irq_thread(int irq, void *dev_id) +{ + struct mx25_tcq_priv *priv = (struct mx25_tcq_priv *) dev_id; + u32 sample_buf[TSC_MAX_SAMPLES]; + int samples = 0; + + /* read all samples */ + while (1) { + u32 stats; + + regmap_read(priv->regs, MX25_ADCQ_SR, &stats); + if (stats & MX25_ADCQ_SR_EMPT) + break; + + if (samples < TSC_MAX_SAMPLES) { + regmap_read(priv->regs, MX25_ADCQ_FIFO, + &sample_buf[samples]); + ++samples; + } else { + u32 discarded; + /* discard samples */ + regmap_read(priv->regs, MX25_ADCQ_FIFO, &discarded); + } + } + + mx25_tcq_create_event_for_4wire(priv, sample_buf, samples); + + return IRQ_HANDLED; +} + +static irqreturn_t mx25_tcq_irq(int irq, void *dev_id) +{ + struct mx25_tcq_priv *priv = (struct mx25_tcq_priv *)dev_id; + u32 stat; + int ret = IRQ_HANDLED; + + regmap_read(priv->regs, MX25_ADCQ_SR, &stat); + + if (stat & (MX25_ADCQ_SR_FRR | MX25_ADCQ_SR_FUR | MX25_ADCQ_SR_FOR)) + mx25_tcq_fifo_reset(priv); + + if (stat & MX25_ADCQ_SR_PD) { + mx25_tcq_disable_touch_irq(priv); + mx25_tcq_force_queue_start(priv); + mx25_tcq_enable_fifo_irq(priv); + } + + if (stat & MX25_ADCQ_SR_FDRY) { + mx25_tcq_disable_fifo_irq(priv); + ret = IRQ_WAKE_THREAD; + } + + regmap_update_bits(priv->regs, MX25_ADCQ_SR, MX25_ADCQ_SR_FRR | + MX25_ADCQ_SR_FUR | MX25_ADCQ_SR_FOR | MX25_ADCQ_SR_PD | + MX25_ADCQ_SR_EOQ, + MX25_ADCQ_SR_FRR | + MX25_ADCQ_SR_FUR | MX25_ADCQ_SR_FOR | MX25_ADCQ_SR_PD | + MX25_ADCQ_SR_EOQ); + + return ret; +} + +/* configure the statemachine for a 4-wire touchscreen */ +static int mx25_tcq_init(struct mx25_tcq_priv *priv) +{ + u32 tgcr; + unsigned int ipg_div; + unsigned int adc_period; + unsigned int repeat_wait; + unsigned int debounce_cnt; + unsigned int settling_time; + int itemct; + int ret; + + regmap_read(priv->core_regs, MX25_TSC_TGCR, &tgcr); + ipg_div = max_t(unsigned int, 4, MX25_TGCR_GET_ADCCLK(tgcr)); + adc_period = clk_get_rate(priv->clk) / (ipg_div * 2 + 2); + repeat_wait = fls(DIV_ROUND_UP(priv->repeat_wait, adc_period)); + debounce_cnt = DIV_ROUND_UP(priv->pen_debounce, adc_period * 8) - 1; + settling_time = DIV_ROUND_UP(priv->settling_time, adc_period); + + + /* Reset */ + regmap_write(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_QRST | + MX25_ADCQ_CR_FRST); + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_QRST | + MX25_ADCQ_CR_FRST, 0); + + /* up to 128 * 8 ADC clocks are possible */ + if (debounce_cnt > 127) + debounce_cnt = 127; + + if (repeat_wait > 15) + repeat_wait = 15; + + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_RWAIT_MASK, + MX25_ADCQ_CR_RWAIT(repeat_wait)); + + ret = imx25_setup_queue_4wire(priv, 0x0, &itemct); + if (ret) + return ret; + + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_LITEMID_MASK | + MX25_ADCQ_CR_WMRK_MASK, + MX25_ADCQ_CR_LITEMID(itemct - 1) | + MX25_ADCQ_CR_WMRK(priv->expected_samples - 1)); + + /* setup debounce count */ + regmap_update_bits(priv->core_regs, MX25_TSC_TGCR, + MX25_TGCR_PDBTIME_MASK, + MX25_TGCR_PDBTIME(debounce_cnt)); + + /* enable debounce */ + regmap_update_bits(priv->core_regs, MX25_TSC_TGCR, MX25_TGCR_PDBEN, + MX25_TGCR_PDBEN); + regmap_update_bits(priv->core_regs, MX25_TSC_TGCR, MX25_TGCR_PDEN, + MX25_TGCR_PDEN); + + /* enable the engine on demand */ + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_QSM_FQS, + MX25_ADCQ_CR_QSM_FQS); + + mx25_tcq_re_enable_touch_detection(priv); + + return 0; +} + +static int mx25_tcq_parse_dt(struct platform_device *pdev, + struct mx25_tcq_priv *priv) +{ + struct device_node *np = pdev->dev.of_node; + u32 wires; + int ret; + + /* Setup defaults */ + priv->pen_threshold = 500; + priv->sample_count = 3; + priv->repeat_wait = 15000000; + priv->pen_debounce = 1000000; + priv->settling_time = 250000; + + ret = of_property_read_u32(np, "fsl,wires", &wires); + if (ret) { + dev_err(&pdev->dev, "Failed to find fsl,wires properties\n"); + return ret; + } + + if (wires == 4) { + priv->mode = MX25_TS_4WIRE; + } else { + dev_err(&pdev->dev, "%u-wire mode not supported\n", wires); + return -EINVAL; + } + + /* These are optional, we don't care about the return values */ + of_property_read_u32(np, "fsl,pen-threshold", &priv->pen_threshold); + of_property_read_u32(np, "fsl,settling-time", &priv->settling_time); + of_property_read_u32(np, "fsl,pen-debounce", &priv->pen_debounce); + + return 0; +} + +static int mx25_tcq_probe(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + struct input_dev *idev; + struct mx25_tcq_priv *priv; + struct resource *res; + void __iomem *mem; + int ret; + int irq; + + priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); + if (!priv) + return -ENOMEM; + + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + mem = devm_ioremap_resource(dev, res); + if (!mem) { + dev_err(dev, "Failed to get iomem"); + return -ENOMEM; + } + + ret = mx25_tcq_parse_dt(pdev, priv); + if (ret) + return ret; + + priv->regs = devm_regmap_init_mmio(dev, mem, &mx25_tcq_regconfig); + if (IS_ERR(priv->regs)) { + dev_err(dev, "Failed to initialize regmap\n"); + return PTR_ERR(priv->regs); + } + + irq = platform_get_irq(pdev, 0); + if (irq < 0) { + dev_err(dev, "Failed to get IRQ\n"); + return irq; + } + + ret = devm_request_threaded_irq(dev, irq, mx25_tcq_irq, + mx25_tcq_irq_thread, IRQF_ONESHOT, pdev->name, priv); + if (ret) { + dev_err(dev, "Failed requesting IRQ\n"); + return ret; + } + + idev = devm_input_allocate_device(dev); + if (!idev) { + dev_err(dev, "Failed to allocate input device\n"); + return -ENOMEM; + } + + idev->name = mx25_tcq_name; + idev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS); + idev->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH); + input_set_abs_params(idev, ABS_X, 0, 0xfff, 0, 0); + input_set_abs_params(idev, ABS_Y, 0, 0xfff, 0, 0); + + idev->id.bustype = BUS_HOST; + + ret = input_register_device(idev); + if (ret) { + dev_err(dev, "Failed to register input device\n"); + return ret; + } + + priv->idev = idev; + + priv->core_regs = mx25_tsadc_get_regmap(pdev->dev.parent); + priv->clk = mx25_tsadc_get_ipg(pdev->dev.parent); + + ret = clk_prepare_enable(priv->clk); + if (ret) { + dev_err(dev, "Failed to enable ipg clock\n"); + return ret; + } + + ret = mx25_tcq_init(priv); + if (ret) { + dev_err(dev, "Failed to init tcq\n"); + goto error_tcq_init; + } + + platform_set_drvdata(pdev, priv); + + return 0; + +error_tcq_init: + clk_disable_unprepare(priv->clk); + return ret; +} + +static int mx25_tcq_remove(struct platform_device *pdev) +{ + struct mx25_tcq_priv *priv = platform_get_drvdata(pdev); + + clk_disable_unprepare(priv->clk); + + return 0; +} + +static struct platform_driver mx25_tcq_driver = { + .driver = { + .name = "mx25-tcq", + .owner = THIS_MODULE, + .of_match_table = mx25_tcq_ids, + }, + .probe = mx25_tcq_probe, + .remove = mx25_tcq_remove, +}; +module_platform_driver(mx25_tcq_driver); + +MODULE_DESCRIPTION("TS input driver for Freescale mx25"); +MODULE_AUTHOR("Markus Pargmann <mpa@pengutronix.de>"); +MODULE_LICENSE("GPL v2"); -- 1.8.5.3 ^ permalink raw reply related [flat|nested] 76+ messages in thread
[parent not found: <1392913312-9030-3-git-send-email-mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>]
* Re: [PATCH 2/3] input: touchscreen: imx25 tcq driver 2014-02-20 16:21 ` Markus Pargmann (?) @ 2014-02-23 6:44 ` Dmitry Torokhov -1 siblings, 0 replies; 76+ messages in thread From: Dmitry Torokhov @ 2014-02-23 6:44 UTC (permalink / raw) To: Markus Pargmann Cc: devicetree-u79uwXL29TY76Z2rM5mHXA, linux-input-u79uwXL29TY76Z2rM5mHXA, linux-iio-u79uwXL29TY76Z2rM5mHXA, Samuel Ortiz, Lee Jones, Jonathan Cameron, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, kernel-bIcnvbaLZ9MEGnE8C9+IrQ Hi Marjus, On Thu, Feb 20, 2014 at 05:21:51PM +0100, Markus Pargmann wrote: > This is a driver for the imx25 ADC/TSC module. It controls the > touchscreen conversion queue and creates a touchscreen input device. > The driver currently only supports 4 wire touchscreens. The driver uses > a simple conversion queue of precharge, touch detection, X measurement, > Y measurement, precharge and another touch detection. > > This driver uses the regmap from the parent to setup some touch specific > settings in the core driver and setup a idle configuration with touch > detection. > > Signed-off-by: Markus Pargmann <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> > --- > .../bindings/input/touchscreen/fsl-mx25-tcq.txt | 29 + > drivers/input/touchscreen/Kconfig | 6 + > drivers/input/touchscreen/Makefile | 1 + > drivers/input/touchscreen/fsl-imx25-tcq.c | 589 +++++++++++++++++++++ > 4 files changed, 625 insertions(+) > create mode 100644 Documentation/devicetree/bindings/input/touchscreen/fsl-mx25-tcq.txt > create mode 100644 drivers/input/touchscreen/fsl-imx25-tcq.c > > diff --git a/Documentation/devicetree/bindings/input/touchscreen/fsl-mx25-tcq.txt b/Documentation/devicetree/bindings/input/touchscreen/fsl-mx25-tcq.txt > new file mode 100644 > index 0000000..4214a99 > --- /dev/null > +++ b/Documentation/devicetree/bindings/input/touchscreen/fsl-mx25-tcq.txt > @@ -0,0 +1,29 @@ > +Freescale mx25 TS conversion queue module > + > +mx25 touchscreen conversion queue module which controls the ADC unit of the > +mx25 for attached touchscreens. > + > +Required properties: > + - compatible: Should be "fsl,imx25-tcq". > + - reg: Memory range of the device. > + - interrupts: Should be the interrupt number associated with this module within > + the tscadc unit (<0>). > + - interrupt-parent: Should be a phandle to the tscadc unit. > + - fsl,wires: Should be '<4>' or '<5>' > + > +Optional properties: > + - fsl,pen-debounce: Pen debounce time. > + - fsl,pen-threshold: Pen-down threshold for the touchscreen. > + - fsl,settling-time: Settling time in nanoseconds. > + > +This device includes two conversion queues which can be added as subnodes. > +The first queue is for the touchscreen, the second for general purpose ADC. > + > +Example: > + tsc: tcq@50030400 { > + compatible = "fsl,imx25-tcq"; > + reg = <0x50030400 0x60>; > + interrupt-parent = <&tscadc>; > + interrupts = <0>; > + fsl,wires = <4>; > + }; > diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig > index 07e9e82..d52c055 100644 > --- a/drivers/input/touchscreen/Kconfig > +++ b/drivers/input/touchscreen/Kconfig > @@ -715,6 +715,12 @@ config TOUCHSCREEN_USB_COMPOSITE > To compile this driver as a module, choose M here: the > module will be called usbtouchscreen. > > +config TOUCHSCREEN_MX25 > + tristate "Freescale i.MX25 touchscreen input driver" > + depends on MFD_MX25_TSADC > + help > + Enable support for touchscreen connected to your i.MX25. > + > config TOUCHSCREEN_MC13783 > tristate "Freescale MC13783 touchscreen input driver" > depends on MFD_MC13XXX > diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile > index 62801f2..c891f30 100644 > --- a/drivers/input/touchscreen/Makefile > +++ b/drivers/input/touchscreen/Makefile > @@ -38,6 +38,7 @@ obj-$(CONFIG_TOUCHSCREEN_INEXIO) += inexio.o > obj-$(CONFIG_TOUCHSCREEN_INTEL_MID) += intel-mid-touch.o > obj-$(CONFIG_TOUCHSCREEN_LPC32XX) += lpc32xx_ts.o > obj-$(CONFIG_TOUCHSCREEN_MAX11801) += max11801_ts.o > +obj-$(CONFIG_TOUCHSCREEN_MX25) += fsl-imx25-tcq.o > obj-$(CONFIG_TOUCHSCREEN_MC13783) += mc13783_ts.o > obj-$(CONFIG_TOUCHSCREEN_MCS5000) += mcs5000_ts.o > obj-$(CONFIG_TOUCHSCREEN_MIGOR) += migor_ts.o > diff --git a/drivers/input/touchscreen/fsl-imx25-tcq.c b/drivers/input/touchscreen/fsl-imx25-tcq.c > new file mode 100644 > index 0000000..436cc8b > --- /dev/null > +++ b/drivers/input/touchscreen/fsl-imx25-tcq.c > @@ -0,0 +1,589 @@ > +/* > + * Copyright 2014 Markus Pargmann, Pengutronix <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> > + * Based on driver from 2011 Juergen Beisert, Pengutronix <kernel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> > + * > + * The code contained herein is licensed under the GNU General Public > + * License. You may obtain a copy of the GNU General Public License > + * Version 2 or later at the following locations: > + * > + * http://www.opensource.org/licenses/gpl-license.html > + * http://www.gnu.org/copyleft/gpl.html > + * > + * This is the driver for the imx25 TCQ (Touchscreen Conversion Queue) > + * connected to the imx25 ADC. > + */ > + > +#include <linux/clk.h> > +#include <linux/interrupt.h> > +#include <linux/input.h> > +#include <linux/mfd/imx25-tsadc.h> > +#include <linux/module.h> > +#include <linux/of.h> > +#include <linux/platform_device.h> > +#include <linux/regmap.h> > + > +static const char mx25_tcq_name[] = "mx25-tcq"; > + > +enum mx25_tcq_mode { > + MX25_TS_4WIRE, > +}; > + > +struct mx25_tcq_priv { > + struct regmap *regs; > + struct regmap *core_regs; > + struct input_dev *idev; > + enum mx25_tcq_mode mode; > + unsigned int pen_threshold; > + unsigned int sample_count; > + unsigned int expected_samples; > + unsigned int repeat_wait; > + unsigned int pen_debounce; > + unsigned int settling_time; > + struct clk *clk; > +}; > + > +static struct regmap_config mx25_tcq_regconfig = { > + .fast_io = true, > + .max_register = 0x5c, > + .reg_bits = 32, > + .val_bits = 32, > + .reg_stride = 4, > +}; > + > +static struct of_device_id mx25_tcq_ids[] = { > + { .compatible = "fsl,imx25-tcq", }, > + { /* Senitel */ } > +}; > + > +#define TSC_4WIRE_PRE_INDEX 0 > +#define TSC_4WIRE_X_INDEX 1 > +#define TSC_4WIRE_Y_INDEX 2 > +#define TSC_4WIRE_POST_INDEX 3 > +#define TSC_4WIRE_LEAVE 4 > + > +#define MX25_TSC_DEF_THRESHOLD 80 > +#define TSC_MAX_SAMPLES 16 > + > + > +enum mx25_adc_configurations { > + MX25_CFG_PRECHARGE = 0, > + MX25_CFG_TOUCH_DETECT, > + MX25_CFG_X_MEASUREMENT, > + MX25_CFG_Y_MEASUREMENT, > +}; > + > +#define MX25_PRECHARGE_VALUE (\ > + MX25_ADCQ_CFG_YPLL_OFF | \ > + MX25_ADCQ_CFG_XNUR_OFF | \ > + MX25_ADCQ_CFG_XPUL_HIGH | \ > + MX25_ADCQ_CFG_REFP_INT | \ > + MX25_ADCQ_CFG_IN_XP | \ > + MX25_ADCQ_CFG_REFN_NGND2 | \ > + MX25_ADCQ_CFG_IGS) > + > +#define MX25_TOUCH_DETECT_VALUE (\ > + MX25_ADCQ_CFG_YNLR | \ > + MX25_ADCQ_CFG_YPLL_OFF | \ > + MX25_ADCQ_CFG_XNUR_OFF | \ > + MX25_ADCQ_CFG_XPUL_OFF | \ > + MX25_ADCQ_CFG_REFP_INT | \ > + MX25_ADCQ_CFG_IN_XP | \ > + MX25_ADCQ_CFG_REFN_NGND2 | \ > + MX25_ADCQ_CFG_PENIACK) > + > +static void imx25_setup_queue_cfgs(struct mx25_tcq_priv *priv, > + unsigned int settling_time) > +{ > + u32 precharge_cfg = > + MX25_PRECHARGE_VALUE | > + MX25_ADCQ_CFG_SETTLING_TIME(settling_time); > + u32 touch_detect_cfg = > + MX25_TOUCH_DETECT_VALUE | > + MX25_ADCQ_CFG_NOS(1) | > + MX25_ADCQ_CFG_SETTLING_TIME(settling_time); > + > + regmap_write(priv->core_regs, MX25_TSC_TICR, precharge_cfg); > + > + /* PRECHARGE */ > + regmap_write(priv->regs, MX25_ADCQ_CFG(MX25_CFG_PRECHARGE), > + precharge_cfg); > + > + /* TOUCH_DETECT */ > + regmap_write(priv->regs, MX25_ADCQ_CFG(MX25_CFG_TOUCH_DETECT), > + touch_detect_cfg); > + > + /* X Measurement */ > + regmap_write(priv->regs, MX25_ADCQ_CFG(MX25_CFG_X_MEASUREMENT), > + MX25_ADCQ_CFG_YPLL_OFF | > + MX25_ADCQ_CFG_XNUR_LOW | > + MX25_ADCQ_CFG_XPUL_HIGH | > + MX25_ADCQ_CFG_REFP_XP | > + MX25_ADCQ_CFG_IN_YP | > + MX25_ADCQ_CFG_REFN_XN | > + MX25_ADCQ_CFG_NOS(priv->sample_count) | > + MX25_ADCQ_CFG_SETTLING_TIME(settling_time)); > + > + /* Y Measurement */ > + regmap_write(priv->regs, MX25_ADCQ_CFG(MX25_CFG_Y_MEASUREMENT), > + MX25_ADCQ_CFG_YNLR | > + MX25_ADCQ_CFG_YPLL_HIGH | > + MX25_ADCQ_CFG_XNUR_OFF | > + MX25_ADCQ_CFG_XPUL_OFF | > + MX25_ADCQ_CFG_REFP_YP | > + MX25_ADCQ_CFG_IN_XP | > + MX25_ADCQ_CFG_REFN_YN | > + MX25_ADCQ_CFG_NOS(priv->sample_count) | > + MX25_ADCQ_CFG_SETTLING_TIME(settling_time)); > + > + /* Enable the touch detection right now */ > + regmap_write(priv->core_regs, MX25_TSC_TICR, touch_detect_cfg | > + MX25_ADCQ_CFG_IGS); > +} > + > +static int imx25_setup_queue_4wire(struct mx25_tcq_priv *priv, > + unsigned settling_time, int *items) > +{ > + imx25_setup_queue_cfgs(priv, settling_time); > + > + /* Setup the conversion queue */ > + regmap_write(priv->regs, MX25_ADCQ_ITEM_7_0, > + MX25_ADCQ_ITEM(0, MX25_CFG_PRECHARGE) | > + MX25_ADCQ_ITEM(1, MX25_CFG_TOUCH_DETECT) | > + MX25_ADCQ_ITEM(2, MX25_CFG_X_MEASUREMENT) | > + MX25_ADCQ_ITEM(3, MX25_CFG_Y_MEASUREMENT) | > + MX25_ADCQ_ITEM(4, MX25_CFG_PRECHARGE) | > + MX25_ADCQ_ITEM(5, MX25_CFG_TOUCH_DETECT)); > + > + /* We measure X/Y with 'sample_count' number of samples and execute a > + * touch detection twice, with 1 sample each */ > + priv->expected_samples = priv->sample_count * 2 + 2; > + *items = 6; > + > + return 0; > +} > + > +static void mx25_tcq_disable_touch_irq(struct mx25_tcq_priv *priv) > +{ > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_PDMSK, > + MX25_ADCQ_CR_PDMSK); > +} > + > +static void mx25_tcq_enable_touch_irq(struct mx25_tcq_priv *priv) > +{ > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_PDMSK, 0); > +} > + > +static void mx25_tcq_disable_fifo_irq(struct mx25_tcq_priv *priv) > +{ > + regmap_update_bits(priv->regs, MX25_ADCQ_MR, MX25_ADCQ_MR_FDRY_IRQ, > + MX25_ADCQ_MR_FDRY_IRQ); > +} > + > +static void mx25_tcq_enable_fifo_irq(struct mx25_tcq_priv *priv) > +{ > + regmap_update_bits(priv->regs, MX25_ADCQ_MR, MX25_ADCQ_MR_FDRY_IRQ, 0); > +} > + > +static void mx25_tcq_force_queue_start(struct mx25_tcq_priv *priv) > +{ > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FQS, > + MX25_ADCQ_CR_FQS); > + > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FQS, 0); > +} > + > +static void mx25_tcq_force_queue_stop(struct mx25_tcq_priv *priv) > +{ > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FQS, 0); > +} > + > +static void mx25_tcq_fifo_reset(struct mx25_tcq_priv *priv) > +{ > + u32 tcqcr; > + > + regmap_read(priv->regs, MX25_ADCQ_CR, &tcqcr); > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FRST, > + MX25_ADCQ_CR_FRST); > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FRST, > + 0); > + regmap_write(priv->regs, MX25_ADCQ_CR, tcqcr); > +} > + > +static void mx25_tcq_re_enable_touch_detection(struct mx25_tcq_priv *priv) > +{ > + /* stop the queue from looping */ > + mx25_tcq_force_queue_stop(priv); > + > + /* for a clean touch detection, preload the X plane */ > + regmap_write(priv->core_regs, MX25_TSC_TICR, MX25_PRECHARGE_VALUE); > + > + /* waste some time now to pre-load the X plate to high voltage */ > + mx25_tcq_fifo_reset(priv); > + > + /* re-enable the detection right now */ > + regmap_write(priv->core_regs, MX25_TSC_TICR, MX25_TOUCH_DETECT_VALUE | > + MX25_ADCQ_CFG_IGS); > + > + regmap_update_bits(priv->regs, MX25_ADCQ_SR, MX25_ADCQ_SR_PD, > + MX25_ADCQ_SR_PD); > + > + /* enable the pen down event to be a source for the interrupt */ > + regmap_update_bits(priv->regs, MX25_ADCQ_MR, MX25_ADCQ_MR_PD_IRQ, 0); > + > + /* lets fire the next IRQ if someone touches the touchscreen */ > + mx25_tcq_enable_touch_irq(priv); > +} > + > +static int mx25_tcq_create_event_for_4wire(struct mx25_tcq_priv *priv, > + u32 *sample_buf, int samples) > +{ > + unsigned int x_pos = 0; > + unsigned int y_pos = 0; > + unsigned int touch_pre = 0; > + unsigned int touch_post = 0; > + unsigned i; > + int ret = 0; > + > + for (i = 0; i < samples; i++) { > + unsigned int index = MX25_ADCQ_FIFO_ID(sample_buf[i]); > + unsigned int val = MX25_ADCQ_FIFO_DATA(sample_buf[i]); > + > + switch (index) { > + case 1: > + touch_pre = val; > + break; > + case 2: > + x_pos = val; > + break; > + case 3: > + y_pos = val; > + break; > + case 5: > + touch_post = val; > + break; > + default: > + ret = -EINVAL; > + break; > + } > + } > + > + if (ret == 0 && samples != 0) { > + /* > + * only if both touch measures are below a treshold, > + * the position is valid > + */ > + if (touch_pre < priv->pen_threshold && > + touch_post < priv->pen_threshold) { > + /* valid samples, generate a report */ > + x_pos /= priv->sample_count; > + y_pos /= priv->sample_count; > + input_report_abs(priv->idev, ABS_X, x_pos); > + input_report_abs(priv->idev, ABS_Y, y_pos); > + input_report_key(priv->idev, BTN_TOUCH, > + 0xfff - ((touch_pre + touch_post) / 2)); Hmm, are you trying to report pressure here? > + input_sync(priv->idev); > + > + /* get next sample */ > + mx25_tcq_force_queue_start(priv); > + mx25_tcq_enable_fifo_irq(priv); > + } else { > + if (touch_pre >= priv->pen_threshold && You can convert this to "else if" and save indentation level here. > + touch_post >= priv->pen_threshold) { > + /* > + * if both samples are invalid, > + * generate a release report > + */ > + input_report_key(priv->idev, BTN_TOUCH, 0); > + input_sync(priv->idev); > + mx25_tcq_re_enable_touch_detection(priv); > + } else { > + /* > + * if only one of both touch measurements are > + * below the threshold, still some bouncing > + * happens. Take additional samples in this > + * case to be sure > + */ > + mx25_tcq_force_queue_start(priv); > + mx25_tcq_enable_fifo_irq(priv); > + } > + } > + } > + > + return ret; > +} > + > +static irqreturn_t mx25_tcq_irq_thread(int irq, void *dev_id) > +{ > + struct mx25_tcq_priv *priv = (struct mx25_tcq_priv *) dev_id; > + u32 sample_buf[TSC_MAX_SAMPLES]; > + int samples = 0; > + > + /* read all samples */ > + while (1) { > + u32 stats; > + > + regmap_read(priv->regs, MX25_ADCQ_SR, &stats); Error handling for I/O operations? > + if (stats & MX25_ADCQ_SR_EMPT) > + break; > + > + if (samples < TSC_MAX_SAMPLES) { > + regmap_read(priv->regs, MX25_ADCQ_FIFO, > + &sample_buf[samples]); > + ++samples; > + } else { > + u32 discarded; > + /* discard samples */ > + regmap_read(priv->regs, MX25_ADCQ_FIFO, &discarded); Should there be some upper bound for number of discarded samples? > + } > + } > + > + mx25_tcq_create_event_for_4wire(priv, sample_buf, samples); > + > + return IRQ_HANDLED; > +} > + > +static irqreturn_t mx25_tcq_irq(int irq, void *dev_id) > +{ > + struct mx25_tcq_priv *priv = (struct mx25_tcq_priv *)dev_id; > + u32 stat; > + int ret = IRQ_HANDLED; > + > + regmap_read(priv->regs, MX25_ADCQ_SR, &stat); > + > + if (stat & (MX25_ADCQ_SR_FRR | MX25_ADCQ_SR_FUR | MX25_ADCQ_SR_FOR)) > + mx25_tcq_fifo_reset(priv); > + > + if (stat & MX25_ADCQ_SR_PD) { > + mx25_tcq_disable_touch_irq(priv); > + mx25_tcq_force_queue_start(priv); > + mx25_tcq_enable_fifo_irq(priv); > + } > + > + if (stat & MX25_ADCQ_SR_FDRY) { > + mx25_tcq_disable_fifo_irq(priv); > + ret = IRQ_WAKE_THREAD; > + } > + > + regmap_update_bits(priv->regs, MX25_ADCQ_SR, MX25_ADCQ_SR_FRR | > + MX25_ADCQ_SR_FUR | MX25_ADCQ_SR_FOR | MX25_ADCQ_SR_PD | > + MX25_ADCQ_SR_EOQ, > + MX25_ADCQ_SR_FRR | > + MX25_ADCQ_SR_FUR | MX25_ADCQ_SR_FOR | MX25_ADCQ_SR_PD | > + MX25_ADCQ_SR_EOQ); > + > + return ret; > +} > + > +/* configure the statemachine for a 4-wire touchscreen */ > +static int mx25_tcq_init(struct mx25_tcq_priv *priv) > +{ > + u32 tgcr; > + unsigned int ipg_div; > + unsigned int adc_period; > + unsigned int repeat_wait; > + unsigned int debounce_cnt; > + unsigned int settling_time; > + int itemct; > + int ret; > + > + regmap_read(priv->core_regs, MX25_TSC_TGCR, &tgcr); > + ipg_div = max_t(unsigned int, 4, MX25_TGCR_GET_ADCCLK(tgcr)); > + adc_period = clk_get_rate(priv->clk) / (ipg_div * 2 + 2); > + repeat_wait = fls(DIV_ROUND_UP(priv->repeat_wait, adc_period)); > + debounce_cnt = DIV_ROUND_UP(priv->pen_debounce, adc_period * 8) - 1; > + settling_time = DIV_ROUND_UP(priv->settling_time, adc_period); > + > + > + /* Reset */ > + regmap_write(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_QRST | > + MX25_ADCQ_CR_FRST); > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_QRST | > + MX25_ADCQ_CR_FRST, 0); > + > + /* up to 128 * 8 ADC clocks are possible */ > + if (debounce_cnt > 127) > + debounce_cnt = 127; > + > + if (repeat_wait > 15) > + repeat_wait = 15; > + > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_RWAIT_MASK, > + MX25_ADCQ_CR_RWAIT(repeat_wait)); > + > + ret = imx25_setup_queue_4wire(priv, 0x0, &itemct); > + if (ret) > + return ret; > + > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_LITEMID_MASK | > + MX25_ADCQ_CR_WMRK_MASK, > + MX25_ADCQ_CR_LITEMID(itemct - 1) | > + MX25_ADCQ_CR_WMRK(priv->expected_samples - 1)); > + > + /* setup debounce count */ > + regmap_update_bits(priv->core_regs, MX25_TSC_TGCR, > + MX25_TGCR_PDBTIME_MASK, > + MX25_TGCR_PDBTIME(debounce_cnt)); > + > + /* enable debounce */ > + regmap_update_bits(priv->core_regs, MX25_TSC_TGCR, MX25_TGCR_PDBEN, > + MX25_TGCR_PDBEN); > + regmap_update_bits(priv->core_regs, MX25_TSC_TGCR, MX25_TGCR_PDEN, > + MX25_TGCR_PDEN); > + > + /* enable the engine on demand */ > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_QSM_FQS, > + MX25_ADCQ_CR_QSM_FQS); > + > + mx25_tcq_re_enable_touch_detection(priv); > + > + return 0; > +} > + > +static int mx25_tcq_parse_dt(struct platform_device *pdev, > + struct mx25_tcq_priv *priv) > +{ > + struct device_node *np = pdev->dev.of_node; > + u32 wires; > + int ret; > + > + /* Setup defaults */ > + priv->pen_threshold = 500; > + priv->sample_count = 3; > + priv->repeat_wait = 15000000; > + priv->pen_debounce = 1000000; > + priv->settling_time = 250000; > + > + ret = of_property_read_u32(np, "fsl,wires", &wires); > + if (ret) { > + dev_err(&pdev->dev, "Failed to find fsl,wires properties\n"); > + return ret; > + } > + > + if (wires == 4) { > + priv->mode = MX25_TS_4WIRE; > + } else { > + dev_err(&pdev->dev, "%u-wire mode not supported\n", wires); > + return -EINVAL; > + } > + > + /* These are optional, we don't care about the return values */ > + of_property_read_u32(np, "fsl,pen-threshold", &priv->pen_threshold); > + of_property_read_u32(np, "fsl,settling-time", &priv->settling_time); > + of_property_read_u32(np, "fsl,pen-debounce", &priv->pen_debounce); > + > + return 0; > +} > + > +static int mx25_tcq_probe(struct platform_device *pdev) > +{ > + struct device *dev = &pdev->dev; > + struct input_dev *idev; > + struct mx25_tcq_priv *priv; > + struct resource *res; > + void __iomem *mem; > + int ret; > + int irq; > + > + priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); > + if (!priv) > + return -ENOMEM; > + > + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > + mem = devm_ioremap_resource(dev, res); > + if (!mem) { > + dev_err(dev, "Failed to get iomem"); > + return -ENOMEM; > + } > + > + ret = mx25_tcq_parse_dt(pdev, priv); > + if (ret) > + return ret; > + > + priv->regs = devm_regmap_init_mmio(dev, mem, &mx25_tcq_regconfig); > + if (IS_ERR(priv->regs)) { > + dev_err(dev, "Failed to initialize regmap\n"); > + return PTR_ERR(priv->regs); > + } > + > + irq = platform_get_irq(pdev, 0); > + if (irq < 0) { > + dev_err(dev, "Failed to get IRQ\n"); > + return irq; > + } > + > + ret = devm_request_threaded_irq(dev, irq, mx25_tcq_irq, > + mx25_tcq_irq_thread, IRQF_ONESHOT, pdev->name, priv); > + if (ret) { > + dev_err(dev, "Failed requesting IRQ\n"); > + return ret; > + } Are we sure the device is quiesce here? Otherwise interrupts will start coming but input device is not there yet. > + > + idev = devm_input_allocate_device(dev); > + if (!idev) { > + dev_err(dev, "Failed to allocate input device\n"); > + return -ENOMEM; > + } > + > + idev->name = mx25_tcq_name; > + idev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS); > + idev->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH); > + input_set_abs_params(idev, ABS_X, 0, 0xfff, 0, 0); > + input_set_abs_params(idev, ABS_Y, 0, 0xfff, 0, 0); > + > + idev->id.bustype = BUS_HOST; > + > + ret = input_register_device(idev); > + if (ret) { > + dev_err(dev, "Failed to register input device\n"); > + return ret; > + } > + > + priv->idev = idev; > + > + priv->core_regs = mx25_tsadc_get_regmap(pdev->dev.parent); > + priv->clk = mx25_tsadc_get_ipg(pdev->dev.parent); > + > + ret = clk_prepare_enable(priv->clk); > + if (ret) { > + dev_err(dev, "Failed to enable ipg clock\n"); > + return ret; > + } > + > + ret = mx25_tcq_init(priv); > + if (ret) { > + dev_err(dev, "Failed to init tcq\n"); > + goto error_tcq_init; > + } > + > + platform_set_drvdata(pdev, priv); > + > + return 0; > + > +error_tcq_init: > + clk_disable_unprepare(priv->clk); > + return ret; > +} > + > +static int mx25_tcq_remove(struct platform_device *pdev) > +{ > + struct mx25_tcq_priv *priv = platform_get_drvdata(pdev); > + > + clk_disable_unprepare(priv->clk); Hmm, if you disable clk all other operations will likely to fail. We really need devm clk interface, I guess I need to dust off my old patch... > + > + return 0; > +} > + > +static struct platform_driver mx25_tcq_driver = { > + .driver = { > + .name = "mx25-tcq", > + .owner = THIS_MODULE, > + .of_match_table = mx25_tcq_ids, > + }, > + .probe = mx25_tcq_probe, > + .remove = mx25_tcq_remove, > +}; > +module_platform_driver(mx25_tcq_driver); > + > +MODULE_DESCRIPTION("TS input driver for Freescale mx25"); > +MODULE_AUTHOR("Markus Pargmann <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>"); > +MODULE_LICENSE("GPL v2"); > -- > 1.8.5.3 > Thanks. -- Dmitry ^ permalink raw reply [flat|nested] 76+ messages in thread
* [PATCH 2/3] input: touchscreen: imx25 tcq driver @ 2014-02-23 6:44 ` Dmitry Torokhov 0 siblings, 0 replies; 76+ messages in thread From: Dmitry Torokhov @ 2014-02-23 6:44 UTC (permalink / raw) To: linux-arm-kernel Hi Marjus, On Thu, Feb 20, 2014 at 05:21:51PM +0100, Markus Pargmann wrote: > This is a driver for the imx25 ADC/TSC module. It controls the > touchscreen conversion queue and creates a touchscreen input device. > The driver currently only supports 4 wire touchscreens. The driver uses > a simple conversion queue of precharge, touch detection, X measurement, > Y measurement, precharge and another touch detection. > > This driver uses the regmap from the parent to setup some touch specific > settings in the core driver and setup a idle configuration with touch > detection. > > Signed-off-by: Markus Pargmann <mpa@pengutronix.de> > --- > .../bindings/input/touchscreen/fsl-mx25-tcq.txt | 29 + > drivers/input/touchscreen/Kconfig | 6 + > drivers/input/touchscreen/Makefile | 1 + > drivers/input/touchscreen/fsl-imx25-tcq.c | 589 +++++++++++++++++++++ > 4 files changed, 625 insertions(+) > create mode 100644 Documentation/devicetree/bindings/input/touchscreen/fsl-mx25-tcq.txt > create mode 100644 drivers/input/touchscreen/fsl-imx25-tcq.c > > diff --git a/Documentation/devicetree/bindings/input/touchscreen/fsl-mx25-tcq.txt b/Documentation/devicetree/bindings/input/touchscreen/fsl-mx25-tcq.txt > new file mode 100644 > index 0000000..4214a99 > --- /dev/null > +++ b/Documentation/devicetree/bindings/input/touchscreen/fsl-mx25-tcq.txt > @@ -0,0 +1,29 @@ > +Freescale mx25 TS conversion queue module > + > +mx25 touchscreen conversion queue module which controls the ADC unit of the > +mx25 for attached touchscreens. > + > +Required properties: > + - compatible: Should be "fsl,imx25-tcq". > + - reg: Memory range of the device. > + - interrupts: Should be the interrupt number associated with this module within > + the tscadc unit (<0>). > + - interrupt-parent: Should be a phandle to the tscadc unit. > + - fsl,wires: Should be '<4>' or '<5>' > + > +Optional properties: > + - fsl,pen-debounce: Pen debounce time. > + - fsl,pen-threshold: Pen-down threshold for the touchscreen. > + - fsl,settling-time: Settling time in nanoseconds. > + > +This device includes two conversion queues which can be added as subnodes. > +The first queue is for the touchscreen, the second for general purpose ADC. > + > +Example: > + tsc: tcq at 50030400 { > + compatible = "fsl,imx25-tcq"; > + reg = <0x50030400 0x60>; > + interrupt-parent = <&tscadc>; > + interrupts = <0>; > + fsl,wires = <4>; > + }; > diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig > index 07e9e82..d52c055 100644 > --- a/drivers/input/touchscreen/Kconfig > +++ b/drivers/input/touchscreen/Kconfig > @@ -715,6 +715,12 @@ config TOUCHSCREEN_USB_COMPOSITE > To compile this driver as a module, choose M here: the > module will be called usbtouchscreen. > > +config TOUCHSCREEN_MX25 > + tristate "Freescale i.MX25 touchscreen input driver" > + depends on MFD_MX25_TSADC > + help > + Enable support for touchscreen connected to your i.MX25. > + > config TOUCHSCREEN_MC13783 > tristate "Freescale MC13783 touchscreen input driver" > depends on MFD_MC13XXX > diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile > index 62801f2..c891f30 100644 > --- a/drivers/input/touchscreen/Makefile > +++ b/drivers/input/touchscreen/Makefile > @@ -38,6 +38,7 @@ obj-$(CONFIG_TOUCHSCREEN_INEXIO) += inexio.o > obj-$(CONFIG_TOUCHSCREEN_INTEL_MID) += intel-mid-touch.o > obj-$(CONFIG_TOUCHSCREEN_LPC32XX) += lpc32xx_ts.o > obj-$(CONFIG_TOUCHSCREEN_MAX11801) += max11801_ts.o > +obj-$(CONFIG_TOUCHSCREEN_MX25) += fsl-imx25-tcq.o > obj-$(CONFIG_TOUCHSCREEN_MC13783) += mc13783_ts.o > obj-$(CONFIG_TOUCHSCREEN_MCS5000) += mcs5000_ts.o > obj-$(CONFIG_TOUCHSCREEN_MIGOR) += migor_ts.o > diff --git a/drivers/input/touchscreen/fsl-imx25-tcq.c b/drivers/input/touchscreen/fsl-imx25-tcq.c > new file mode 100644 > index 0000000..436cc8b > --- /dev/null > +++ b/drivers/input/touchscreen/fsl-imx25-tcq.c > @@ -0,0 +1,589 @@ > +/* > + * Copyright 2014 Markus Pargmann, Pengutronix <mpa@pengutronix.de> > + * Based on driver from 2011 Juergen Beisert, Pengutronix <kernel@pengutronix.de> > + * > + * The code contained herein is licensed under the GNU General Public > + * License. You may obtain a copy of the GNU General Public License > + * Version 2 or later at the following locations: > + * > + * http://www.opensource.org/licenses/gpl-license.html > + * http://www.gnu.org/copyleft/gpl.html > + * > + * This is the driver for the imx25 TCQ (Touchscreen Conversion Queue) > + * connected to the imx25 ADC. > + */ > + > +#include <linux/clk.h> > +#include <linux/interrupt.h> > +#include <linux/input.h> > +#include <linux/mfd/imx25-tsadc.h> > +#include <linux/module.h> > +#include <linux/of.h> > +#include <linux/platform_device.h> > +#include <linux/regmap.h> > + > +static const char mx25_tcq_name[] = "mx25-tcq"; > + > +enum mx25_tcq_mode { > + MX25_TS_4WIRE, > +}; > + > +struct mx25_tcq_priv { > + struct regmap *regs; > + struct regmap *core_regs; > + struct input_dev *idev; > + enum mx25_tcq_mode mode; > + unsigned int pen_threshold; > + unsigned int sample_count; > + unsigned int expected_samples; > + unsigned int repeat_wait; > + unsigned int pen_debounce; > + unsigned int settling_time; > + struct clk *clk; > +}; > + > +static struct regmap_config mx25_tcq_regconfig = { > + .fast_io = true, > + .max_register = 0x5c, > + .reg_bits = 32, > + .val_bits = 32, > + .reg_stride = 4, > +}; > + > +static struct of_device_id mx25_tcq_ids[] = { > + { .compatible = "fsl,imx25-tcq", }, > + { /* Senitel */ } > +}; > + > +#define TSC_4WIRE_PRE_INDEX 0 > +#define TSC_4WIRE_X_INDEX 1 > +#define TSC_4WIRE_Y_INDEX 2 > +#define TSC_4WIRE_POST_INDEX 3 > +#define TSC_4WIRE_LEAVE 4 > + > +#define MX25_TSC_DEF_THRESHOLD 80 > +#define TSC_MAX_SAMPLES 16 > + > + > +enum mx25_adc_configurations { > + MX25_CFG_PRECHARGE = 0, > + MX25_CFG_TOUCH_DETECT, > + MX25_CFG_X_MEASUREMENT, > + MX25_CFG_Y_MEASUREMENT, > +}; > + > +#define MX25_PRECHARGE_VALUE (\ > + MX25_ADCQ_CFG_YPLL_OFF | \ > + MX25_ADCQ_CFG_XNUR_OFF | \ > + MX25_ADCQ_CFG_XPUL_HIGH | \ > + MX25_ADCQ_CFG_REFP_INT | \ > + MX25_ADCQ_CFG_IN_XP | \ > + MX25_ADCQ_CFG_REFN_NGND2 | \ > + MX25_ADCQ_CFG_IGS) > + > +#define MX25_TOUCH_DETECT_VALUE (\ > + MX25_ADCQ_CFG_YNLR | \ > + MX25_ADCQ_CFG_YPLL_OFF | \ > + MX25_ADCQ_CFG_XNUR_OFF | \ > + MX25_ADCQ_CFG_XPUL_OFF | \ > + MX25_ADCQ_CFG_REFP_INT | \ > + MX25_ADCQ_CFG_IN_XP | \ > + MX25_ADCQ_CFG_REFN_NGND2 | \ > + MX25_ADCQ_CFG_PENIACK) > + > +static void imx25_setup_queue_cfgs(struct mx25_tcq_priv *priv, > + unsigned int settling_time) > +{ > + u32 precharge_cfg = > + MX25_PRECHARGE_VALUE | > + MX25_ADCQ_CFG_SETTLING_TIME(settling_time); > + u32 touch_detect_cfg = > + MX25_TOUCH_DETECT_VALUE | > + MX25_ADCQ_CFG_NOS(1) | > + MX25_ADCQ_CFG_SETTLING_TIME(settling_time); > + > + regmap_write(priv->core_regs, MX25_TSC_TICR, precharge_cfg); > + > + /* PRECHARGE */ > + regmap_write(priv->regs, MX25_ADCQ_CFG(MX25_CFG_PRECHARGE), > + precharge_cfg); > + > + /* TOUCH_DETECT */ > + regmap_write(priv->regs, MX25_ADCQ_CFG(MX25_CFG_TOUCH_DETECT), > + touch_detect_cfg); > + > + /* X Measurement */ > + regmap_write(priv->regs, MX25_ADCQ_CFG(MX25_CFG_X_MEASUREMENT), > + MX25_ADCQ_CFG_YPLL_OFF | > + MX25_ADCQ_CFG_XNUR_LOW | > + MX25_ADCQ_CFG_XPUL_HIGH | > + MX25_ADCQ_CFG_REFP_XP | > + MX25_ADCQ_CFG_IN_YP | > + MX25_ADCQ_CFG_REFN_XN | > + MX25_ADCQ_CFG_NOS(priv->sample_count) | > + MX25_ADCQ_CFG_SETTLING_TIME(settling_time)); > + > + /* Y Measurement */ > + regmap_write(priv->regs, MX25_ADCQ_CFG(MX25_CFG_Y_MEASUREMENT), > + MX25_ADCQ_CFG_YNLR | > + MX25_ADCQ_CFG_YPLL_HIGH | > + MX25_ADCQ_CFG_XNUR_OFF | > + MX25_ADCQ_CFG_XPUL_OFF | > + MX25_ADCQ_CFG_REFP_YP | > + MX25_ADCQ_CFG_IN_XP | > + MX25_ADCQ_CFG_REFN_YN | > + MX25_ADCQ_CFG_NOS(priv->sample_count) | > + MX25_ADCQ_CFG_SETTLING_TIME(settling_time)); > + > + /* Enable the touch detection right now */ > + regmap_write(priv->core_regs, MX25_TSC_TICR, touch_detect_cfg | > + MX25_ADCQ_CFG_IGS); > +} > + > +static int imx25_setup_queue_4wire(struct mx25_tcq_priv *priv, > + unsigned settling_time, int *items) > +{ > + imx25_setup_queue_cfgs(priv, settling_time); > + > + /* Setup the conversion queue */ > + regmap_write(priv->regs, MX25_ADCQ_ITEM_7_0, > + MX25_ADCQ_ITEM(0, MX25_CFG_PRECHARGE) | > + MX25_ADCQ_ITEM(1, MX25_CFG_TOUCH_DETECT) | > + MX25_ADCQ_ITEM(2, MX25_CFG_X_MEASUREMENT) | > + MX25_ADCQ_ITEM(3, MX25_CFG_Y_MEASUREMENT) | > + MX25_ADCQ_ITEM(4, MX25_CFG_PRECHARGE) | > + MX25_ADCQ_ITEM(5, MX25_CFG_TOUCH_DETECT)); > + > + /* We measure X/Y with 'sample_count' number of samples and execute a > + * touch detection twice, with 1 sample each */ > + priv->expected_samples = priv->sample_count * 2 + 2; > + *items = 6; > + > + return 0; > +} > + > +static void mx25_tcq_disable_touch_irq(struct mx25_tcq_priv *priv) > +{ > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_PDMSK, > + MX25_ADCQ_CR_PDMSK); > +} > + > +static void mx25_tcq_enable_touch_irq(struct mx25_tcq_priv *priv) > +{ > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_PDMSK, 0); > +} > + > +static void mx25_tcq_disable_fifo_irq(struct mx25_tcq_priv *priv) > +{ > + regmap_update_bits(priv->regs, MX25_ADCQ_MR, MX25_ADCQ_MR_FDRY_IRQ, > + MX25_ADCQ_MR_FDRY_IRQ); > +} > + > +static void mx25_tcq_enable_fifo_irq(struct mx25_tcq_priv *priv) > +{ > + regmap_update_bits(priv->regs, MX25_ADCQ_MR, MX25_ADCQ_MR_FDRY_IRQ, 0); > +} > + > +static void mx25_tcq_force_queue_start(struct mx25_tcq_priv *priv) > +{ > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FQS, > + MX25_ADCQ_CR_FQS); > + > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FQS, 0); > +} > + > +static void mx25_tcq_force_queue_stop(struct mx25_tcq_priv *priv) > +{ > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FQS, 0); > +} > + > +static void mx25_tcq_fifo_reset(struct mx25_tcq_priv *priv) > +{ > + u32 tcqcr; > + > + regmap_read(priv->regs, MX25_ADCQ_CR, &tcqcr); > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FRST, > + MX25_ADCQ_CR_FRST); > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FRST, > + 0); > + regmap_write(priv->regs, MX25_ADCQ_CR, tcqcr); > +} > + > +static void mx25_tcq_re_enable_touch_detection(struct mx25_tcq_priv *priv) > +{ > + /* stop the queue from looping */ > + mx25_tcq_force_queue_stop(priv); > + > + /* for a clean touch detection, preload the X plane */ > + regmap_write(priv->core_regs, MX25_TSC_TICR, MX25_PRECHARGE_VALUE); > + > + /* waste some time now to pre-load the X plate to high voltage */ > + mx25_tcq_fifo_reset(priv); > + > + /* re-enable the detection right now */ > + regmap_write(priv->core_regs, MX25_TSC_TICR, MX25_TOUCH_DETECT_VALUE | > + MX25_ADCQ_CFG_IGS); > + > + regmap_update_bits(priv->regs, MX25_ADCQ_SR, MX25_ADCQ_SR_PD, > + MX25_ADCQ_SR_PD); > + > + /* enable the pen down event to be a source for the interrupt */ > + regmap_update_bits(priv->regs, MX25_ADCQ_MR, MX25_ADCQ_MR_PD_IRQ, 0); > + > + /* lets fire the next IRQ if someone touches the touchscreen */ > + mx25_tcq_enable_touch_irq(priv); > +} > + > +static int mx25_tcq_create_event_for_4wire(struct mx25_tcq_priv *priv, > + u32 *sample_buf, int samples) > +{ > + unsigned int x_pos = 0; > + unsigned int y_pos = 0; > + unsigned int touch_pre = 0; > + unsigned int touch_post = 0; > + unsigned i; > + int ret = 0; > + > + for (i = 0; i < samples; i++) { > + unsigned int index = MX25_ADCQ_FIFO_ID(sample_buf[i]); > + unsigned int val = MX25_ADCQ_FIFO_DATA(sample_buf[i]); > + > + switch (index) { > + case 1: > + touch_pre = val; > + break; > + case 2: > + x_pos = val; > + break; > + case 3: > + y_pos = val; > + break; > + case 5: > + touch_post = val; > + break; > + default: > + ret = -EINVAL; > + break; > + } > + } > + > + if (ret == 0 && samples != 0) { > + /* > + * only if both touch measures are below a treshold, > + * the position is valid > + */ > + if (touch_pre < priv->pen_threshold && > + touch_post < priv->pen_threshold) { > + /* valid samples, generate a report */ > + x_pos /= priv->sample_count; > + y_pos /= priv->sample_count; > + input_report_abs(priv->idev, ABS_X, x_pos); > + input_report_abs(priv->idev, ABS_Y, y_pos); > + input_report_key(priv->idev, BTN_TOUCH, > + 0xfff - ((touch_pre + touch_post) / 2)); Hmm, are you trying to report pressure here? > + input_sync(priv->idev); > + > + /* get next sample */ > + mx25_tcq_force_queue_start(priv); > + mx25_tcq_enable_fifo_irq(priv); > + } else { > + if (touch_pre >= priv->pen_threshold && You can convert this to "else if" and save indentation level here. > + touch_post >= priv->pen_threshold) { > + /* > + * if both samples are invalid, > + * generate a release report > + */ > + input_report_key(priv->idev, BTN_TOUCH, 0); > + input_sync(priv->idev); > + mx25_tcq_re_enable_touch_detection(priv); > + } else { > + /* > + * if only one of both touch measurements are > + * below the threshold, still some bouncing > + * happens. Take additional samples in this > + * case to be sure > + */ > + mx25_tcq_force_queue_start(priv); > + mx25_tcq_enable_fifo_irq(priv); > + } > + } > + } > + > + return ret; > +} > + > +static irqreturn_t mx25_tcq_irq_thread(int irq, void *dev_id) > +{ > + struct mx25_tcq_priv *priv = (struct mx25_tcq_priv *) dev_id; > + u32 sample_buf[TSC_MAX_SAMPLES]; > + int samples = 0; > + > + /* read all samples */ > + while (1) { > + u32 stats; > + > + regmap_read(priv->regs, MX25_ADCQ_SR, &stats); Error handling for I/O operations? > + if (stats & MX25_ADCQ_SR_EMPT) > + break; > + > + if (samples < TSC_MAX_SAMPLES) { > + regmap_read(priv->regs, MX25_ADCQ_FIFO, > + &sample_buf[samples]); > + ++samples; > + } else { > + u32 discarded; > + /* discard samples */ > + regmap_read(priv->regs, MX25_ADCQ_FIFO, &discarded); Should there be some upper bound for number of discarded samples? > + } > + } > + > + mx25_tcq_create_event_for_4wire(priv, sample_buf, samples); > + > + return IRQ_HANDLED; > +} > + > +static irqreturn_t mx25_tcq_irq(int irq, void *dev_id) > +{ > + struct mx25_tcq_priv *priv = (struct mx25_tcq_priv *)dev_id; > + u32 stat; > + int ret = IRQ_HANDLED; > + > + regmap_read(priv->regs, MX25_ADCQ_SR, &stat); > + > + if (stat & (MX25_ADCQ_SR_FRR | MX25_ADCQ_SR_FUR | MX25_ADCQ_SR_FOR)) > + mx25_tcq_fifo_reset(priv); > + > + if (stat & MX25_ADCQ_SR_PD) { > + mx25_tcq_disable_touch_irq(priv); > + mx25_tcq_force_queue_start(priv); > + mx25_tcq_enable_fifo_irq(priv); > + } > + > + if (stat & MX25_ADCQ_SR_FDRY) { > + mx25_tcq_disable_fifo_irq(priv); > + ret = IRQ_WAKE_THREAD; > + } > + > + regmap_update_bits(priv->regs, MX25_ADCQ_SR, MX25_ADCQ_SR_FRR | > + MX25_ADCQ_SR_FUR | MX25_ADCQ_SR_FOR | MX25_ADCQ_SR_PD | > + MX25_ADCQ_SR_EOQ, > + MX25_ADCQ_SR_FRR | > + MX25_ADCQ_SR_FUR | MX25_ADCQ_SR_FOR | MX25_ADCQ_SR_PD | > + MX25_ADCQ_SR_EOQ); > + > + return ret; > +} > + > +/* configure the statemachine for a 4-wire touchscreen */ > +static int mx25_tcq_init(struct mx25_tcq_priv *priv) > +{ > + u32 tgcr; > + unsigned int ipg_div; > + unsigned int adc_period; > + unsigned int repeat_wait; > + unsigned int debounce_cnt; > + unsigned int settling_time; > + int itemct; > + int ret; > + > + regmap_read(priv->core_regs, MX25_TSC_TGCR, &tgcr); > + ipg_div = max_t(unsigned int, 4, MX25_TGCR_GET_ADCCLK(tgcr)); > + adc_period = clk_get_rate(priv->clk) / (ipg_div * 2 + 2); > + repeat_wait = fls(DIV_ROUND_UP(priv->repeat_wait, adc_period)); > + debounce_cnt = DIV_ROUND_UP(priv->pen_debounce, adc_period * 8) - 1; > + settling_time = DIV_ROUND_UP(priv->settling_time, adc_period); > + > + > + /* Reset */ > + regmap_write(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_QRST | > + MX25_ADCQ_CR_FRST); > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_QRST | > + MX25_ADCQ_CR_FRST, 0); > + > + /* up to 128 * 8 ADC clocks are possible */ > + if (debounce_cnt > 127) > + debounce_cnt = 127; > + > + if (repeat_wait > 15) > + repeat_wait = 15; > + > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_RWAIT_MASK, > + MX25_ADCQ_CR_RWAIT(repeat_wait)); > + > + ret = imx25_setup_queue_4wire(priv, 0x0, &itemct); > + if (ret) > + return ret; > + > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_LITEMID_MASK | > + MX25_ADCQ_CR_WMRK_MASK, > + MX25_ADCQ_CR_LITEMID(itemct - 1) | > + MX25_ADCQ_CR_WMRK(priv->expected_samples - 1)); > + > + /* setup debounce count */ > + regmap_update_bits(priv->core_regs, MX25_TSC_TGCR, > + MX25_TGCR_PDBTIME_MASK, > + MX25_TGCR_PDBTIME(debounce_cnt)); > + > + /* enable debounce */ > + regmap_update_bits(priv->core_regs, MX25_TSC_TGCR, MX25_TGCR_PDBEN, > + MX25_TGCR_PDBEN); > + regmap_update_bits(priv->core_regs, MX25_TSC_TGCR, MX25_TGCR_PDEN, > + MX25_TGCR_PDEN); > + > + /* enable the engine on demand */ > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_QSM_FQS, > + MX25_ADCQ_CR_QSM_FQS); > + > + mx25_tcq_re_enable_touch_detection(priv); > + > + return 0; > +} > + > +static int mx25_tcq_parse_dt(struct platform_device *pdev, > + struct mx25_tcq_priv *priv) > +{ > + struct device_node *np = pdev->dev.of_node; > + u32 wires; > + int ret; > + > + /* Setup defaults */ > + priv->pen_threshold = 500; > + priv->sample_count = 3; > + priv->repeat_wait = 15000000; > + priv->pen_debounce = 1000000; > + priv->settling_time = 250000; > + > + ret = of_property_read_u32(np, "fsl,wires", &wires); > + if (ret) { > + dev_err(&pdev->dev, "Failed to find fsl,wires properties\n"); > + return ret; > + } > + > + if (wires == 4) { > + priv->mode = MX25_TS_4WIRE; > + } else { > + dev_err(&pdev->dev, "%u-wire mode not supported\n", wires); > + return -EINVAL; > + } > + > + /* These are optional, we don't care about the return values */ > + of_property_read_u32(np, "fsl,pen-threshold", &priv->pen_threshold); > + of_property_read_u32(np, "fsl,settling-time", &priv->settling_time); > + of_property_read_u32(np, "fsl,pen-debounce", &priv->pen_debounce); > + > + return 0; > +} > + > +static int mx25_tcq_probe(struct platform_device *pdev) > +{ > + struct device *dev = &pdev->dev; > + struct input_dev *idev; > + struct mx25_tcq_priv *priv; > + struct resource *res; > + void __iomem *mem; > + int ret; > + int irq; > + > + priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); > + if (!priv) > + return -ENOMEM; > + > + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > + mem = devm_ioremap_resource(dev, res); > + if (!mem) { > + dev_err(dev, "Failed to get iomem"); > + return -ENOMEM; > + } > + > + ret = mx25_tcq_parse_dt(pdev, priv); > + if (ret) > + return ret; > + > + priv->regs = devm_regmap_init_mmio(dev, mem, &mx25_tcq_regconfig); > + if (IS_ERR(priv->regs)) { > + dev_err(dev, "Failed to initialize regmap\n"); > + return PTR_ERR(priv->regs); > + } > + > + irq = platform_get_irq(pdev, 0); > + if (irq < 0) { > + dev_err(dev, "Failed to get IRQ\n"); > + return irq; > + } > + > + ret = devm_request_threaded_irq(dev, irq, mx25_tcq_irq, > + mx25_tcq_irq_thread, IRQF_ONESHOT, pdev->name, priv); > + if (ret) { > + dev_err(dev, "Failed requesting IRQ\n"); > + return ret; > + } Are we sure the device is quiesce here? Otherwise interrupts will start coming but input device is not there yet. > + > + idev = devm_input_allocate_device(dev); > + if (!idev) { > + dev_err(dev, "Failed to allocate input device\n"); > + return -ENOMEM; > + } > + > + idev->name = mx25_tcq_name; > + idev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS); > + idev->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH); > + input_set_abs_params(idev, ABS_X, 0, 0xfff, 0, 0); > + input_set_abs_params(idev, ABS_Y, 0, 0xfff, 0, 0); > + > + idev->id.bustype = BUS_HOST; > + > + ret = input_register_device(idev); > + if (ret) { > + dev_err(dev, "Failed to register input device\n"); > + return ret; > + } > + > + priv->idev = idev; > + > + priv->core_regs = mx25_tsadc_get_regmap(pdev->dev.parent); > + priv->clk = mx25_tsadc_get_ipg(pdev->dev.parent); > + > + ret = clk_prepare_enable(priv->clk); > + if (ret) { > + dev_err(dev, "Failed to enable ipg clock\n"); > + return ret; > + } > + > + ret = mx25_tcq_init(priv); > + if (ret) { > + dev_err(dev, "Failed to init tcq\n"); > + goto error_tcq_init; > + } > + > + platform_set_drvdata(pdev, priv); > + > + return 0; > + > +error_tcq_init: > + clk_disable_unprepare(priv->clk); > + return ret; > +} > + > +static int mx25_tcq_remove(struct platform_device *pdev) > +{ > + struct mx25_tcq_priv *priv = platform_get_drvdata(pdev); > + > + clk_disable_unprepare(priv->clk); Hmm, if you disable clk all other operations will likely to fail. We really need devm clk interface, I guess I need to dust off my old patch... > + > + return 0; > +} > + > +static struct platform_driver mx25_tcq_driver = { > + .driver = { > + .name = "mx25-tcq", > + .owner = THIS_MODULE, > + .of_match_table = mx25_tcq_ids, > + }, > + .probe = mx25_tcq_probe, > + .remove = mx25_tcq_remove, > +}; > +module_platform_driver(mx25_tcq_driver); > + > +MODULE_DESCRIPTION("TS input driver for Freescale mx25"); > +MODULE_AUTHOR("Markus Pargmann <mpa@pengutronix.de>"); > +MODULE_LICENSE("GPL v2"); > -- > 1.8.5.3 > Thanks. -- Dmitry ^ permalink raw reply [flat|nested] 76+ messages in thread
* Re: [PATCH 2/3] input: touchscreen: imx25 tcq driver @ 2014-02-23 6:44 ` Dmitry Torokhov 0 siblings, 0 replies; 76+ messages in thread From: Dmitry Torokhov @ 2014-02-23 6:44 UTC (permalink / raw) To: Markus Pargmann Cc: devicetree, linux-input, linux-iio, Samuel Ortiz, Lee Jones, Jonathan Cameron, linux-arm-kernel, kernel Hi Marjus, On Thu, Feb 20, 2014 at 05:21:51PM +0100, Markus Pargmann wrote: > This is a driver for the imx25 ADC/TSC module. It controls the > touchscreen conversion queue and creates a touchscreen input device. > The driver currently only supports 4 wire touchscreens. The driver uses > a simple conversion queue of precharge, touch detection, X measurement, > Y measurement, precharge and another touch detection. > > This driver uses the regmap from the parent to setup some touch specific > settings in the core driver and setup a idle configuration with touch > detection. > > Signed-off-by: Markus Pargmann <mpa@pengutronix.de> > --- > .../bindings/input/touchscreen/fsl-mx25-tcq.txt | 29 + > drivers/input/touchscreen/Kconfig | 6 + > drivers/input/touchscreen/Makefile | 1 + > drivers/input/touchscreen/fsl-imx25-tcq.c | 589 +++++++++++++++++++++ > 4 files changed, 625 insertions(+) > create mode 100644 Documentation/devicetree/bindings/input/touchscreen/fsl-mx25-tcq.txt > create mode 100644 drivers/input/touchscreen/fsl-imx25-tcq.c > > diff --git a/Documentation/devicetree/bindings/input/touchscreen/fsl-mx25-tcq.txt b/Documentation/devicetree/bindings/input/touchscreen/fsl-mx25-tcq.txt > new file mode 100644 > index 0000000..4214a99 > --- /dev/null > +++ b/Documentation/devicetree/bindings/input/touchscreen/fsl-mx25-tcq.txt > @@ -0,0 +1,29 @@ > +Freescale mx25 TS conversion queue module > + > +mx25 touchscreen conversion queue module which controls the ADC unit of the > +mx25 for attached touchscreens. > + > +Required properties: > + - compatible: Should be "fsl,imx25-tcq". > + - reg: Memory range of the device. > + - interrupts: Should be the interrupt number associated with this module within > + the tscadc unit (<0>). > + - interrupt-parent: Should be a phandle to the tscadc unit. > + - fsl,wires: Should be '<4>' or '<5>' > + > +Optional properties: > + - fsl,pen-debounce: Pen debounce time. > + - fsl,pen-threshold: Pen-down threshold for the touchscreen. > + - fsl,settling-time: Settling time in nanoseconds. > + > +This device includes two conversion queues which can be added as subnodes. > +The first queue is for the touchscreen, the second for general purpose ADC. > + > +Example: > + tsc: tcq@50030400 { > + compatible = "fsl,imx25-tcq"; > + reg = <0x50030400 0x60>; > + interrupt-parent = <&tscadc>; > + interrupts = <0>; > + fsl,wires = <4>; > + }; > diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig > index 07e9e82..d52c055 100644 > --- a/drivers/input/touchscreen/Kconfig > +++ b/drivers/input/touchscreen/Kconfig > @@ -715,6 +715,12 @@ config TOUCHSCREEN_USB_COMPOSITE > To compile this driver as a module, choose M here: the > module will be called usbtouchscreen. > > +config TOUCHSCREEN_MX25 > + tristate "Freescale i.MX25 touchscreen input driver" > + depends on MFD_MX25_TSADC > + help > + Enable support for touchscreen connected to your i.MX25. > + > config TOUCHSCREEN_MC13783 > tristate "Freescale MC13783 touchscreen input driver" > depends on MFD_MC13XXX > diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile > index 62801f2..c891f30 100644 > --- a/drivers/input/touchscreen/Makefile > +++ b/drivers/input/touchscreen/Makefile > @@ -38,6 +38,7 @@ obj-$(CONFIG_TOUCHSCREEN_INEXIO) += inexio.o > obj-$(CONFIG_TOUCHSCREEN_INTEL_MID) += intel-mid-touch.o > obj-$(CONFIG_TOUCHSCREEN_LPC32XX) += lpc32xx_ts.o > obj-$(CONFIG_TOUCHSCREEN_MAX11801) += max11801_ts.o > +obj-$(CONFIG_TOUCHSCREEN_MX25) += fsl-imx25-tcq.o > obj-$(CONFIG_TOUCHSCREEN_MC13783) += mc13783_ts.o > obj-$(CONFIG_TOUCHSCREEN_MCS5000) += mcs5000_ts.o > obj-$(CONFIG_TOUCHSCREEN_MIGOR) += migor_ts.o > diff --git a/drivers/input/touchscreen/fsl-imx25-tcq.c b/drivers/input/touchscreen/fsl-imx25-tcq.c > new file mode 100644 > index 0000000..436cc8b > --- /dev/null > +++ b/drivers/input/touchscreen/fsl-imx25-tcq.c > @@ -0,0 +1,589 @@ > +/* > + * Copyright 2014 Markus Pargmann, Pengutronix <mpa@pengutronix.de> > + * Based on driver from 2011 Juergen Beisert, Pengutronix <kernel@pengutronix.de> > + * > + * The code contained herein is licensed under the GNU General Public > + * License. You may obtain a copy of the GNU General Public License > + * Version 2 or later at the following locations: > + * > + * http://www.opensource.org/licenses/gpl-license.html > + * http://www.gnu.org/copyleft/gpl.html > + * > + * This is the driver for the imx25 TCQ (Touchscreen Conversion Queue) > + * connected to the imx25 ADC. > + */ > + > +#include <linux/clk.h> > +#include <linux/interrupt.h> > +#include <linux/input.h> > +#include <linux/mfd/imx25-tsadc.h> > +#include <linux/module.h> > +#include <linux/of.h> > +#include <linux/platform_device.h> > +#include <linux/regmap.h> > + > +static const char mx25_tcq_name[] = "mx25-tcq"; > + > +enum mx25_tcq_mode { > + MX25_TS_4WIRE, > +}; > + > +struct mx25_tcq_priv { > + struct regmap *regs; > + struct regmap *core_regs; > + struct input_dev *idev; > + enum mx25_tcq_mode mode; > + unsigned int pen_threshold; > + unsigned int sample_count; > + unsigned int expected_samples; > + unsigned int repeat_wait; > + unsigned int pen_debounce; > + unsigned int settling_time; > + struct clk *clk; > +}; > + > +static struct regmap_config mx25_tcq_regconfig = { > + .fast_io = true, > + .max_register = 0x5c, > + .reg_bits = 32, > + .val_bits = 32, > + .reg_stride = 4, > +}; > + > +static struct of_device_id mx25_tcq_ids[] = { > + { .compatible = "fsl,imx25-tcq", }, > + { /* Senitel */ } > +}; > + > +#define TSC_4WIRE_PRE_INDEX 0 > +#define TSC_4WIRE_X_INDEX 1 > +#define TSC_4WIRE_Y_INDEX 2 > +#define TSC_4WIRE_POST_INDEX 3 > +#define TSC_4WIRE_LEAVE 4 > + > +#define MX25_TSC_DEF_THRESHOLD 80 > +#define TSC_MAX_SAMPLES 16 > + > + > +enum mx25_adc_configurations { > + MX25_CFG_PRECHARGE = 0, > + MX25_CFG_TOUCH_DETECT, > + MX25_CFG_X_MEASUREMENT, > + MX25_CFG_Y_MEASUREMENT, > +}; > + > +#define MX25_PRECHARGE_VALUE (\ > + MX25_ADCQ_CFG_YPLL_OFF | \ > + MX25_ADCQ_CFG_XNUR_OFF | \ > + MX25_ADCQ_CFG_XPUL_HIGH | \ > + MX25_ADCQ_CFG_REFP_INT | \ > + MX25_ADCQ_CFG_IN_XP | \ > + MX25_ADCQ_CFG_REFN_NGND2 | \ > + MX25_ADCQ_CFG_IGS) > + > +#define MX25_TOUCH_DETECT_VALUE (\ > + MX25_ADCQ_CFG_YNLR | \ > + MX25_ADCQ_CFG_YPLL_OFF | \ > + MX25_ADCQ_CFG_XNUR_OFF | \ > + MX25_ADCQ_CFG_XPUL_OFF | \ > + MX25_ADCQ_CFG_REFP_INT | \ > + MX25_ADCQ_CFG_IN_XP | \ > + MX25_ADCQ_CFG_REFN_NGND2 | \ > + MX25_ADCQ_CFG_PENIACK) > + > +static void imx25_setup_queue_cfgs(struct mx25_tcq_priv *priv, > + unsigned int settling_time) > +{ > + u32 precharge_cfg = > + MX25_PRECHARGE_VALUE | > + MX25_ADCQ_CFG_SETTLING_TIME(settling_time); > + u32 touch_detect_cfg = > + MX25_TOUCH_DETECT_VALUE | > + MX25_ADCQ_CFG_NOS(1) | > + MX25_ADCQ_CFG_SETTLING_TIME(settling_time); > + > + regmap_write(priv->core_regs, MX25_TSC_TICR, precharge_cfg); > + > + /* PRECHARGE */ > + regmap_write(priv->regs, MX25_ADCQ_CFG(MX25_CFG_PRECHARGE), > + precharge_cfg); > + > + /* TOUCH_DETECT */ > + regmap_write(priv->regs, MX25_ADCQ_CFG(MX25_CFG_TOUCH_DETECT), > + touch_detect_cfg); > + > + /* X Measurement */ > + regmap_write(priv->regs, MX25_ADCQ_CFG(MX25_CFG_X_MEASUREMENT), > + MX25_ADCQ_CFG_YPLL_OFF | > + MX25_ADCQ_CFG_XNUR_LOW | > + MX25_ADCQ_CFG_XPUL_HIGH | > + MX25_ADCQ_CFG_REFP_XP | > + MX25_ADCQ_CFG_IN_YP | > + MX25_ADCQ_CFG_REFN_XN | > + MX25_ADCQ_CFG_NOS(priv->sample_count) | > + MX25_ADCQ_CFG_SETTLING_TIME(settling_time)); > + > + /* Y Measurement */ > + regmap_write(priv->regs, MX25_ADCQ_CFG(MX25_CFG_Y_MEASUREMENT), > + MX25_ADCQ_CFG_YNLR | > + MX25_ADCQ_CFG_YPLL_HIGH | > + MX25_ADCQ_CFG_XNUR_OFF | > + MX25_ADCQ_CFG_XPUL_OFF | > + MX25_ADCQ_CFG_REFP_YP | > + MX25_ADCQ_CFG_IN_XP | > + MX25_ADCQ_CFG_REFN_YN | > + MX25_ADCQ_CFG_NOS(priv->sample_count) | > + MX25_ADCQ_CFG_SETTLING_TIME(settling_time)); > + > + /* Enable the touch detection right now */ > + regmap_write(priv->core_regs, MX25_TSC_TICR, touch_detect_cfg | > + MX25_ADCQ_CFG_IGS); > +} > + > +static int imx25_setup_queue_4wire(struct mx25_tcq_priv *priv, > + unsigned settling_time, int *items) > +{ > + imx25_setup_queue_cfgs(priv, settling_time); > + > + /* Setup the conversion queue */ > + regmap_write(priv->regs, MX25_ADCQ_ITEM_7_0, > + MX25_ADCQ_ITEM(0, MX25_CFG_PRECHARGE) | > + MX25_ADCQ_ITEM(1, MX25_CFG_TOUCH_DETECT) | > + MX25_ADCQ_ITEM(2, MX25_CFG_X_MEASUREMENT) | > + MX25_ADCQ_ITEM(3, MX25_CFG_Y_MEASUREMENT) | > + MX25_ADCQ_ITEM(4, MX25_CFG_PRECHARGE) | > + MX25_ADCQ_ITEM(5, MX25_CFG_TOUCH_DETECT)); > + > + /* We measure X/Y with 'sample_count' number of samples and execute a > + * touch detection twice, with 1 sample each */ > + priv->expected_samples = priv->sample_count * 2 + 2; > + *items = 6; > + > + return 0; > +} > + > +static void mx25_tcq_disable_touch_irq(struct mx25_tcq_priv *priv) > +{ > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_PDMSK, > + MX25_ADCQ_CR_PDMSK); > +} > + > +static void mx25_tcq_enable_touch_irq(struct mx25_tcq_priv *priv) > +{ > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_PDMSK, 0); > +} > + > +static void mx25_tcq_disable_fifo_irq(struct mx25_tcq_priv *priv) > +{ > + regmap_update_bits(priv->regs, MX25_ADCQ_MR, MX25_ADCQ_MR_FDRY_IRQ, > + MX25_ADCQ_MR_FDRY_IRQ); > +} > + > +static void mx25_tcq_enable_fifo_irq(struct mx25_tcq_priv *priv) > +{ > + regmap_update_bits(priv->regs, MX25_ADCQ_MR, MX25_ADCQ_MR_FDRY_IRQ, 0); > +} > + > +static void mx25_tcq_force_queue_start(struct mx25_tcq_priv *priv) > +{ > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FQS, > + MX25_ADCQ_CR_FQS); > + > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FQS, 0); > +} > + > +static void mx25_tcq_force_queue_stop(struct mx25_tcq_priv *priv) > +{ > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FQS, 0); > +} > + > +static void mx25_tcq_fifo_reset(struct mx25_tcq_priv *priv) > +{ > + u32 tcqcr; > + > + regmap_read(priv->regs, MX25_ADCQ_CR, &tcqcr); > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FRST, > + MX25_ADCQ_CR_FRST); > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FRST, > + 0); > + regmap_write(priv->regs, MX25_ADCQ_CR, tcqcr); > +} > + > +static void mx25_tcq_re_enable_touch_detection(struct mx25_tcq_priv *priv) > +{ > + /* stop the queue from looping */ > + mx25_tcq_force_queue_stop(priv); > + > + /* for a clean touch detection, preload the X plane */ > + regmap_write(priv->core_regs, MX25_TSC_TICR, MX25_PRECHARGE_VALUE); > + > + /* waste some time now to pre-load the X plate to high voltage */ > + mx25_tcq_fifo_reset(priv); > + > + /* re-enable the detection right now */ > + regmap_write(priv->core_regs, MX25_TSC_TICR, MX25_TOUCH_DETECT_VALUE | > + MX25_ADCQ_CFG_IGS); > + > + regmap_update_bits(priv->regs, MX25_ADCQ_SR, MX25_ADCQ_SR_PD, > + MX25_ADCQ_SR_PD); > + > + /* enable the pen down event to be a source for the interrupt */ > + regmap_update_bits(priv->regs, MX25_ADCQ_MR, MX25_ADCQ_MR_PD_IRQ, 0); > + > + /* lets fire the next IRQ if someone touches the touchscreen */ > + mx25_tcq_enable_touch_irq(priv); > +} > + > +static int mx25_tcq_create_event_for_4wire(struct mx25_tcq_priv *priv, > + u32 *sample_buf, int samples) > +{ > + unsigned int x_pos = 0; > + unsigned int y_pos = 0; > + unsigned int touch_pre = 0; > + unsigned int touch_post = 0; > + unsigned i; > + int ret = 0; > + > + for (i = 0; i < samples; i++) { > + unsigned int index = MX25_ADCQ_FIFO_ID(sample_buf[i]); > + unsigned int val = MX25_ADCQ_FIFO_DATA(sample_buf[i]); > + > + switch (index) { > + case 1: > + touch_pre = val; > + break; > + case 2: > + x_pos = val; > + break; > + case 3: > + y_pos = val; > + break; > + case 5: > + touch_post = val; > + break; > + default: > + ret = -EINVAL; > + break; > + } > + } > + > + if (ret == 0 && samples != 0) { > + /* > + * only if both touch measures are below a treshold, > + * the position is valid > + */ > + if (touch_pre < priv->pen_threshold && > + touch_post < priv->pen_threshold) { > + /* valid samples, generate a report */ > + x_pos /= priv->sample_count; > + y_pos /= priv->sample_count; > + input_report_abs(priv->idev, ABS_X, x_pos); > + input_report_abs(priv->idev, ABS_Y, y_pos); > + input_report_key(priv->idev, BTN_TOUCH, > + 0xfff - ((touch_pre + touch_post) / 2)); Hmm, are you trying to report pressure here? > + input_sync(priv->idev); > + > + /* get next sample */ > + mx25_tcq_force_queue_start(priv); > + mx25_tcq_enable_fifo_irq(priv); > + } else { > + if (touch_pre >= priv->pen_threshold && You can convert this to "else if" and save indentation level here. > + touch_post >= priv->pen_threshold) { > + /* > + * if both samples are invalid, > + * generate a release report > + */ > + input_report_key(priv->idev, BTN_TOUCH, 0); > + input_sync(priv->idev); > + mx25_tcq_re_enable_touch_detection(priv); > + } else { > + /* > + * if only one of both touch measurements are > + * below the threshold, still some bouncing > + * happens. Take additional samples in this > + * case to be sure > + */ > + mx25_tcq_force_queue_start(priv); > + mx25_tcq_enable_fifo_irq(priv); > + } > + } > + } > + > + return ret; > +} > + > +static irqreturn_t mx25_tcq_irq_thread(int irq, void *dev_id) > +{ > + struct mx25_tcq_priv *priv = (struct mx25_tcq_priv *) dev_id; > + u32 sample_buf[TSC_MAX_SAMPLES]; > + int samples = 0; > + > + /* read all samples */ > + while (1) { > + u32 stats; > + > + regmap_read(priv->regs, MX25_ADCQ_SR, &stats); Error handling for I/O operations? > + if (stats & MX25_ADCQ_SR_EMPT) > + break; > + > + if (samples < TSC_MAX_SAMPLES) { > + regmap_read(priv->regs, MX25_ADCQ_FIFO, > + &sample_buf[samples]); > + ++samples; > + } else { > + u32 discarded; > + /* discard samples */ > + regmap_read(priv->regs, MX25_ADCQ_FIFO, &discarded); Should there be some upper bound for number of discarded samples? > + } > + } > + > + mx25_tcq_create_event_for_4wire(priv, sample_buf, samples); > + > + return IRQ_HANDLED; > +} > + > +static irqreturn_t mx25_tcq_irq(int irq, void *dev_id) > +{ > + struct mx25_tcq_priv *priv = (struct mx25_tcq_priv *)dev_id; > + u32 stat; > + int ret = IRQ_HANDLED; > + > + regmap_read(priv->regs, MX25_ADCQ_SR, &stat); > + > + if (stat & (MX25_ADCQ_SR_FRR | MX25_ADCQ_SR_FUR | MX25_ADCQ_SR_FOR)) > + mx25_tcq_fifo_reset(priv); > + > + if (stat & MX25_ADCQ_SR_PD) { > + mx25_tcq_disable_touch_irq(priv); > + mx25_tcq_force_queue_start(priv); > + mx25_tcq_enable_fifo_irq(priv); > + } > + > + if (stat & MX25_ADCQ_SR_FDRY) { > + mx25_tcq_disable_fifo_irq(priv); > + ret = IRQ_WAKE_THREAD; > + } > + > + regmap_update_bits(priv->regs, MX25_ADCQ_SR, MX25_ADCQ_SR_FRR | > + MX25_ADCQ_SR_FUR | MX25_ADCQ_SR_FOR | MX25_ADCQ_SR_PD | > + MX25_ADCQ_SR_EOQ, > + MX25_ADCQ_SR_FRR | > + MX25_ADCQ_SR_FUR | MX25_ADCQ_SR_FOR | MX25_ADCQ_SR_PD | > + MX25_ADCQ_SR_EOQ); > + > + return ret; > +} > + > +/* configure the statemachine for a 4-wire touchscreen */ > +static int mx25_tcq_init(struct mx25_tcq_priv *priv) > +{ > + u32 tgcr; > + unsigned int ipg_div; > + unsigned int adc_period; > + unsigned int repeat_wait; > + unsigned int debounce_cnt; > + unsigned int settling_time; > + int itemct; > + int ret; > + > + regmap_read(priv->core_regs, MX25_TSC_TGCR, &tgcr); > + ipg_div = max_t(unsigned int, 4, MX25_TGCR_GET_ADCCLK(tgcr)); > + adc_period = clk_get_rate(priv->clk) / (ipg_div * 2 + 2); > + repeat_wait = fls(DIV_ROUND_UP(priv->repeat_wait, adc_period)); > + debounce_cnt = DIV_ROUND_UP(priv->pen_debounce, adc_period * 8) - 1; > + settling_time = DIV_ROUND_UP(priv->settling_time, adc_period); > + > + > + /* Reset */ > + regmap_write(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_QRST | > + MX25_ADCQ_CR_FRST); > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_QRST | > + MX25_ADCQ_CR_FRST, 0); > + > + /* up to 128 * 8 ADC clocks are possible */ > + if (debounce_cnt > 127) > + debounce_cnt = 127; > + > + if (repeat_wait > 15) > + repeat_wait = 15; > + > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_RWAIT_MASK, > + MX25_ADCQ_CR_RWAIT(repeat_wait)); > + > + ret = imx25_setup_queue_4wire(priv, 0x0, &itemct); > + if (ret) > + return ret; > + > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_LITEMID_MASK | > + MX25_ADCQ_CR_WMRK_MASK, > + MX25_ADCQ_CR_LITEMID(itemct - 1) | > + MX25_ADCQ_CR_WMRK(priv->expected_samples - 1)); > + > + /* setup debounce count */ > + regmap_update_bits(priv->core_regs, MX25_TSC_TGCR, > + MX25_TGCR_PDBTIME_MASK, > + MX25_TGCR_PDBTIME(debounce_cnt)); > + > + /* enable debounce */ > + regmap_update_bits(priv->core_regs, MX25_TSC_TGCR, MX25_TGCR_PDBEN, > + MX25_TGCR_PDBEN); > + regmap_update_bits(priv->core_regs, MX25_TSC_TGCR, MX25_TGCR_PDEN, > + MX25_TGCR_PDEN); > + > + /* enable the engine on demand */ > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_QSM_FQS, > + MX25_ADCQ_CR_QSM_FQS); > + > + mx25_tcq_re_enable_touch_detection(priv); > + > + return 0; > +} > + > +static int mx25_tcq_parse_dt(struct platform_device *pdev, > + struct mx25_tcq_priv *priv) > +{ > + struct device_node *np = pdev->dev.of_node; > + u32 wires; > + int ret; > + > + /* Setup defaults */ > + priv->pen_threshold = 500; > + priv->sample_count = 3; > + priv->repeat_wait = 15000000; > + priv->pen_debounce = 1000000; > + priv->settling_time = 250000; > + > + ret = of_property_read_u32(np, "fsl,wires", &wires); > + if (ret) { > + dev_err(&pdev->dev, "Failed to find fsl,wires properties\n"); > + return ret; > + } > + > + if (wires == 4) { > + priv->mode = MX25_TS_4WIRE; > + } else { > + dev_err(&pdev->dev, "%u-wire mode not supported\n", wires); > + return -EINVAL; > + } > + > + /* These are optional, we don't care about the return values */ > + of_property_read_u32(np, "fsl,pen-threshold", &priv->pen_threshold); > + of_property_read_u32(np, "fsl,settling-time", &priv->settling_time); > + of_property_read_u32(np, "fsl,pen-debounce", &priv->pen_debounce); > + > + return 0; > +} > + > +static int mx25_tcq_probe(struct platform_device *pdev) > +{ > + struct device *dev = &pdev->dev; > + struct input_dev *idev; > + struct mx25_tcq_priv *priv; > + struct resource *res; > + void __iomem *mem; > + int ret; > + int irq; > + > + priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); > + if (!priv) > + return -ENOMEM; > + > + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > + mem = devm_ioremap_resource(dev, res); > + if (!mem) { > + dev_err(dev, "Failed to get iomem"); > + return -ENOMEM; > + } > + > + ret = mx25_tcq_parse_dt(pdev, priv); > + if (ret) > + return ret; > + > + priv->regs = devm_regmap_init_mmio(dev, mem, &mx25_tcq_regconfig); > + if (IS_ERR(priv->regs)) { > + dev_err(dev, "Failed to initialize regmap\n"); > + return PTR_ERR(priv->regs); > + } > + > + irq = platform_get_irq(pdev, 0); > + if (irq < 0) { > + dev_err(dev, "Failed to get IRQ\n"); > + return irq; > + } > + > + ret = devm_request_threaded_irq(dev, irq, mx25_tcq_irq, > + mx25_tcq_irq_thread, IRQF_ONESHOT, pdev->name, priv); > + if (ret) { > + dev_err(dev, "Failed requesting IRQ\n"); > + return ret; > + } Are we sure the device is quiesce here? Otherwise interrupts will start coming but input device is not there yet. > + > + idev = devm_input_allocate_device(dev); > + if (!idev) { > + dev_err(dev, "Failed to allocate input device\n"); > + return -ENOMEM; > + } > + > + idev->name = mx25_tcq_name; > + idev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS); > + idev->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH); > + input_set_abs_params(idev, ABS_X, 0, 0xfff, 0, 0); > + input_set_abs_params(idev, ABS_Y, 0, 0xfff, 0, 0); > + > + idev->id.bustype = BUS_HOST; > + > + ret = input_register_device(idev); > + if (ret) { > + dev_err(dev, "Failed to register input device\n"); > + return ret; > + } > + > + priv->idev = idev; > + > + priv->core_regs = mx25_tsadc_get_regmap(pdev->dev.parent); > + priv->clk = mx25_tsadc_get_ipg(pdev->dev.parent); > + > + ret = clk_prepare_enable(priv->clk); > + if (ret) { > + dev_err(dev, "Failed to enable ipg clock\n"); > + return ret; > + } > + > + ret = mx25_tcq_init(priv); > + if (ret) { > + dev_err(dev, "Failed to init tcq\n"); > + goto error_tcq_init; > + } > + > + platform_set_drvdata(pdev, priv); > + > + return 0; > + > +error_tcq_init: > + clk_disable_unprepare(priv->clk); > + return ret; > +} > + > +static int mx25_tcq_remove(struct platform_device *pdev) > +{ > + struct mx25_tcq_priv *priv = platform_get_drvdata(pdev); > + > + clk_disable_unprepare(priv->clk); Hmm, if you disable clk all other operations will likely to fail. We really need devm clk interface, I guess I need to dust off my old patch... > + > + return 0; > +} > + > +static struct platform_driver mx25_tcq_driver = { > + .driver = { > + .name = "mx25-tcq", > + .owner = THIS_MODULE, > + .of_match_table = mx25_tcq_ids, > + }, > + .probe = mx25_tcq_probe, > + .remove = mx25_tcq_remove, > +}; > +module_platform_driver(mx25_tcq_driver); > + > +MODULE_DESCRIPTION("TS input driver for Freescale mx25"); > +MODULE_AUTHOR("Markus Pargmann <mpa@pengutronix.de>"); > +MODULE_LICENSE("GPL v2"); > -- > 1.8.5.3 > Thanks. -- Dmitry ^ permalink raw reply [flat|nested] 76+ messages in thread
* Re: [PATCH 2/3] input: touchscreen: imx25 tcq driver 2014-02-23 6:44 ` Dmitry Torokhov @ 2014-02-25 11:05 ` Markus Pargmann -1 siblings, 0 replies; 76+ messages in thread From: Markus Pargmann @ 2014-02-25 11:05 UTC (permalink / raw) To: Dmitry Torokhov Cc: devicetree, linux-input, linux-iio, Samuel Ortiz, Lee Jones, Jonathan Cameron, linux-arm-kernel, kernel [-- Attachment #1: Type: text/plain, Size: 24865 bytes --] Hi, On Sat, Feb 22, 2014 at 10:44:06PM -0800, Dmitry Torokhov wrote: > Hi Marjus, > > On Thu, Feb 20, 2014 at 05:21:51PM +0100, Markus Pargmann wrote: > > This is a driver for the imx25 ADC/TSC module. It controls the > > touchscreen conversion queue and creates a touchscreen input device. > > The driver currently only supports 4 wire touchscreens. The driver uses > > a simple conversion queue of precharge, touch detection, X measurement, > > Y measurement, precharge and another touch detection. > > > > This driver uses the regmap from the parent to setup some touch specific > > settings in the core driver and setup a idle configuration with touch > > detection. > > > > Signed-off-by: Markus Pargmann <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> > > --- > > .../bindings/input/touchscreen/fsl-mx25-tcq.txt | 29 + > > drivers/input/touchscreen/Kconfig | 6 + > > drivers/input/touchscreen/Makefile | 1 + > > drivers/input/touchscreen/fsl-imx25-tcq.c | 589 +++++++++++++++++++++ > > 4 files changed, 625 insertions(+) > > create mode 100644 Documentation/devicetree/bindings/input/touchscreen/fsl-mx25-tcq.txt > > create mode 100644 drivers/input/touchscreen/fsl-imx25-tcq.c > > > > diff --git a/Documentation/devicetree/bindings/input/touchscreen/fsl-mx25-tcq.txt b/Documentation/devicetree/bindings/input/touchscreen/fsl-mx25-tcq.txt > > new file mode 100644 > > index 0000000..4214a99 > > --- /dev/null > > +++ b/Documentation/devicetree/bindings/input/touchscreen/fsl-mx25-tcq.txt > > @@ -0,0 +1,29 @@ > > +Freescale mx25 TS conversion queue module > > + > > +mx25 touchscreen conversion queue module which controls the ADC unit of the > > +mx25 for attached touchscreens. > > + > > +Required properties: > > + - compatible: Should be "fsl,imx25-tcq". > > + - reg: Memory range of the device. > > + - interrupts: Should be the interrupt number associated with this module within > > + the tscadc unit (<0>). > > + - interrupt-parent: Should be a phandle to the tscadc unit. > > + - fsl,wires: Should be '<4>' or '<5>' > > + > > +Optional properties: > > + - fsl,pen-debounce: Pen debounce time. > > + - fsl,pen-threshold: Pen-down threshold for the touchscreen. > > + - fsl,settling-time: Settling time in nanoseconds. > > + > > +This device includes two conversion queues which can be added as subnodes. > > +The first queue is for the touchscreen, the second for general purpose ADC. > > + > > +Example: > > + tsc: tcq@50030400 { > > + compatible = "fsl,imx25-tcq"; > > + reg = <0x50030400 0x60>; > > + interrupt-parent = <&tscadc>; > > + interrupts = <0>; > > + fsl,wires = <4>; > > + }; > > diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig > > index 07e9e82..d52c055 100644 > > --- a/drivers/input/touchscreen/Kconfig > > +++ b/drivers/input/touchscreen/Kconfig > > @@ -715,6 +715,12 @@ config TOUCHSCREEN_USB_COMPOSITE > > To compile this driver as a module, choose M here: the > > module will be called usbtouchscreen. > > > > +config TOUCHSCREEN_MX25 > > + tristate "Freescale i.MX25 touchscreen input driver" > > + depends on MFD_MX25_TSADC > > + help > > + Enable support for touchscreen connected to your i.MX25. > > + > > config TOUCHSCREEN_MC13783 > > tristate "Freescale MC13783 touchscreen input driver" > > depends on MFD_MC13XXX > > diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile > > index 62801f2..c891f30 100644 > > --- a/drivers/input/touchscreen/Makefile > > +++ b/drivers/input/touchscreen/Makefile > > @@ -38,6 +38,7 @@ obj-$(CONFIG_TOUCHSCREEN_INEXIO) += inexio.o > > obj-$(CONFIG_TOUCHSCREEN_INTEL_MID) += intel-mid-touch.o > > obj-$(CONFIG_TOUCHSCREEN_LPC32XX) += lpc32xx_ts.o > > obj-$(CONFIG_TOUCHSCREEN_MAX11801) += max11801_ts.o > > +obj-$(CONFIG_TOUCHSCREEN_MX25) += fsl-imx25-tcq.o > > obj-$(CONFIG_TOUCHSCREEN_MC13783) += mc13783_ts.o > > obj-$(CONFIG_TOUCHSCREEN_MCS5000) += mcs5000_ts.o > > obj-$(CONFIG_TOUCHSCREEN_MIGOR) += migor_ts.o > > diff --git a/drivers/input/touchscreen/fsl-imx25-tcq.c b/drivers/input/touchscreen/fsl-imx25-tcq.c > > new file mode 100644 > > index 0000000..436cc8b > > --- /dev/null > > +++ b/drivers/input/touchscreen/fsl-imx25-tcq.c > > @@ -0,0 +1,589 @@ > > +/* > > + * Copyright 2014 Markus Pargmann, Pengutronix <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> > > + * Based on driver from 2011 Juergen Beisert, Pengutronix <kernel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> > > + * > > + * The code contained herein is licensed under the GNU General Public > > + * License. You may obtain a copy of the GNU General Public License > > + * Version 2 or later at the following locations: > > + * > > + * http://www.opensource.org/licenses/gpl-license.html > > + * http://www.gnu.org/copyleft/gpl.html > > + * > > + * This is the driver for the imx25 TCQ (Touchscreen Conversion Queue) > > + * connected to the imx25 ADC. > > + */ > > + > > +#include <linux/clk.h> > > +#include <linux/interrupt.h> > > +#include <linux/input.h> > > +#include <linux/mfd/imx25-tsadc.h> > > +#include <linux/module.h> > > +#include <linux/of.h> > > +#include <linux/platform_device.h> > > +#include <linux/regmap.h> > > + > > +static const char mx25_tcq_name[] = "mx25-tcq"; > > + > > +enum mx25_tcq_mode { > > + MX25_TS_4WIRE, > > +}; > > + > > +struct mx25_tcq_priv { > > + struct regmap *regs; > > + struct regmap *core_regs; > > + struct input_dev *idev; > > + enum mx25_tcq_mode mode; > > + unsigned int pen_threshold; > > + unsigned int sample_count; > > + unsigned int expected_samples; > > + unsigned int repeat_wait; > > + unsigned int pen_debounce; > > + unsigned int settling_time; > > + struct clk *clk; > > +}; > > + > > +static struct regmap_config mx25_tcq_regconfig = { > > + .fast_io = true, > > + .max_register = 0x5c, > > + .reg_bits = 32, > > + .val_bits = 32, > > + .reg_stride = 4, > > +}; > > + > > +static struct of_device_id mx25_tcq_ids[] = { > > + { .compatible = "fsl,imx25-tcq", }, > > + { /* Senitel */ } > > +}; > > + > > +#define TSC_4WIRE_PRE_INDEX 0 > > +#define TSC_4WIRE_X_INDEX 1 > > +#define TSC_4WIRE_Y_INDEX 2 > > +#define TSC_4WIRE_POST_INDEX 3 > > +#define TSC_4WIRE_LEAVE 4 > > + > > +#define MX25_TSC_DEF_THRESHOLD 80 > > +#define TSC_MAX_SAMPLES 16 > > + > > + > > +enum mx25_adc_configurations { > > + MX25_CFG_PRECHARGE = 0, > > + MX25_CFG_TOUCH_DETECT, > > + MX25_CFG_X_MEASUREMENT, > > + MX25_CFG_Y_MEASUREMENT, > > +}; > > + > > +#define MX25_PRECHARGE_VALUE (\ > > + MX25_ADCQ_CFG_YPLL_OFF | \ > > + MX25_ADCQ_CFG_XNUR_OFF | \ > > + MX25_ADCQ_CFG_XPUL_HIGH | \ > > + MX25_ADCQ_CFG_REFP_INT | \ > > + MX25_ADCQ_CFG_IN_XP | \ > > + MX25_ADCQ_CFG_REFN_NGND2 | \ > > + MX25_ADCQ_CFG_IGS) > > + > > +#define MX25_TOUCH_DETECT_VALUE (\ > > + MX25_ADCQ_CFG_YNLR | \ > > + MX25_ADCQ_CFG_YPLL_OFF | \ > > + MX25_ADCQ_CFG_XNUR_OFF | \ > > + MX25_ADCQ_CFG_XPUL_OFF | \ > > + MX25_ADCQ_CFG_REFP_INT | \ > > + MX25_ADCQ_CFG_IN_XP | \ > > + MX25_ADCQ_CFG_REFN_NGND2 | \ > > + MX25_ADCQ_CFG_PENIACK) > > + > > +static void imx25_setup_queue_cfgs(struct mx25_tcq_priv *priv, > > + unsigned int settling_time) > > +{ > > + u32 precharge_cfg = > > + MX25_PRECHARGE_VALUE | > > + MX25_ADCQ_CFG_SETTLING_TIME(settling_time); > > + u32 touch_detect_cfg = > > + MX25_TOUCH_DETECT_VALUE | > > + MX25_ADCQ_CFG_NOS(1) | > > + MX25_ADCQ_CFG_SETTLING_TIME(settling_time); > > + > > + regmap_write(priv->core_regs, MX25_TSC_TICR, precharge_cfg); > > + > > + /* PRECHARGE */ > > + regmap_write(priv->regs, MX25_ADCQ_CFG(MX25_CFG_PRECHARGE), > > + precharge_cfg); > > + > > + /* TOUCH_DETECT */ > > + regmap_write(priv->regs, MX25_ADCQ_CFG(MX25_CFG_TOUCH_DETECT), > > + touch_detect_cfg); > > + > > + /* X Measurement */ > > + regmap_write(priv->regs, MX25_ADCQ_CFG(MX25_CFG_X_MEASUREMENT), > > + MX25_ADCQ_CFG_YPLL_OFF | > > + MX25_ADCQ_CFG_XNUR_LOW | > > + MX25_ADCQ_CFG_XPUL_HIGH | > > + MX25_ADCQ_CFG_REFP_XP | > > + MX25_ADCQ_CFG_IN_YP | > > + MX25_ADCQ_CFG_REFN_XN | > > + MX25_ADCQ_CFG_NOS(priv->sample_count) | > > + MX25_ADCQ_CFG_SETTLING_TIME(settling_time)); > > + > > + /* Y Measurement */ > > + regmap_write(priv->regs, MX25_ADCQ_CFG(MX25_CFG_Y_MEASUREMENT), > > + MX25_ADCQ_CFG_YNLR | > > + MX25_ADCQ_CFG_YPLL_HIGH | > > + MX25_ADCQ_CFG_XNUR_OFF | > > + MX25_ADCQ_CFG_XPUL_OFF | > > + MX25_ADCQ_CFG_REFP_YP | > > + MX25_ADCQ_CFG_IN_XP | > > + MX25_ADCQ_CFG_REFN_YN | > > + MX25_ADCQ_CFG_NOS(priv->sample_count) | > > + MX25_ADCQ_CFG_SETTLING_TIME(settling_time)); > > + > > + /* Enable the touch detection right now */ > > + regmap_write(priv->core_regs, MX25_TSC_TICR, touch_detect_cfg | > > + MX25_ADCQ_CFG_IGS); > > +} > > + > > +static int imx25_setup_queue_4wire(struct mx25_tcq_priv *priv, > > + unsigned settling_time, int *items) > > +{ > > + imx25_setup_queue_cfgs(priv, settling_time); > > + > > + /* Setup the conversion queue */ > > + regmap_write(priv->regs, MX25_ADCQ_ITEM_7_0, > > + MX25_ADCQ_ITEM(0, MX25_CFG_PRECHARGE) | > > + MX25_ADCQ_ITEM(1, MX25_CFG_TOUCH_DETECT) | > > + MX25_ADCQ_ITEM(2, MX25_CFG_X_MEASUREMENT) | > > + MX25_ADCQ_ITEM(3, MX25_CFG_Y_MEASUREMENT) | > > + MX25_ADCQ_ITEM(4, MX25_CFG_PRECHARGE) | > > + MX25_ADCQ_ITEM(5, MX25_CFG_TOUCH_DETECT)); > > + > > + /* We measure X/Y with 'sample_count' number of samples and execute a > > + * touch detection twice, with 1 sample each */ > > + priv->expected_samples = priv->sample_count * 2 + 2; > > + *items = 6; > > + > > + return 0; > > +} > > + > > +static void mx25_tcq_disable_touch_irq(struct mx25_tcq_priv *priv) > > +{ > > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_PDMSK, > > + MX25_ADCQ_CR_PDMSK); > > +} > > + > > +static void mx25_tcq_enable_touch_irq(struct mx25_tcq_priv *priv) > > +{ > > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_PDMSK, 0); > > +} > > + > > +static void mx25_tcq_disable_fifo_irq(struct mx25_tcq_priv *priv) > > +{ > > + regmap_update_bits(priv->regs, MX25_ADCQ_MR, MX25_ADCQ_MR_FDRY_IRQ, > > + MX25_ADCQ_MR_FDRY_IRQ); > > +} > > + > > +static void mx25_tcq_enable_fifo_irq(struct mx25_tcq_priv *priv) > > +{ > > + regmap_update_bits(priv->regs, MX25_ADCQ_MR, MX25_ADCQ_MR_FDRY_IRQ, 0); > > +} > > + > > +static void mx25_tcq_force_queue_start(struct mx25_tcq_priv *priv) > > +{ > > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FQS, > > + MX25_ADCQ_CR_FQS); > > + > > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FQS, 0); > > +} > > + > > +static void mx25_tcq_force_queue_stop(struct mx25_tcq_priv *priv) > > +{ > > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FQS, 0); > > +} > > + > > +static void mx25_tcq_fifo_reset(struct mx25_tcq_priv *priv) > > +{ > > + u32 tcqcr; > > + > > + regmap_read(priv->regs, MX25_ADCQ_CR, &tcqcr); > > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FRST, > > + MX25_ADCQ_CR_FRST); > > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FRST, > > + 0); > > + regmap_write(priv->regs, MX25_ADCQ_CR, tcqcr); > > +} > > + > > +static void mx25_tcq_re_enable_touch_detection(struct mx25_tcq_priv *priv) > > +{ > > + /* stop the queue from looping */ > > + mx25_tcq_force_queue_stop(priv); > > + > > + /* for a clean touch detection, preload the X plane */ > > + regmap_write(priv->core_regs, MX25_TSC_TICR, MX25_PRECHARGE_VALUE); > > + > > + /* waste some time now to pre-load the X plate to high voltage */ > > + mx25_tcq_fifo_reset(priv); > > + > > + /* re-enable the detection right now */ > > + regmap_write(priv->core_regs, MX25_TSC_TICR, MX25_TOUCH_DETECT_VALUE | > > + MX25_ADCQ_CFG_IGS); > > + > > + regmap_update_bits(priv->regs, MX25_ADCQ_SR, MX25_ADCQ_SR_PD, > > + MX25_ADCQ_SR_PD); > > + > > + /* enable the pen down event to be a source for the interrupt */ > > + regmap_update_bits(priv->regs, MX25_ADCQ_MR, MX25_ADCQ_MR_PD_IRQ, 0); > > + > > + /* lets fire the next IRQ if someone touches the touchscreen */ > > + mx25_tcq_enable_touch_irq(priv); > > +} > > + > > +static int mx25_tcq_create_event_for_4wire(struct mx25_tcq_priv *priv, > > + u32 *sample_buf, int samples) > > +{ > > + unsigned int x_pos = 0; > > + unsigned int y_pos = 0; > > + unsigned int touch_pre = 0; > > + unsigned int touch_post = 0; > > + unsigned i; > > + int ret = 0; > > + > > + for (i = 0; i < samples; i++) { > > + unsigned int index = MX25_ADCQ_FIFO_ID(sample_buf[i]); > > + unsigned int val = MX25_ADCQ_FIFO_DATA(sample_buf[i]); > > + > > + switch (index) { > > + case 1: > > + touch_pre = val; > > + break; > > + case 2: > > + x_pos = val; > > + break; > > + case 3: > > + y_pos = val; > > + break; > > + case 5: > > + touch_post = val; > > + break; > > + default: > > + ret = -EINVAL; > > + break; > > + } > > + } > > + > > + if (ret == 0 && samples != 0) { > > + /* > > + * only if both touch measures are below a treshold, > > + * the position is valid > > + */ > > + if (touch_pre < priv->pen_threshold && > > + touch_post < priv->pen_threshold) { > > + /* valid samples, generate a report */ > > + x_pos /= priv->sample_count; > > + y_pos /= priv->sample_count; > > + input_report_abs(priv->idev, ABS_X, x_pos); > > + input_report_abs(priv->idev, ABS_Y, y_pos); > > + input_report_key(priv->idev, BTN_TOUCH, > > + 0xfff - ((touch_pre + touch_post) / 2)); > > Hmm, are you trying to report pressure here? No this is only to detect touches, not pressure. Reporting pressure would require a different, more complex conversion queue. > > > + input_sync(priv->idev); > > + > > + /* get next sample */ > > + mx25_tcq_force_queue_start(priv); > > + mx25_tcq_enable_fifo_irq(priv); > > + } else { > > + if (touch_pre >= priv->pen_threshold && > > You can convert this to "else if" and save indentation level here. Fixed. > > > + touch_post >= priv->pen_threshold) { > > + /* > > + * if both samples are invalid, > > + * generate a release report > > + */ > > + input_report_key(priv->idev, BTN_TOUCH, 0); > > + input_sync(priv->idev); > > + mx25_tcq_re_enable_touch_detection(priv); > > + } else { > > + /* > > + * if only one of both touch measurements are > > + * below the threshold, still some bouncing > > + * happens. Take additional samples in this > > + * case to be sure > > + */ > > + mx25_tcq_force_queue_start(priv); > > + mx25_tcq_enable_fifo_irq(priv); > > + } > > + } > > + } > > + > > + return ret; > > +} > > + > > +static irqreturn_t mx25_tcq_irq_thread(int irq, void *dev_id) > > +{ > > + struct mx25_tcq_priv *priv = (struct mx25_tcq_priv *) dev_id; > > + u32 sample_buf[TSC_MAX_SAMPLES]; > > + int samples = 0; > > + > > + /* read all samples */ > > + while (1) { > > + u32 stats; > > + > > + regmap_read(priv->regs, MX25_ADCQ_SR, &stats); > > Error handling for I/O operations? This is memory mapped io. It only returns an error when the clock enable operation fails. As regmap is not configured to use a clock for this driver, I would prefer to not use error handling for regmap_read/write. > > > + if (stats & MX25_ADCQ_SR_EMPT) > > + break; > > + > > + if (samples < TSC_MAX_SAMPLES) { > > + regmap_read(priv->regs, MX25_ADCQ_FIFO, > > + &sample_buf[samples]); > > + ++samples; > > + } else { > > + u32 discarded; > > + /* discard samples */ > > + regmap_read(priv->regs, MX25_ADCQ_FIFO, &discarded); > > Should there be some upper bound for number of discarded samples? I just noticed that we do not repeat the conversion queue. The bit is not set, so all the repeat code can be removed. This also means that the conversion is stopped when we reach the end of the conversion queue and this should not need an additional upper bound for discarded samples. > > > + } > > + } > > + > > + mx25_tcq_create_event_for_4wire(priv, sample_buf, samples); > > + > > + return IRQ_HANDLED; > > +} > > + > > +static irqreturn_t mx25_tcq_irq(int irq, void *dev_id) > > +{ > > + struct mx25_tcq_priv *priv = (struct mx25_tcq_priv *)dev_id; > > + u32 stat; > > + int ret = IRQ_HANDLED; > > + > > + regmap_read(priv->regs, MX25_ADCQ_SR, &stat); > > + > > + if (stat & (MX25_ADCQ_SR_FRR | MX25_ADCQ_SR_FUR | MX25_ADCQ_SR_FOR)) > > + mx25_tcq_fifo_reset(priv); > > + > > + if (stat & MX25_ADCQ_SR_PD) { > > + mx25_tcq_disable_touch_irq(priv); > > + mx25_tcq_force_queue_start(priv); > > + mx25_tcq_enable_fifo_irq(priv); > > + } > > + > > + if (stat & MX25_ADCQ_SR_FDRY) { > > + mx25_tcq_disable_fifo_irq(priv); > > + ret = IRQ_WAKE_THREAD; > > + } > > + > > + regmap_update_bits(priv->regs, MX25_ADCQ_SR, MX25_ADCQ_SR_FRR | > > + MX25_ADCQ_SR_FUR | MX25_ADCQ_SR_FOR | MX25_ADCQ_SR_PD | > > + MX25_ADCQ_SR_EOQ, > > + MX25_ADCQ_SR_FRR | > > + MX25_ADCQ_SR_FUR | MX25_ADCQ_SR_FOR | MX25_ADCQ_SR_PD | > > + MX25_ADCQ_SR_EOQ); > > + > > + return ret; > > +} > > + > > +/* configure the statemachine for a 4-wire touchscreen */ > > +static int mx25_tcq_init(struct mx25_tcq_priv *priv) > > +{ > > + u32 tgcr; > > + unsigned int ipg_div; > > + unsigned int adc_period; > > + unsigned int repeat_wait; > > + unsigned int debounce_cnt; > > + unsigned int settling_time; > > + int itemct; > > + int ret; > > + > > + regmap_read(priv->core_regs, MX25_TSC_TGCR, &tgcr); > > + ipg_div = max_t(unsigned int, 4, MX25_TGCR_GET_ADCCLK(tgcr)); > > + adc_period = clk_get_rate(priv->clk) / (ipg_div * 2 + 2); > > + repeat_wait = fls(DIV_ROUND_UP(priv->repeat_wait, adc_period)); > > + debounce_cnt = DIV_ROUND_UP(priv->pen_debounce, adc_period * 8) - 1; > > + settling_time = DIV_ROUND_UP(priv->settling_time, adc_period); > > + > > + > > + /* Reset */ > > + regmap_write(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_QRST | > > + MX25_ADCQ_CR_FRST); > > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_QRST | > > + MX25_ADCQ_CR_FRST, 0); > > + > > + /* up to 128 * 8 ADC clocks are possible */ > > + if (debounce_cnt > 127) > > + debounce_cnt = 127; > > + > > + if (repeat_wait > 15) > > + repeat_wait = 15; > > + > > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_RWAIT_MASK, > > + MX25_ADCQ_CR_RWAIT(repeat_wait)); > > + > > + ret = imx25_setup_queue_4wire(priv, 0x0, &itemct); > > + if (ret) > > + return ret; > > + > > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_LITEMID_MASK | > > + MX25_ADCQ_CR_WMRK_MASK, > > + MX25_ADCQ_CR_LITEMID(itemct - 1) | > > + MX25_ADCQ_CR_WMRK(priv->expected_samples - 1)); > > + > > + /* setup debounce count */ > > + regmap_update_bits(priv->core_regs, MX25_TSC_TGCR, > > + MX25_TGCR_PDBTIME_MASK, > > + MX25_TGCR_PDBTIME(debounce_cnt)); > > + > > + /* enable debounce */ > > + regmap_update_bits(priv->core_regs, MX25_TSC_TGCR, MX25_TGCR_PDBEN, > > + MX25_TGCR_PDBEN); > > + regmap_update_bits(priv->core_regs, MX25_TSC_TGCR, MX25_TGCR_PDEN, > > + MX25_TGCR_PDEN); > > + > > + /* enable the engine on demand */ > > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_QSM_FQS, > > + MX25_ADCQ_CR_QSM_FQS); > > + > > + mx25_tcq_re_enable_touch_detection(priv); > > + > > + return 0; > > +} > > + > > +static int mx25_tcq_parse_dt(struct platform_device *pdev, > > + struct mx25_tcq_priv *priv) > > +{ > > + struct device_node *np = pdev->dev.of_node; > > + u32 wires; > > + int ret; > > + > > + /* Setup defaults */ > > + priv->pen_threshold = 500; > > + priv->sample_count = 3; > > + priv->repeat_wait = 15000000; > > + priv->pen_debounce = 1000000; > > + priv->settling_time = 250000; > > + > > + ret = of_property_read_u32(np, "fsl,wires", &wires); > > + if (ret) { > > + dev_err(&pdev->dev, "Failed to find fsl,wires properties\n"); > > + return ret; > > + } > > + > > + if (wires == 4) { > > + priv->mode = MX25_TS_4WIRE; > > + } else { > > + dev_err(&pdev->dev, "%u-wire mode not supported\n", wires); > > + return -EINVAL; > > + } > > + > > + /* These are optional, we don't care about the return values */ > > + of_property_read_u32(np, "fsl,pen-threshold", &priv->pen_threshold); > > + of_property_read_u32(np, "fsl,settling-time", &priv->settling_time); > > + of_property_read_u32(np, "fsl,pen-debounce", &priv->pen_debounce); > > + > > + return 0; > > +} > > + > > +static int mx25_tcq_probe(struct platform_device *pdev) > > +{ > > + struct device *dev = &pdev->dev; > > + struct input_dev *idev; > > + struct mx25_tcq_priv *priv; > > + struct resource *res; > > + void __iomem *mem; > > + int ret; > > + int irq; > > + > > + priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); > > + if (!priv) > > + return -ENOMEM; > > + > > + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > > + mem = devm_ioremap_resource(dev, res); > > + if (!mem) { > > + dev_err(dev, "Failed to get iomem"); > > + return -ENOMEM; > > + } > > + > > + ret = mx25_tcq_parse_dt(pdev, priv); > > + if (ret) > > + return ret; > > + > > + priv->regs = devm_regmap_init_mmio(dev, mem, &mx25_tcq_regconfig); > > + if (IS_ERR(priv->regs)) { > > + dev_err(dev, "Failed to initialize regmap\n"); > > + return PTR_ERR(priv->regs); > > + } > > + > > + irq = platform_get_irq(pdev, 0); > > + if (irq < 0) { > > + dev_err(dev, "Failed to get IRQ\n"); > > + return irq; > > + } > > + > > + ret = devm_request_threaded_irq(dev, irq, mx25_tcq_irq, > > + mx25_tcq_irq_thread, IRQF_ONESHOT, pdev->name, priv); > > + if (ret) { > > + dev_err(dev, "Failed requesting IRQ\n"); > > + return ret; > > + } > > Are we sure the device is quiesce here? Otherwise interrupts will start > coming but input device is not there yet. I moved it to the end of the probe function just before tcq_init where the interrupts are enabled. > > > + > > + idev = devm_input_allocate_device(dev); > > + if (!idev) { > > + dev_err(dev, "Failed to allocate input device\n"); > > + return -ENOMEM; > > + } > > + > > + idev->name = mx25_tcq_name; > > + idev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS); > > + idev->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH); > > + input_set_abs_params(idev, ABS_X, 0, 0xfff, 0, 0); > > + input_set_abs_params(idev, ABS_Y, 0, 0xfff, 0, 0); > > + > > + idev->id.bustype = BUS_HOST; > > + > > + ret = input_register_device(idev); > > + if (ret) { > > + dev_err(dev, "Failed to register input device\n"); > > + return ret; > > + } > > + > > + priv->idev = idev; > > + > > + priv->core_regs = mx25_tsadc_get_regmap(pdev->dev.parent); > > + priv->clk = mx25_tsadc_get_ipg(pdev->dev.parent); > > + > > + ret = clk_prepare_enable(priv->clk); > > + if (ret) { > > + dev_err(dev, "Failed to enable ipg clock\n"); > > + return ret; > > + } > > + > > + ret = mx25_tcq_init(priv); > > + if (ret) { > > + dev_err(dev, "Failed to init tcq\n"); > > + goto error_tcq_init; > > + } > > + > > + platform_set_drvdata(pdev, priv); > > + > > + return 0; > > + > > +error_tcq_init: > > + clk_disable_unprepare(priv->clk); > > + return ret; > > +} > > + > > +static int mx25_tcq_remove(struct platform_device *pdev) > > +{ > > + struct mx25_tcq_priv *priv = platform_get_drvdata(pdev); > > + > > + clk_disable_unprepare(priv->clk); > > Hmm, if you disable clk all other operations will likely to fail. We > really need devm clk interface, I guess I need to dust off my old > patch... > > > + > > + return 0; > > +} > > + > > +static struct platform_driver mx25_tcq_driver = { > > + .driver = { > > + .name = "mx25-tcq", > > + .owner = THIS_MODULE, > > + .of_match_table = mx25_tcq_ids, > > + }, > > + .probe = mx25_tcq_probe, > > + .remove = mx25_tcq_remove, > > +}; > > +module_platform_driver(mx25_tcq_driver); > > + > > +MODULE_DESCRIPTION("TS input driver for Freescale mx25"); > > +MODULE_AUTHOR("Markus Pargmann <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>"); > > +MODULE_LICENSE("GPL v2"); > > -- > > 1.8.5.3 > > Thanks, Markus -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 836 bytes --] ^ permalink raw reply [flat|nested] 76+ messages in thread
* [PATCH 2/3] input: touchscreen: imx25 tcq driver @ 2014-02-25 11:05 ` Markus Pargmann 0 siblings, 0 replies; 76+ messages in thread From: Markus Pargmann @ 2014-02-25 11:05 UTC (permalink / raw) To: linux-arm-kernel Hi, On Sat, Feb 22, 2014 at 10:44:06PM -0800, Dmitry Torokhov wrote: > Hi Marjus, > > On Thu, Feb 20, 2014 at 05:21:51PM +0100, Markus Pargmann wrote: > > This is a driver for the imx25 ADC/TSC module. It controls the > > touchscreen conversion queue and creates a touchscreen input device. > > The driver currently only supports 4 wire touchscreens. The driver uses > > a simple conversion queue of precharge, touch detection, X measurement, > > Y measurement, precharge and another touch detection. > > > > This driver uses the regmap from the parent to setup some touch specific > > settings in the core driver and setup a idle configuration with touch > > detection. > > > > Signed-off-by: Markus Pargmann <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> > > --- > > .../bindings/input/touchscreen/fsl-mx25-tcq.txt | 29 + > > drivers/input/touchscreen/Kconfig | 6 + > > drivers/input/touchscreen/Makefile | 1 + > > drivers/input/touchscreen/fsl-imx25-tcq.c | 589 +++++++++++++++++++++ > > 4 files changed, 625 insertions(+) > > create mode 100644 Documentation/devicetree/bindings/input/touchscreen/fsl-mx25-tcq.txt > > create mode 100644 drivers/input/touchscreen/fsl-imx25-tcq.c > > > > diff --git a/Documentation/devicetree/bindings/input/touchscreen/fsl-mx25-tcq.txt b/Documentation/devicetree/bindings/input/touchscreen/fsl-mx25-tcq.txt > > new file mode 100644 > > index 0000000..4214a99 > > --- /dev/null > > +++ b/Documentation/devicetree/bindings/input/touchscreen/fsl-mx25-tcq.txt > > @@ -0,0 +1,29 @@ > > +Freescale mx25 TS conversion queue module > > + > > +mx25 touchscreen conversion queue module which controls the ADC unit of the > > +mx25 for attached touchscreens. > > + > > +Required properties: > > + - compatible: Should be "fsl,imx25-tcq". > > + - reg: Memory range of the device. > > + - interrupts: Should be the interrupt number associated with this module within > > + the tscadc unit (<0>). > > + - interrupt-parent: Should be a phandle to the tscadc unit. > > + - fsl,wires: Should be '<4>' or '<5>' > > + > > +Optional properties: > > + - fsl,pen-debounce: Pen debounce time. > > + - fsl,pen-threshold: Pen-down threshold for the touchscreen. > > + - fsl,settling-time: Settling time in nanoseconds. > > + > > +This device includes two conversion queues which can be added as subnodes. > > +The first queue is for the touchscreen, the second for general purpose ADC. > > + > > +Example: > > + tsc: tcq at 50030400 { > > + compatible = "fsl,imx25-tcq"; > > + reg = <0x50030400 0x60>; > > + interrupt-parent = <&tscadc>; > > + interrupts = <0>; > > + fsl,wires = <4>; > > + }; > > diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig > > index 07e9e82..d52c055 100644 > > --- a/drivers/input/touchscreen/Kconfig > > +++ b/drivers/input/touchscreen/Kconfig > > @@ -715,6 +715,12 @@ config TOUCHSCREEN_USB_COMPOSITE > > To compile this driver as a module, choose M here: the > > module will be called usbtouchscreen. > > > > +config TOUCHSCREEN_MX25 > > + tristate "Freescale i.MX25 touchscreen input driver" > > + depends on MFD_MX25_TSADC > > + help > > + Enable support for touchscreen connected to your i.MX25. > > + > > config TOUCHSCREEN_MC13783 > > tristate "Freescale MC13783 touchscreen input driver" > > depends on MFD_MC13XXX > > diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile > > index 62801f2..c891f30 100644 > > --- a/drivers/input/touchscreen/Makefile > > +++ b/drivers/input/touchscreen/Makefile > > @@ -38,6 +38,7 @@ obj-$(CONFIG_TOUCHSCREEN_INEXIO) += inexio.o > > obj-$(CONFIG_TOUCHSCREEN_INTEL_MID) += intel-mid-touch.o > > obj-$(CONFIG_TOUCHSCREEN_LPC32XX) += lpc32xx_ts.o > > obj-$(CONFIG_TOUCHSCREEN_MAX11801) += max11801_ts.o > > +obj-$(CONFIG_TOUCHSCREEN_MX25) += fsl-imx25-tcq.o > > obj-$(CONFIG_TOUCHSCREEN_MC13783) += mc13783_ts.o > > obj-$(CONFIG_TOUCHSCREEN_MCS5000) += mcs5000_ts.o > > obj-$(CONFIG_TOUCHSCREEN_MIGOR) += migor_ts.o > > diff --git a/drivers/input/touchscreen/fsl-imx25-tcq.c b/drivers/input/touchscreen/fsl-imx25-tcq.c > > new file mode 100644 > > index 0000000..436cc8b > > --- /dev/null > > +++ b/drivers/input/touchscreen/fsl-imx25-tcq.c > > @@ -0,0 +1,589 @@ > > +/* > > + * Copyright 2014 Markus Pargmann, Pengutronix <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> > > + * Based on driver from 2011 Juergen Beisert, Pengutronix <kernel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> > > + * > > + * The code contained herein is licensed under the GNU General Public > > + * License. You may obtain a copy of the GNU General Public License > > + * Version 2 or later at the following locations: > > + * > > + * http://www.opensource.org/licenses/gpl-license.html > > + * http://www.gnu.org/copyleft/gpl.html > > + * > > + * This is the driver for the imx25 TCQ (Touchscreen Conversion Queue) > > + * connected to the imx25 ADC. > > + */ > > + > > +#include <linux/clk.h> > > +#include <linux/interrupt.h> > > +#include <linux/input.h> > > +#include <linux/mfd/imx25-tsadc.h> > > +#include <linux/module.h> > > +#include <linux/of.h> > > +#include <linux/platform_device.h> > > +#include <linux/regmap.h> > > + > > +static const char mx25_tcq_name[] = "mx25-tcq"; > > + > > +enum mx25_tcq_mode { > > + MX25_TS_4WIRE, > > +}; > > + > > +struct mx25_tcq_priv { > > + struct regmap *regs; > > + struct regmap *core_regs; > > + struct input_dev *idev; > > + enum mx25_tcq_mode mode; > > + unsigned int pen_threshold; > > + unsigned int sample_count; > > + unsigned int expected_samples; > > + unsigned int repeat_wait; > > + unsigned int pen_debounce; > > + unsigned int settling_time; > > + struct clk *clk; > > +}; > > + > > +static struct regmap_config mx25_tcq_regconfig = { > > + .fast_io = true, > > + .max_register = 0x5c, > > + .reg_bits = 32, > > + .val_bits = 32, > > + .reg_stride = 4, > > +}; > > + > > +static struct of_device_id mx25_tcq_ids[] = { > > + { .compatible = "fsl,imx25-tcq", }, > > + { /* Senitel */ } > > +}; > > + > > +#define TSC_4WIRE_PRE_INDEX 0 > > +#define TSC_4WIRE_X_INDEX 1 > > +#define TSC_4WIRE_Y_INDEX 2 > > +#define TSC_4WIRE_POST_INDEX 3 > > +#define TSC_4WIRE_LEAVE 4 > > + > > +#define MX25_TSC_DEF_THRESHOLD 80 > > +#define TSC_MAX_SAMPLES 16 > > + > > + > > +enum mx25_adc_configurations { > > + MX25_CFG_PRECHARGE = 0, > > + MX25_CFG_TOUCH_DETECT, > > + MX25_CFG_X_MEASUREMENT, > > + MX25_CFG_Y_MEASUREMENT, > > +}; > > + > > +#define MX25_PRECHARGE_VALUE (\ > > + MX25_ADCQ_CFG_YPLL_OFF | \ > > + MX25_ADCQ_CFG_XNUR_OFF | \ > > + MX25_ADCQ_CFG_XPUL_HIGH | \ > > + MX25_ADCQ_CFG_REFP_INT | \ > > + MX25_ADCQ_CFG_IN_XP | \ > > + MX25_ADCQ_CFG_REFN_NGND2 | \ > > + MX25_ADCQ_CFG_IGS) > > + > > +#define MX25_TOUCH_DETECT_VALUE (\ > > + MX25_ADCQ_CFG_YNLR | \ > > + MX25_ADCQ_CFG_YPLL_OFF | \ > > + MX25_ADCQ_CFG_XNUR_OFF | \ > > + MX25_ADCQ_CFG_XPUL_OFF | \ > > + MX25_ADCQ_CFG_REFP_INT | \ > > + MX25_ADCQ_CFG_IN_XP | \ > > + MX25_ADCQ_CFG_REFN_NGND2 | \ > > + MX25_ADCQ_CFG_PENIACK) > > + > > +static void imx25_setup_queue_cfgs(struct mx25_tcq_priv *priv, > > + unsigned int settling_time) > > +{ > > + u32 precharge_cfg = > > + MX25_PRECHARGE_VALUE | > > + MX25_ADCQ_CFG_SETTLING_TIME(settling_time); > > + u32 touch_detect_cfg = > > + MX25_TOUCH_DETECT_VALUE | > > + MX25_ADCQ_CFG_NOS(1) | > > + MX25_ADCQ_CFG_SETTLING_TIME(settling_time); > > + > > + regmap_write(priv->core_regs, MX25_TSC_TICR, precharge_cfg); > > + > > + /* PRECHARGE */ > > + regmap_write(priv->regs, MX25_ADCQ_CFG(MX25_CFG_PRECHARGE), > > + precharge_cfg); > > + > > + /* TOUCH_DETECT */ > > + regmap_write(priv->regs, MX25_ADCQ_CFG(MX25_CFG_TOUCH_DETECT), > > + touch_detect_cfg); > > + > > + /* X Measurement */ > > + regmap_write(priv->regs, MX25_ADCQ_CFG(MX25_CFG_X_MEASUREMENT), > > + MX25_ADCQ_CFG_YPLL_OFF | > > + MX25_ADCQ_CFG_XNUR_LOW | > > + MX25_ADCQ_CFG_XPUL_HIGH | > > + MX25_ADCQ_CFG_REFP_XP | > > + MX25_ADCQ_CFG_IN_YP | > > + MX25_ADCQ_CFG_REFN_XN | > > + MX25_ADCQ_CFG_NOS(priv->sample_count) | > > + MX25_ADCQ_CFG_SETTLING_TIME(settling_time)); > > + > > + /* Y Measurement */ > > + regmap_write(priv->regs, MX25_ADCQ_CFG(MX25_CFG_Y_MEASUREMENT), > > + MX25_ADCQ_CFG_YNLR | > > + MX25_ADCQ_CFG_YPLL_HIGH | > > + MX25_ADCQ_CFG_XNUR_OFF | > > + MX25_ADCQ_CFG_XPUL_OFF | > > + MX25_ADCQ_CFG_REFP_YP | > > + MX25_ADCQ_CFG_IN_XP | > > + MX25_ADCQ_CFG_REFN_YN | > > + MX25_ADCQ_CFG_NOS(priv->sample_count) | > > + MX25_ADCQ_CFG_SETTLING_TIME(settling_time)); > > + > > + /* Enable the touch detection right now */ > > + regmap_write(priv->core_regs, MX25_TSC_TICR, touch_detect_cfg | > > + MX25_ADCQ_CFG_IGS); > > +} > > + > > +static int imx25_setup_queue_4wire(struct mx25_tcq_priv *priv, > > + unsigned settling_time, int *items) > > +{ > > + imx25_setup_queue_cfgs(priv, settling_time); > > + > > + /* Setup the conversion queue */ > > + regmap_write(priv->regs, MX25_ADCQ_ITEM_7_0, > > + MX25_ADCQ_ITEM(0, MX25_CFG_PRECHARGE) | > > + MX25_ADCQ_ITEM(1, MX25_CFG_TOUCH_DETECT) | > > + MX25_ADCQ_ITEM(2, MX25_CFG_X_MEASUREMENT) | > > + MX25_ADCQ_ITEM(3, MX25_CFG_Y_MEASUREMENT) | > > + MX25_ADCQ_ITEM(4, MX25_CFG_PRECHARGE) | > > + MX25_ADCQ_ITEM(5, MX25_CFG_TOUCH_DETECT)); > > + > > + /* We measure X/Y with 'sample_count' number of samples and execute a > > + * touch detection twice, with 1 sample each */ > > + priv->expected_samples = priv->sample_count * 2 + 2; > > + *items = 6; > > + > > + return 0; > > +} > > + > > +static void mx25_tcq_disable_touch_irq(struct mx25_tcq_priv *priv) > > +{ > > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_PDMSK, > > + MX25_ADCQ_CR_PDMSK); > > +} > > + > > +static void mx25_tcq_enable_touch_irq(struct mx25_tcq_priv *priv) > > +{ > > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_PDMSK, 0); > > +} > > + > > +static void mx25_tcq_disable_fifo_irq(struct mx25_tcq_priv *priv) > > +{ > > + regmap_update_bits(priv->regs, MX25_ADCQ_MR, MX25_ADCQ_MR_FDRY_IRQ, > > + MX25_ADCQ_MR_FDRY_IRQ); > > +} > > + > > +static void mx25_tcq_enable_fifo_irq(struct mx25_tcq_priv *priv) > > +{ > > + regmap_update_bits(priv->regs, MX25_ADCQ_MR, MX25_ADCQ_MR_FDRY_IRQ, 0); > > +} > > + > > +static void mx25_tcq_force_queue_start(struct mx25_tcq_priv *priv) > > +{ > > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FQS, > > + MX25_ADCQ_CR_FQS); > > + > > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FQS, 0); > > +} > > + > > +static void mx25_tcq_force_queue_stop(struct mx25_tcq_priv *priv) > > +{ > > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FQS, 0); > > +} > > + > > +static void mx25_tcq_fifo_reset(struct mx25_tcq_priv *priv) > > +{ > > + u32 tcqcr; > > + > > + regmap_read(priv->regs, MX25_ADCQ_CR, &tcqcr); > > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FRST, > > + MX25_ADCQ_CR_FRST); > > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FRST, > > + 0); > > + regmap_write(priv->regs, MX25_ADCQ_CR, tcqcr); > > +} > > + > > +static void mx25_tcq_re_enable_touch_detection(struct mx25_tcq_priv *priv) > > +{ > > + /* stop the queue from looping */ > > + mx25_tcq_force_queue_stop(priv); > > + > > + /* for a clean touch detection, preload the X plane */ > > + regmap_write(priv->core_regs, MX25_TSC_TICR, MX25_PRECHARGE_VALUE); > > + > > + /* waste some time now to pre-load the X plate to high voltage */ > > + mx25_tcq_fifo_reset(priv); > > + > > + /* re-enable the detection right now */ > > + regmap_write(priv->core_regs, MX25_TSC_TICR, MX25_TOUCH_DETECT_VALUE | > > + MX25_ADCQ_CFG_IGS); > > + > > + regmap_update_bits(priv->regs, MX25_ADCQ_SR, MX25_ADCQ_SR_PD, > > + MX25_ADCQ_SR_PD); > > + > > + /* enable the pen down event to be a source for the interrupt */ > > + regmap_update_bits(priv->regs, MX25_ADCQ_MR, MX25_ADCQ_MR_PD_IRQ, 0); > > + > > + /* lets fire the next IRQ if someone touches the touchscreen */ > > + mx25_tcq_enable_touch_irq(priv); > > +} > > + > > +static int mx25_tcq_create_event_for_4wire(struct mx25_tcq_priv *priv, > > + u32 *sample_buf, int samples) > > +{ > > + unsigned int x_pos = 0; > > + unsigned int y_pos = 0; > > + unsigned int touch_pre = 0; > > + unsigned int touch_post = 0; > > + unsigned i; > > + int ret = 0; > > + > > + for (i = 0; i < samples; i++) { > > + unsigned int index = MX25_ADCQ_FIFO_ID(sample_buf[i]); > > + unsigned int val = MX25_ADCQ_FIFO_DATA(sample_buf[i]); > > + > > + switch (index) { > > + case 1: > > + touch_pre = val; > > + break; > > + case 2: > > + x_pos = val; > > + break; > > + case 3: > > + y_pos = val; > > + break; > > + case 5: > > + touch_post = val; > > + break; > > + default: > > + ret = -EINVAL; > > + break; > > + } > > + } > > + > > + if (ret == 0 && samples != 0) { > > + /* > > + * only if both touch measures are below a treshold, > > + * the position is valid > > + */ > > + if (touch_pre < priv->pen_threshold && > > + touch_post < priv->pen_threshold) { > > + /* valid samples, generate a report */ > > + x_pos /= priv->sample_count; > > + y_pos /= priv->sample_count; > > + input_report_abs(priv->idev, ABS_X, x_pos); > > + input_report_abs(priv->idev, ABS_Y, y_pos); > > + input_report_key(priv->idev, BTN_TOUCH, > > + 0xfff - ((touch_pre + touch_post) / 2)); > > Hmm, are you trying to report pressure here? No this is only to detect touches, not pressure. Reporting pressure would require a different, more complex conversion queue. > > > + input_sync(priv->idev); > > + > > + /* get next sample */ > > + mx25_tcq_force_queue_start(priv); > > + mx25_tcq_enable_fifo_irq(priv); > > + } else { > > + if (touch_pre >= priv->pen_threshold && > > You can convert this to "else if" and save indentation level here. Fixed. > > > + touch_post >= priv->pen_threshold) { > > + /* > > + * if both samples are invalid, > > + * generate a release report > > + */ > > + input_report_key(priv->idev, BTN_TOUCH, 0); > > + input_sync(priv->idev); > > + mx25_tcq_re_enable_touch_detection(priv); > > + } else { > > + /* > > + * if only one of both touch measurements are > > + * below the threshold, still some bouncing > > + * happens. Take additional samples in this > > + * case to be sure > > + */ > > + mx25_tcq_force_queue_start(priv); > > + mx25_tcq_enable_fifo_irq(priv); > > + } > > + } > > + } > > + > > + return ret; > > +} > > + > > +static irqreturn_t mx25_tcq_irq_thread(int irq, void *dev_id) > > +{ > > + struct mx25_tcq_priv *priv = (struct mx25_tcq_priv *) dev_id; > > + u32 sample_buf[TSC_MAX_SAMPLES]; > > + int samples = 0; > > + > > + /* read all samples */ > > + while (1) { > > + u32 stats; > > + > > + regmap_read(priv->regs, MX25_ADCQ_SR, &stats); > > Error handling for I/O operations? This is memory mapped io. It only returns an error when the clock enable operation fails. As regmap is not configured to use a clock for this driver, I would prefer to not use error handling for regmap_read/write. > > > + if (stats & MX25_ADCQ_SR_EMPT) > > + break; > > + > > + if (samples < TSC_MAX_SAMPLES) { > > + regmap_read(priv->regs, MX25_ADCQ_FIFO, > > + &sample_buf[samples]); > > + ++samples; > > + } else { > > + u32 discarded; > > + /* discard samples */ > > + regmap_read(priv->regs, MX25_ADCQ_FIFO, &discarded); > > Should there be some upper bound for number of discarded samples? I just noticed that we do not repeat the conversion queue. The bit is not set, so all the repeat code can be removed. This also means that the conversion is stopped when we reach the end of the conversion queue and this should not need an additional upper bound for discarded samples. > > > + } > > + } > > + > > + mx25_tcq_create_event_for_4wire(priv, sample_buf, samples); > > + > > + return IRQ_HANDLED; > > +} > > + > > +static irqreturn_t mx25_tcq_irq(int irq, void *dev_id) > > +{ > > + struct mx25_tcq_priv *priv = (struct mx25_tcq_priv *)dev_id; > > + u32 stat; > > + int ret = IRQ_HANDLED; > > + > > + regmap_read(priv->regs, MX25_ADCQ_SR, &stat); > > + > > + if (stat & (MX25_ADCQ_SR_FRR | MX25_ADCQ_SR_FUR | MX25_ADCQ_SR_FOR)) > > + mx25_tcq_fifo_reset(priv); > > + > > + if (stat & MX25_ADCQ_SR_PD) { > > + mx25_tcq_disable_touch_irq(priv); > > + mx25_tcq_force_queue_start(priv); > > + mx25_tcq_enable_fifo_irq(priv); > > + } > > + > > + if (stat & MX25_ADCQ_SR_FDRY) { > > + mx25_tcq_disable_fifo_irq(priv); > > + ret = IRQ_WAKE_THREAD; > > + } > > + > > + regmap_update_bits(priv->regs, MX25_ADCQ_SR, MX25_ADCQ_SR_FRR | > > + MX25_ADCQ_SR_FUR | MX25_ADCQ_SR_FOR | MX25_ADCQ_SR_PD | > > + MX25_ADCQ_SR_EOQ, > > + MX25_ADCQ_SR_FRR | > > + MX25_ADCQ_SR_FUR | MX25_ADCQ_SR_FOR | MX25_ADCQ_SR_PD | > > + MX25_ADCQ_SR_EOQ); > > + > > + return ret; > > +} > > + > > +/* configure the statemachine for a 4-wire touchscreen */ > > +static int mx25_tcq_init(struct mx25_tcq_priv *priv) > > +{ > > + u32 tgcr; > > + unsigned int ipg_div; > > + unsigned int adc_period; > > + unsigned int repeat_wait; > > + unsigned int debounce_cnt; > > + unsigned int settling_time; > > + int itemct; > > + int ret; > > + > > + regmap_read(priv->core_regs, MX25_TSC_TGCR, &tgcr); > > + ipg_div = max_t(unsigned int, 4, MX25_TGCR_GET_ADCCLK(tgcr)); > > + adc_period = clk_get_rate(priv->clk) / (ipg_div * 2 + 2); > > + repeat_wait = fls(DIV_ROUND_UP(priv->repeat_wait, adc_period)); > > + debounce_cnt = DIV_ROUND_UP(priv->pen_debounce, adc_period * 8) - 1; > > + settling_time = DIV_ROUND_UP(priv->settling_time, adc_period); > > + > > + > > + /* Reset */ > > + regmap_write(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_QRST | > > + MX25_ADCQ_CR_FRST); > > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_QRST | > > + MX25_ADCQ_CR_FRST, 0); > > + > > + /* up to 128 * 8 ADC clocks are possible */ > > + if (debounce_cnt > 127) > > + debounce_cnt = 127; > > + > > + if (repeat_wait > 15) > > + repeat_wait = 15; > > + > > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_RWAIT_MASK, > > + MX25_ADCQ_CR_RWAIT(repeat_wait)); > > + > > + ret = imx25_setup_queue_4wire(priv, 0x0, &itemct); > > + if (ret) > > + return ret; > > + > > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_LITEMID_MASK | > > + MX25_ADCQ_CR_WMRK_MASK, > > + MX25_ADCQ_CR_LITEMID(itemct - 1) | > > + MX25_ADCQ_CR_WMRK(priv->expected_samples - 1)); > > + > > + /* setup debounce count */ > > + regmap_update_bits(priv->core_regs, MX25_TSC_TGCR, > > + MX25_TGCR_PDBTIME_MASK, > > + MX25_TGCR_PDBTIME(debounce_cnt)); > > + > > + /* enable debounce */ > > + regmap_update_bits(priv->core_regs, MX25_TSC_TGCR, MX25_TGCR_PDBEN, > > + MX25_TGCR_PDBEN); > > + regmap_update_bits(priv->core_regs, MX25_TSC_TGCR, MX25_TGCR_PDEN, > > + MX25_TGCR_PDEN); > > + > > + /* enable the engine on demand */ > > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_QSM_FQS, > > + MX25_ADCQ_CR_QSM_FQS); > > + > > + mx25_tcq_re_enable_touch_detection(priv); > > + > > + return 0; > > +} > > + > > +static int mx25_tcq_parse_dt(struct platform_device *pdev, > > + struct mx25_tcq_priv *priv) > > +{ > > + struct device_node *np = pdev->dev.of_node; > > + u32 wires; > > + int ret; > > + > > + /* Setup defaults */ > > + priv->pen_threshold = 500; > > + priv->sample_count = 3; > > + priv->repeat_wait = 15000000; > > + priv->pen_debounce = 1000000; > > + priv->settling_time = 250000; > > + > > + ret = of_property_read_u32(np, "fsl,wires", &wires); > > + if (ret) { > > + dev_err(&pdev->dev, "Failed to find fsl,wires properties\n"); > > + return ret; > > + } > > + > > + if (wires == 4) { > > + priv->mode = MX25_TS_4WIRE; > > + } else { > > + dev_err(&pdev->dev, "%u-wire mode not supported\n", wires); > > + return -EINVAL; > > + } > > + > > + /* These are optional, we don't care about the return values */ > > + of_property_read_u32(np, "fsl,pen-threshold", &priv->pen_threshold); > > + of_property_read_u32(np, "fsl,settling-time", &priv->settling_time); > > + of_property_read_u32(np, "fsl,pen-debounce", &priv->pen_debounce); > > + > > + return 0; > > +} > > + > > +static int mx25_tcq_probe(struct platform_device *pdev) > > +{ > > + struct device *dev = &pdev->dev; > > + struct input_dev *idev; > > + struct mx25_tcq_priv *priv; > > + struct resource *res; > > + void __iomem *mem; > > + int ret; > > + int irq; > > + > > + priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); > > + if (!priv) > > + return -ENOMEM; > > + > > + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > > + mem = devm_ioremap_resource(dev, res); > > + if (!mem) { > > + dev_err(dev, "Failed to get iomem"); > > + return -ENOMEM; > > + } > > + > > + ret = mx25_tcq_parse_dt(pdev, priv); > > + if (ret) > > + return ret; > > + > > + priv->regs = devm_regmap_init_mmio(dev, mem, &mx25_tcq_regconfig); > > + if (IS_ERR(priv->regs)) { > > + dev_err(dev, "Failed to initialize regmap\n"); > > + return PTR_ERR(priv->regs); > > + } > > + > > + irq = platform_get_irq(pdev, 0); > > + if (irq < 0) { > > + dev_err(dev, "Failed to get IRQ\n"); > > + return irq; > > + } > > + > > + ret = devm_request_threaded_irq(dev, irq, mx25_tcq_irq, > > + mx25_tcq_irq_thread, IRQF_ONESHOT, pdev->name, priv); > > + if (ret) { > > + dev_err(dev, "Failed requesting IRQ\n"); > > + return ret; > > + } > > Are we sure the device is quiesce here? Otherwise interrupts will start > coming but input device is not there yet. I moved it to the end of the probe function just before tcq_init where the interrupts are enabled. > > > + > > + idev = devm_input_allocate_device(dev); > > + if (!idev) { > > + dev_err(dev, "Failed to allocate input device\n"); > > + return -ENOMEM; > > + } > > + > > + idev->name = mx25_tcq_name; > > + idev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS); > > + idev->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH); > > + input_set_abs_params(idev, ABS_X, 0, 0xfff, 0, 0); > > + input_set_abs_params(idev, ABS_Y, 0, 0xfff, 0, 0); > > + > > + idev->id.bustype = BUS_HOST; > > + > > + ret = input_register_device(idev); > > + if (ret) { > > + dev_err(dev, "Failed to register input device\n"); > > + return ret; > > + } > > + > > + priv->idev = idev; > > + > > + priv->core_regs = mx25_tsadc_get_regmap(pdev->dev.parent); > > + priv->clk = mx25_tsadc_get_ipg(pdev->dev.parent); > > + > > + ret = clk_prepare_enable(priv->clk); > > + if (ret) { > > + dev_err(dev, "Failed to enable ipg clock\n"); > > + return ret; > > + } > > + > > + ret = mx25_tcq_init(priv); > > + if (ret) { > > + dev_err(dev, "Failed to init tcq\n"); > > + goto error_tcq_init; > > + } > > + > > + platform_set_drvdata(pdev, priv); > > + > > + return 0; > > + > > +error_tcq_init: > > + clk_disable_unprepare(priv->clk); > > + return ret; > > +} > > + > > +static int mx25_tcq_remove(struct platform_device *pdev) > > +{ > > + struct mx25_tcq_priv *priv = platform_get_drvdata(pdev); > > + > > + clk_disable_unprepare(priv->clk); > > Hmm, if you disable clk all other operations will likely to fail. We > really need devm clk interface, I guess I need to dust off my old > patch... > > > + > > + return 0; > > +} > > + > > +static struct platform_driver mx25_tcq_driver = { > > + .driver = { > > + .name = "mx25-tcq", > > + .owner = THIS_MODULE, > > + .of_match_table = mx25_tcq_ids, > > + }, > > + .probe = mx25_tcq_probe, > > + .remove = mx25_tcq_remove, > > +}; > > +module_platform_driver(mx25_tcq_driver); > > + > > +MODULE_DESCRIPTION("TS input driver for Freescale mx25"); > > +MODULE_AUTHOR("Markus Pargmann <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>"); > > +MODULE_LICENSE("GPL v2"); > > -- > > 1.8.5.3 > > Thanks, Markus -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140225/57b05a15/attachment-0001.sig> ^ permalink raw reply [flat|nested] 76+ messages in thread
[parent not found: <1392913312-9030-1-git-send-email-mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>]
* [PATCH 3/3] iio: adc: fsl,imx25-gcq driver 2014-02-20 16:21 ` Markus Pargmann (?) @ 2014-02-20 16:21 ` Markus Pargmann -1 siblings, 0 replies; 76+ messages in thread From: Markus Pargmann @ 2014-02-20 16:21 UTC (permalink / raw) To: devicetree-u79uwXL29TY76Z2rM5mHXA, linux-input-u79uwXL29TY76Z2rM5mHXA, linux-iio-u79uwXL29TY76Z2rM5mHXA Cc: Dmitry Torokhov, Samuel Ortiz, Lee Jones, Jonathan Cameron, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, kernel-bIcnvbaLZ9MEGnE8C9+IrQ, Markus Pargmann This is a conversion queue driver for the mx25 SoC. It uses the central ADC which is used by two seperate independent queues. This driver prepares different conversion configurations for each possible input. For a conversion it creates a conversionqueue of one item with the correct configuration for the chosen channel. It then executes the queue once and disables the conversion queue afterwards. The reference voltages are configurable through devicetree subnodes, depending on the connections of the ADC inputs. Signed-off-by: Markus Pargmann <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> --- .../devicetree/bindings/iio/adc/fsl,imx25-gcq.txt | 54 ++++ drivers/iio/adc/Kconfig | 7 + drivers/iio/adc/Makefile | 1 + drivers/iio/adc/fsl-imx25-gcq.c | 325 +++++++++++++++++++++ 4 files changed, 387 insertions(+) create mode 100644 Documentation/devicetree/bindings/iio/adc/fsl,imx25-gcq.txt create mode 100644 drivers/iio/adc/fsl-imx25-gcq.c diff --git a/Documentation/devicetree/bindings/iio/adc/fsl,imx25-gcq.txt b/Documentation/devicetree/bindings/iio/adc/fsl,imx25-gcq.txt new file mode 100644 index 0000000..333fc55 --- /dev/null +++ b/Documentation/devicetree/bindings/iio/adc/fsl,imx25-gcq.txt @@ -0,0 +1,54 @@ +Freescale i.MX25 ADC GCQ device + +This is a generic conversion queue device that can convert any of the analog +inputs using the ADC unit of the i.MX25. + +Required properties: + - compatible: Should be "fsl,imx25-gcq". + - reg: Should be the register range of the module. + - interrupts: Should be the interrupt number of the module. Typically this is <1>. + - interrupt-parent: phandle to the tsadc module of the i.MX25. + - #address-cells: Should be <1> (setting for the subnodes) + - #size-cells: Should be <0> (setting for the subnodes) + +Optionally you can define subnodes which define the positive and negative +reference voltage for one of the analog inputs. + +Required properties for subnodes: + - reg: Should be the number of the analog input. + 0: xp + 1: yp + 2: xn + 3: yn + 4: wiper + 5: inaux0 + 6: inaux1 + 7: inaux2 + - fsl,adc-refp: Positive reference input + 0: yp + 1: xp + 2: External reference + 3: Internal reference + - fsl,adc-refn: Negative reference input + 0: xn + 1: yn + 2: ngnd_adc + 3: ngnd_adc + + +Example: + + adc: adc@50030800 { + compatible = "fsl,imx25-gcq"; + reg = <0x50030800 0x60>; + interrupt-parent = <&tscadc>; + interrupts = <1>; + #address-cells = <1>; + #size-cells = <0>; + + inaux@5 { + reg = <5>; + fsl,adc-refp = <3>; + fsl,adc-refn = <3>; + }; + }; diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig index 2209f28..a421445 100644 --- a/drivers/iio/adc/Kconfig +++ b/drivers/iio/adc/Kconfig @@ -113,6 +113,13 @@ config EXYNOS_ADC of SoCs for drivers such as the touchscreen and hwmon to use to share this resource. +config MX25_ADC + tristate "Freescale MX25 ADC driver" + depends on MFD_MX25_TSADC + help + Generic Conversion Queue driver used for general purpose ADC in the + MX25. This driver supports single measurements using the MX25 ADC. + config LP8788_ADC bool "LP8788 ADC driver" depends on MFD_LP8788 diff --git a/drivers/iio/adc/Makefile b/drivers/iio/adc/Makefile index ba9a10a..63daa2c 100644 --- a/drivers/iio/adc/Makefile +++ b/drivers/iio/adc/Makefile @@ -22,3 +22,4 @@ obj-$(CONFIG_TI_ADC081C) += ti-adc081c.o obj-$(CONFIG_TI_AM335X_ADC) += ti_am335x_adc.o obj-$(CONFIG_TWL6030_GPADC) += twl6030-gpadc.o obj-$(CONFIG_VIPERBOARD_ADC) += viperboard_adc.o +obj-$(CONFIG_MX25_ADC) += fsl-imx25-gcq.o diff --git a/drivers/iio/adc/fsl-imx25-gcq.c b/drivers/iio/adc/fsl-imx25-gcq.c new file mode 100644 index 0000000..cc7f87f --- /dev/null +++ b/drivers/iio/adc/fsl-imx25-gcq.c @@ -0,0 +1,325 @@ +/* + * Copyright 2014 Markus Pargmann, Pengutronix <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> + * + * The code contained herein is licensed under the GNU General Public + * License. You may obtain a copy of the GNU General Public License + * Version 2 or later at the following locations: + * + * http://www.opensource.org/licenses/gpl-license.html + * http://www.gnu.org/copyleft/gpl.html + * + * This is the driver for the imx25 GCQ (Generic Conversion Queue) + * connected to the imx25 ADC. + */ + +#include <linux/clk.h> +#include <linux/interrupt.h> +#include <linux/iio/iio.h> +#include <linux/mfd/imx25-tsadc.h> +#include <linux/module.h> +#include <linux/of.h> +#include <linux/platform_device.h> +#include <linux/regmap.h> + +#define MX25_GCQ_TIMEOUT (msecs_to_jiffies(2000)) + +enum mx25_gcq_cfgs { + MX25_CFG_XP = 0, + MX25_CFG_YP, + MX25_CFG_XN, + MX25_CFG_YN, + MX25_CFG_WIPER, + MX25_CFG_INAUX0, + MX25_CFG_INAUX1, + MX25_CFG_INAUX2, + MX25_NUM_CFGS, +}; + +struct mx25_gcq_priv { + struct regmap *regs; + struct completion completed; + unsigned int settling_time; + struct clk *clk; +}; + +#define MX25_IIO_CHAN(chan, id) {\ + .type = IIO_VOLTAGE,\ + .indexed = 1,\ + .channel = chan,\ + .address = chan,\ + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \ + .datasheet_name = id, \ + } + +const struct iio_chan_spec mx25_gcq_channels[MX25_NUM_CFGS] = { + MX25_IIO_CHAN(0, "xp"), + MX25_IIO_CHAN(1, "yp"), + MX25_IIO_CHAN(2, "xn"), + MX25_IIO_CHAN(3, "yn"), + MX25_IIO_CHAN(4, "wiper"), + MX25_IIO_CHAN(5, "inaux0"), + MX25_IIO_CHAN(6, "inaux1"), + MX25_IIO_CHAN(7, "inaux2"), +}; + +static void mx25_gcq_disable_eoq(struct mx25_gcq_priv *priv) +{ + regmap_update_bits(priv->regs, MX25_ADCQ_MR, MX25_ADCQ_MR_EOQ_IRQ, + MX25_ADCQ_MR_EOQ_IRQ); +} + +static void mx25_gcq_enable_eoq(struct mx25_gcq_priv *priv) +{ + regmap_update_bits(priv->regs, MX25_ADCQ_MR, MX25_ADCQ_MR_EOQ_IRQ, 0); +} + +static irqreturn_t mx25_gcq_irq(int irq, void *data) +{ + struct mx25_gcq_priv *priv = data; + u32 stats; + + regmap_read(priv->regs, MX25_ADCQ_SR, &stats); + + if (stats & MX25_ADCQ_SR_EOQ) { + mx25_gcq_disable_eoq(priv); + complete(&priv->completed); + } + + /* Disable conversion queue run */ + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FQS, 0); + + /* Acknowledge all possible irqs */ + regmap_write(priv->regs, MX25_ADCQ_SR, MX25_ADCQ_SR_FRR | + MX25_ADCQ_SR_FUR | MX25_ADCQ_SR_FOR | MX25_ADCQ_SR_EOQ | + MX25_ADCQ_SR_PD); + + return IRQ_HANDLED; +} + +static int mx25_gcq_read_raw(struct iio_dev *idev, + struct iio_chan_spec const *chan, int *val, int *val2, + long mask) +{ + struct mx25_gcq_priv *priv = iio_priv(idev); + unsigned long timeout; + u32 data; + int ret; + + if (mask != IIO_CHAN_INFO_RAW) + return -EINVAL; + + mutex_lock(&idev->mlock); + + /* Setup the configuration we want to use */ + regmap_write(priv->regs, MX25_ADCQ_ITEM_7_0, + MX25_ADCQ_ITEM(0, chan->address)); + + mx25_gcq_enable_eoq(priv); + + /* Trigger queue for one run */ + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FQS, + MX25_ADCQ_CR_FQS); + + timeout = wait_for_completion_interruptible_timeout(&priv->completed, + MX25_GCQ_TIMEOUT); + if (timeout < 0) { + dev_err(&idev->dev, "ADC wait for measurement failed\n"); + ret = timeout; + goto out; + } else if (timeout == 0) { + dev_err(&idev->dev, "ADC timed out\n"); + ret = -ETIMEDOUT; + goto out; + } + + regmap_read(priv->regs, MX25_ADCQ_FIFO, &data); + *val = MX25_ADCQ_FIFO_DATA(data); + + ret = IIO_VAL_INT; + +out: + mutex_unlock(&idev->mlock); + + return ret; +} + +struct iio_info mx25_gcq_iio_info = { + .read_raw = mx25_gcq_read_raw, +}; + +static struct regmap_config mx25_gcq_regconfig = { + .fast_io = true, + .max_register = 0x5c, + .reg_bits = 32, + .val_bits = 32, + .reg_stride = 4, +}; + +static void mx25_gcq_iio_dev_setup(struct platform_device *pdev, + struct iio_dev *idev) +{ + idev->dev.parent = &pdev->dev; + idev->channels = mx25_gcq_channels; + idev->num_channels = ARRAY_SIZE(mx25_gcq_channels); + idev->info = &mx25_gcq_iio_info; +} + +static int mx25_gcq_setup_cfgs(struct platform_device *pdev, + struct mx25_gcq_priv *priv) +{ + struct device_node *np = pdev->dev.of_node; + struct device_node *child; + struct device *dev = &pdev->dev; + int ret; + int i; + + /* Setup all configurations registers with a default conversion + * configuration for each input */ + for (i = 0; i != MX25_NUM_CFGS; ++i) + regmap_write(priv->regs, MX25_ADCQ_CFG(i), + MX25_ADCQ_CFG_YPLL_OFF | + MX25_ADCQ_CFG_XNUR_OFF | + MX25_ADCQ_CFG_XPUL_OFF | + MX25_ADCQ_CFG_REFP_INT | + (i << 4) | + MX25_ADCQ_CFG_REFN_NGND2); + + for_each_child_of_node(np, child) { + u32 reg; + u32 refn; + u32 refp; + + ret = of_property_read_u32(child, "reg", ®); + if (ret) { + dev_err(dev, "Failed to get reg property\n"); + return ret; + } + if (reg > MX25_NUM_CFGS) { + dev_err(dev, "reg value is greater than the number of available configuration registers\n"); + return -EINVAL; + } + + ret = of_property_read_u32(child, "fsl,adc-refn", &refn); + if (ret) { + dev_err(dev, "Failed to get fsl,adc-refn property\n"); + return ret; + } + + ret = of_property_read_u32(child, "fsl,adc-refp", &refp); + if (ret) { + dev_err(dev, "Failed to get fsl,adc-refp property\n"); + return ret; + } + + regmap_update_bits(priv->regs, MX25_ADCQ_CFG(reg), + MX25_ADCQ_CFG_REFP_MASK | + MX25_ADCQ_CFG_REFN_MASK, + (refp << 7) | (refn << 2)); + } + regmap_update_bits(priv->regs, MX25_ADCQ_CR, + MX25_ADCQ_CR_FRST | MX25_ADCQ_CR_QRST, + MX25_ADCQ_CR_FRST | MX25_ADCQ_CR_QRST); + + regmap_write(priv->regs, MX25_ADCQ_CR, + MX25_ADCQ_CR_PDMSK | + MX25_ADCQ_CR_QSM_FQS); + + return 0; +} + +static int mx25_gcq_probe(struct platform_device *pdev) +{ + struct iio_dev *idev; + struct mx25_gcq_priv *priv; + struct resource *res; + struct device *dev = &pdev->dev; + int ret; + int irq; + void __iomem *mem; + + idev = devm_iio_device_alloc(&pdev->dev, sizeof(*priv)); + if (!idev) + return -ENOMEM; + + priv = iio_priv(idev); + + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + mem = devm_ioremap_resource(dev, res); + if (!mem) { + dev_err(dev, "Failed to get iomem"); + return -ENOMEM; + } + + priv->regs = devm_regmap_init_mmio(dev, mem, &mx25_gcq_regconfig); + if (IS_ERR(priv->regs)) { + dev_err(dev, "Failed to initialize regmap\n"); + return PTR_ERR(priv->regs); + } + + irq = platform_get_irq(pdev, 0); + if (irq < 0) { + dev_err(dev, "Failed to get IRQ\n"); + return irq; + } + + ret = devm_request_irq(dev, irq, mx25_gcq_irq, IRQF_ONESHOT, pdev->name, + priv); + if (ret) { + dev_err(dev, "Failed requesting IRQ\n"); + return ret; + } + + ret = mx25_gcq_setup_cfgs(pdev, priv); + if (ret) + return ret; + + mx25_gcq_iio_dev_setup(pdev, idev); + + ret = iio_device_register(idev); + if (ret) { + dev_err(dev, "Failed to register iio device\n"); + return ret; + } + + init_completion(&priv->completed); + + priv->clk = mx25_tsadc_get_ipg(pdev->dev.parent); + ret = clk_prepare_enable(priv->clk); + if (ret) { + dev_err(dev, "Failed to enable clock\n"); + return ret; + } + + platform_set_drvdata(pdev, priv); + + return 0; +} + +static int mx25_gcq_remove(struct platform_device *pdev) +{ + struct mx25_gcq_priv *priv = platform_get_drvdata(pdev); + + clk_disable_unprepare(priv->clk); + + return 0; +} + +static struct of_device_id mx25_gcq_ids[] = { + { .compatible = "fsl,imx25-gcq", }, + { /* Senitel */ } +}; + +static struct platform_driver mx25_gcq_driver = { + .driver = { + .name = "mx25-gcq", + .owner = THIS_MODULE, + .of_match_table = mx25_gcq_ids, + }, + .probe = mx25_gcq_probe, + .remove = mx25_gcq_remove, +}; +module_platform_driver(mx25_gcq_driver); + +MODULE_DESCRIPTION("ADC driver for Freescale mx25"); +MODULE_AUTHOR("Markus Pargmann <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>"); +MODULE_LICENSE("GPL v2"); -- 1.8.5.3 ^ permalink raw reply related [flat|nested] 76+ messages in thread
* [PATCH 3/3] iio: adc: fsl,imx25-gcq driver @ 2014-02-20 16:21 ` Markus Pargmann 0 siblings, 0 replies; 76+ messages in thread From: Markus Pargmann @ 2014-02-20 16:21 UTC (permalink / raw) To: linux-arm-kernel This is a conversion queue driver for the mx25 SoC. It uses the central ADC which is used by two seperate independent queues. This driver prepares different conversion configurations for each possible input. For a conversion it creates a conversionqueue of one item with the correct configuration for the chosen channel. It then executes the queue once and disables the conversion queue afterwards. The reference voltages are configurable through devicetree subnodes, depending on the connections of the ADC inputs. Signed-off-by: Markus Pargmann <mpa@pengutronix.de> --- .../devicetree/bindings/iio/adc/fsl,imx25-gcq.txt | 54 ++++ drivers/iio/adc/Kconfig | 7 + drivers/iio/adc/Makefile | 1 + drivers/iio/adc/fsl-imx25-gcq.c | 325 +++++++++++++++++++++ 4 files changed, 387 insertions(+) create mode 100644 Documentation/devicetree/bindings/iio/adc/fsl,imx25-gcq.txt create mode 100644 drivers/iio/adc/fsl-imx25-gcq.c diff --git a/Documentation/devicetree/bindings/iio/adc/fsl,imx25-gcq.txt b/Documentation/devicetree/bindings/iio/adc/fsl,imx25-gcq.txt new file mode 100644 index 0000000..333fc55 --- /dev/null +++ b/Documentation/devicetree/bindings/iio/adc/fsl,imx25-gcq.txt @@ -0,0 +1,54 @@ +Freescale i.MX25 ADC GCQ device + +This is a generic conversion queue device that can convert any of the analog +inputs using the ADC unit of the i.MX25. + +Required properties: + - compatible: Should be "fsl,imx25-gcq". + - reg: Should be the register range of the module. + - interrupts: Should be the interrupt number of the module. Typically this is <1>. + - interrupt-parent: phandle to the tsadc module of the i.MX25. + - #address-cells: Should be <1> (setting for the subnodes) + - #size-cells: Should be <0> (setting for the subnodes) + +Optionally you can define subnodes which define the positive and negative +reference voltage for one of the analog inputs. + +Required properties for subnodes: + - reg: Should be the number of the analog input. + 0: xp + 1: yp + 2: xn + 3: yn + 4: wiper + 5: inaux0 + 6: inaux1 + 7: inaux2 + - fsl,adc-refp: Positive reference input + 0: yp + 1: xp + 2: External reference + 3: Internal reference + - fsl,adc-refn: Negative reference input + 0: xn + 1: yn + 2: ngnd_adc + 3: ngnd_adc + + +Example: + + adc: adc at 50030800 { + compatible = "fsl,imx25-gcq"; + reg = <0x50030800 0x60>; + interrupt-parent = <&tscadc>; + interrupts = <1>; + #address-cells = <1>; + #size-cells = <0>; + + inaux at 5 { + reg = <5>; + fsl,adc-refp = <3>; + fsl,adc-refn = <3>; + }; + }; diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig index 2209f28..a421445 100644 --- a/drivers/iio/adc/Kconfig +++ b/drivers/iio/adc/Kconfig @@ -113,6 +113,13 @@ config EXYNOS_ADC of SoCs for drivers such as the touchscreen and hwmon to use to share this resource. +config MX25_ADC + tristate "Freescale MX25 ADC driver" + depends on MFD_MX25_TSADC + help + Generic Conversion Queue driver used for general purpose ADC in the + MX25. This driver supports single measurements using the MX25 ADC. + config LP8788_ADC bool "LP8788 ADC driver" depends on MFD_LP8788 diff --git a/drivers/iio/adc/Makefile b/drivers/iio/adc/Makefile index ba9a10a..63daa2c 100644 --- a/drivers/iio/adc/Makefile +++ b/drivers/iio/adc/Makefile @@ -22,3 +22,4 @@ obj-$(CONFIG_TI_ADC081C) += ti-adc081c.o obj-$(CONFIG_TI_AM335X_ADC) += ti_am335x_adc.o obj-$(CONFIG_TWL6030_GPADC) += twl6030-gpadc.o obj-$(CONFIG_VIPERBOARD_ADC) += viperboard_adc.o +obj-$(CONFIG_MX25_ADC) += fsl-imx25-gcq.o diff --git a/drivers/iio/adc/fsl-imx25-gcq.c b/drivers/iio/adc/fsl-imx25-gcq.c new file mode 100644 index 0000000..cc7f87f --- /dev/null +++ b/drivers/iio/adc/fsl-imx25-gcq.c @@ -0,0 +1,325 @@ +/* + * Copyright 2014 Markus Pargmann, Pengutronix <mpa@pengutronix.de> + * + * The code contained herein is licensed under the GNU General Public + * License. You may obtain a copy of the GNU General Public License + * Version 2 or later at the following locations: + * + * http://www.opensource.org/licenses/gpl-license.html + * http://www.gnu.org/copyleft/gpl.html + * + * This is the driver for the imx25 GCQ (Generic Conversion Queue) + * connected to the imx25 ADC. + */ + +#include <linux/clk.h> +#include <linux/interrupt.h> +#include <linux/iio/iio.h> +#include <linux/mfd/imx25-tsadc.h> +#include <linux/module.h> +#include <linux/of.h> +#include <linux/platform_device.h> +#include <linux/regmap.h> + +#define MX25_GCQ_TIMEOUT (msecs_to_jiffies(2000)) + +enum mx25_gcq_cfgs { + MX25_CFG_XP = 0, + MX25_CFG_YP, + MX25_CFG_XN, + MX25_CFG_YN, + MX25_CFG_WIPER, + MX25_CFG_INAUX0, + MX25_CFG_INAUX1, + MX25_CFG_INAUX2, + MX25_NUM_CFGS, +}; + +struct mx25_gcq_priv { + struct regmap *regs; + struct completion completed; + unsigned int settling_time; + struct clk *clk; +}; + +#define MX25_IIO_CHAN(chan, id) {\ + .type = IIO_VOLTAGE,\ + .indexed = 1,\ + .channel = chan,\ + .address = chan,\ + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \ + .datasheet_name = id, \ + } + +const struct iio_chan_spec mx25_gcq_channels[MX25_NUM_CFGS] = { + MX25_IIO_CHAN(0, "xp"), + MX25_IIO_CHAN(1, "yp"), + MX25_IIO_CHAN(2, "xn"), + MX25_IIO_CHAN(3, "yn"), + MX25_IIO_CHAN(4, "wiper"), + MX25_IIO_CHAN(5, "inaux0"), + MX25_IIO_CHAN(6, "inaux1"), + MX25_IIO_CHAN(7, "inaux2"), +}; + +static void mx25_gcq_disable_eoq(struct mx25_gcq_priv *priv) +{ + regmap_update_bits(priv->regs, MX25_ADCQ_MR, MX25_ADCQ_MR_EOQ_IRQ, + MX25_ADCQ_MR_EOQ_IRQ); +} + +static void mx25_gcq_enable_eoq(struct mx25_gcq_priv *priv) +{ + regmap_update_bits(priv->regs, MX25_ADCQ_MR, MX25_ADCQ_MR_EOQ_IRQ, 0); +} + +static irqreturn_t mx25_gcq_irq(int irq, void *data) +{ + struct mx25_gcq_priv *priv = data; + u32 stats; + + regmap_read(priv->regs, MX25_ADCQ_SR, &stats); + + if (stats & MX25_ADCQ_SR_EOQ) { + mx25_gcq_disable_eoq(priv); + complete(&priv->completed); + } + + /* Disable conversion queue run */ + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FQS, 0); + + /* Acknowledge all possible irqs */ + regmap_write(priv->regs, MX25_ADCQ_SR, MX25_ADCQ_SR_FRR | + MX25_ADCQ_SR_FUR | MX25_ADCQ_SR_FOR | MX25_ADCQ_SR_EOQ | + MX25_ADCQ_SR_PD); + + return IRQ_HANDLED; +} + +static int mx25_gcq_read_raw(struct iio_dev *idev, + struct iio_chan_spec const *chan, int *val, int *val2, + long mask) +{ + struct mx25_gcq_priv *priv = iio_priv(idev); + unsigned long timeout; + u32 data; + int ret; + + if (mask != IIO_CHAN_INFO_RAW) + return -EINVAL; + + mutex_lock(&idev->mlock); + + /* Setup the configuration we want to use */ + regmap_write(priv->regs, MX25_ADCQ_ITEM_7_0, + MX25_ADCQ_ITEM(0, chan->address)); + + mx25_gcq_enable_eoq(priv); + + /* Trigger queue for one run */ + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FQS, + MX25_ADCQ_CR_FQS); + + timeout = wait_for_completion_interruptible_timeout(&priv->completed, + MX25_GCQ_TIMEOUT); + if (timeout < 0) { + dev_err(&idev->dev, "ADC wait for measurement failed\n"); + ret = timeout; + goto out; + } else if (timeout == 0) { + dev_err(&idev->dev, "ADC timed out\n"); + ret = -ETIMEDOUT; + goto out; + } + + regmap_read(priv->regs, MX25_ADCQ_FIFO, &data); + *val = MX25_ADCQ_FIFO_DATA(data); + + ret = IIO_VAL_INT; + +out: + mutex_unlock(&idev->mlock); + + return ret; +} + +struct iio_info mx25_gcq_iio_info = { + .read_raw = mx25_gcq_read_raw, +}; + +static struct regmap_config mx25_gcq_regconfig = { + .fast_io = true, + .max_register = 0x5c, + .reg_bits = 32, + .val_bits = 32, + .reg_stride = 4, +}; + +static void mx25_gcq_iio_dev_setup(struct platform_device *pdev, + struct iio_dev *idev) +{ + idev->dev.parent = &pdev->dev; + idev->channels = mx25_gcq_channels; + idev->num_channels = ARRAY_SIZE(mx25_gcq_channels); + idev->info = &mx25_gcq_iio_info; +} + +static int mx25_gcq_setup_cfgs(struct platform_device *pdev, + struct mx25_gcq_priv *priv) +{ + struct device_node *np = pdev->dev.of_node; + struct device_node *child; + struct device *dev = &pdev->dev; + int ret; + int i; + + /* Setup all configurations registers with a default conversion + * configuration for each input */ + for (i = 0; i != MX25_NUM_CFGS; ++i) + regmap_write(priv->regs, MX25_ADCQ_CFG(i), + MX25_ADCQ_CFG_YPLL_OFF | + MX25_ADCQ_CFG_XNUR_OFF | + MX25_ADCQ_CFG_XPUL_OFF | + MX25_ADCQ_CFG_REFP_INT | + (i << 4) | + MX25_ADCQ_CFG_REFN_NGND2); + + for_each_child_of_node(np, child) { + u32 reg; + u32 refn; + u32 refp; + + ret = of_property_read_u32(child, "reg", ®); + if (ret) { + dev_err(dev, "Failed to get reg property\n"); + return ret; + } + if (reg > MX25_NUM_CFGS) { + dev_err(dev, "reg value is greater than the number of available configuration registers\n"); + return -EINVAL; + } + + ret = of_property_read_u32(child, "fsl,adc-refn", &refn); + if (ret) { + dev_err(dev, "Failed to get fsl,adc-refn property\n"); + return ret; + } + + ret = of_property_read_u32(child, "fsl,adc-refp", &refp); + if (ret) { + dev_err(dev, "Failed to get fsl,adc-refp property\n"); + return ret; + } + + regmap_update_bits(priv->regs, MX25_ADCQ_CFG(reg), + MX25_ADCQ_CFG_REFP_MASK | + MX25_ADCQ_CFG_REFN_MASK, + (refp << 7) | (refn << 2)); + } + regmap_update_bits(priv->regs, MX25_ADCQ_CR, + MX25_ADCQ_CR_FRST | MX25_ADCQ_CR_QRST, + MX25_ADCQ_CR_FRST | MX25_ADCQ_CR_QRST); + + regmap_write(priv->regs, MX25_ADCQ_CR, + MX25_ADCQ_CR_PDMSK | + MX25_ADCQ_CR_QSM_FQS); + + return 0; +} + +static int mx25_gcq_probe(struct platform_device *pdev) +{ + struct iio_dev *idev; + struct mx25_gcq_priv *priv; + struct resource *res; + struct device *dev = &pdev->dev; + int ret; + int irq; + void __iomem *mem; + + idev = devm_iio_device_alloc(&pdev->dev, sizeof(*priv)); + if (!idev) + return -ENOMEM; + + priv = iio_priv(idev); + + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + mem = devm_ioremap_resource(dev, res); + if (!mem) { + dev_err(dev, "Failed to get iomem"); + return -ENOMEM; + } + + priv->regs = devm_regmap_init_mmio(dev, mem, &mx25_gcq_regconfig); + if (IS_ERR(priv->regs)) { + dev_err(dev, "Failed to initialize regmap\n"); + return PTR_ERR(priv->regs); + } + + irq = platform_get_irq(pdev, 0); + if (irq < 0) { + dev_err(dev, "Failed to get IRQ\n"); + return irq; + } + + ret = devm_request_irq(dev, irq, mx25_gcq_irq, IRQF_ONESHOT, pdev->name, + priv); + if (ret) { + dev_err(dev, "Failed requesting IRQ\n"); + return ret; + } + + ret = mx25_gcq_setup_cfgs(pdev, priv); + if (ret) + return ret; + + mx25_gcq_iio_dev_setup(pdev, idev); + + ret = iio_device_register(idev); + if (ret) { + dev_err(dev, "Failed to register iio device\n"); + return ret; + } + + init_completion(&priv->completed); + + priv->clk = mx25_tsadc_get_ipg(pdev->dev.parent); + ret = clk_prepare_enable(priv->clk); + if (ret) { + dev_err(dev, "Failed to enable clock\n"); + return ret; + } + + platform_set_drvdata(pdev, priv); + + return 0; +} + +static int mx25_gcq_remove(struct platform_device *pdev) +{ + struct mx25_gcq_priv *priv = platform_get_drvdata(pdev); + + clk_disable_unprepare(priv->clk); + + return 0; +} + +static struct of_device_id mx25_gcq_ids[] = { + { .compatible = "fsl,imx25-gcq", }, + { /* Senitel */ } +}; + +static struct platform_driver mx25_gcq_driver = { + .driver = { + .name = "mx25-gcq", + .owner = THIS_MODULE, + .of_match_table = mx25_gcq_ids, + }, + .probe = mx25_gcq_probe, + .remove = mx25_gcq_remove, +}; +module_platform_driver(mx25_gcq_driver); + +MODULE_DESCRIPTION("ADC driver for Freescale mx25"); +MODULE_AUTHOR("Markus Pargmann <mpa@pengutronix.de>"); +MODULE_LICENSE("GPL v2"); -- 1.8.5.3 ^ permalink raw reply related [flat|nested] 76+ messages in thread
* [PATCH 3/3] iio: adc: fsl,imx25-gcq driver @ 2014-02-20 16:21 ` Markus Pargmann 0 siblings, 0 replies; 76+ messages in thread From: Markus Pargmann @ 2014-02-20 16:21 UTC (permalink / raw) To: devicetree, linux-input, linux-iio Cc: Dmitry Torokhov, Samuel Ortiz, Lee Jones, Jonathan Cameron, linux-arm-kernel, kernel, Markus Pargmann This is a conversion queue driver for the mx25 SoC. It uses the central ADC which is used by two seperate independent queues. This driver prepares different conversion configurations for each possible input. For a conversion it creates a conversionqueue of one item with the correct configuration for the chosen channel. It then executes the queue once and disables the conversion queue afterwards. The reference voltages are configurable through devicetree subnodes, depending on the connections of the ADC inputs. Signed-off-by: Markus Pargmann <mpa@pengutronix.de> --- .../devicetree/bindings/iio/adc/fsl,imx25-gcq.txt | 54 ++++ drivers/iio/adc/Kconfig | 7 + drivers/iio/adc/Makefile | 1 + drivers/iio/adc/fsl-imx25-gcq.c | 325 +++++++++++++++++++++ 4 files changed, 387 insertions(+) create mode 100644 Documentation/devicetree/bindings/iio/adc/fsl,imx25-gcq.txt create mode 100644 drivers/iio/adc/fsl-imx25-gcq.c diff --git a/Documentation/devicetree/bindings/iio/adc/fsl,imx25-gcq.txt b/Documentation/devicetree/bindings/iio/adc/fsl,imx25-gcq.txt new file mode 100644 index 0000000..333fc55 --- /dev/null +++ b/Documentation/devicetree/bindings/iio/adc/fsl,imx25-gcq.txt @@ -0,0 +1,54 @@ +Freescale i.MX25 ADC GCQ device + +This is a generic conversion queue device that can convert any of the analog +inputs using the ADC unit of the i.MX25. + +Required properties: + - compatible: Should be "fsl,imx25-gcq". + - reg: Should be the register range of the module. + - interrupts: Should be the interrupt number of the module. Typically this is <1>. + - interrupt-parent: phandle to the tsadc module of the i.MX25. + - #address-cells: Should be <1> (setting for the subnodes) + - #size-cells: Should be <0> (setting for the subnodes) + +Optionally you can define subnodes which define the positive and negative +reference voltage for one of the analog inputs. + +Required properties for subnodes: + - reg: Should be the number of the analog input. + 0: xp + 1: yp + 2: xn + 3: yn + 4: wiper + 5: inaux0 + 6: inaux1 + 7: inaux2 + - fsl,adc-refp: Positive reference input + 0: yp + 1: xp + 2: External reference + 3: Internal reference + - fsl,adc-refn: Negative reference input + 0: xn + 1: yn + 2: ngnd_adc + 3: ngnd_adc + + +Example: + + adc: adc@50030800 { + compatible = "fsl,imx25-gcq"; + reg = <0x50030800 0x60>; + interrupt-parent = <&tscadc>; + interrupts = <1>; + #address-cells = <1>; + #size-cells = <0>; + + inaux@5 { + reg = <5>; + fsl,adc-refp = <3>; + fsl,adc-refn = <3>; + }; + }; diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig index 2209f28..a421445 100644 --- a/drivers/iio/adc/Kconfig +++ b/drivers/iio/adc/Kconfig @@ -113,6 +113,13 @@ config EXYNOS_ADC of SoCs for drivers such as the touchscreen and hwmon to use to share this resource. +config MX25_ADC + tristate "Freescale MX25 ADC driver" + depends on MFD_MX25_TSADC + help + Generic Conversion Queue driver used for general purpose ADC in the + MX25. This driver supports single measurements using the MX25 ADC. + config LP8788_ADC bool "LP8788 ADC driver" depends on MFD_LP8788 diff --git a/drivers/iio/adc/Makefile b/drivers/iio/adc/Makefile index ba9a10a..63daa2c 100644 --- a/drivers/iio/adc/Makefile +++ b/drivers/iio/adc/Makefile @@ -22,3 +22,4 @@ obj-$(CONFIG_TI_ADC081C) += ti-adc081c.o obj-$(CONFIG_TI_AM335X_ADC) += ti_am335x_adc.o obj-$(CONFIG_TWL6030_GPADC) += twl6030-gpadc.o obj-$(CONFIG_VIPERBOARD_ADC) += viperboard_adc.o +obj-$(CONFIG_MX25_ADC) += fsl-imx25-gcq.o diff --git a/drivers/iio/adc/fsl-imx25-gcq.c b/drivers/iio/adc/fsl-imx25-gcq.c new file mode 100644 index 0000000..cc7f87f --- /dev/null +++ b/drivers/iio/adc/fsl-imx25-gcq.c @@ -0,0 +1,325 @@ +/* + * Copyright 2014 Markus Pargmann, Pengutronix <mpa@pengutronix.de> + * + * The code contained herein is licensed under the GNU General Public + * License. You may obtain a copy of the GNU General Public License + * Version 2 or later at the following locations: + * + * http://www.opensource.org/licenses/gpl-license.html + * http://www.gnu.org/copyleft/gpl.html + * + * This is the driver for the imx25 GCQ (Generic Conversion Queue) + * connected to the imx25 ADC. + */ + +#include <linux/clk.h> +#include <linux/interrupt.h> +#include <linux/iio/iio.h> +#include <linux/mfd/imx25-tsadc.h> +#include <linux/module.h> +#include <linux/of.h> +#include <linux/platform_device.h> +#include <linux/regmap.h> + +#define MX25_GCQ_TIMEOUT (msecs_to_jiffies(2000)) + +enum mx25_gcq_cfgs { + MX25_CFG_XP = 0, + MX25_CFG_YP, + MX25_CFG_XN, + MX25_CFG_YN, + MX25_CFG_WIPER, + MX25_CFG_INAUX0, + MX25_CFG_INAUX1, + MX25_CFG_INAUX2, + MX25_NUM_CFGS, +}; + +struct mx25_gcq_priv { + struct regmap *regs; + struct completion completed; + unsigned int settling_time; + struct clk *clk; +}; + +#define MX25_IIO_CHAN(chan, id) {\ + .type = IIO_VOLTAGE,\ + .indexed = 1,\ + .channel = chan,\ + .address = chan,\ + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \ + .datasheet_name = id, \ + } + +const struct iio_chan_spec mx25_gcq_channels[MX25_NUM_CFGS] = { + MX25_IIO_CHAN(0, "xp"), + MX25_IIO_CHAN(1, "yp"), + MX25_IIO_CHAN(2, "xn"), + MX25_IIO_CHAN(3, "yn"), + MX25_IIO_CHAN(4, "wiper"), + MX25_IIO_CHAN(5, "inaux0"), + MX25_IIO_CHAN(6, "inaux1"), + MX25_IIO_CHAN(7, "inaux2"), +}; + +static void mx25_gcq_disable_eoq(struct mx25_gcq_priv *priv) +{ + regmap_update_bits(priv->regs, MX25_ADCQ_MR, MX25_ADCQ_MR_EOQ_IRQ, + MX25_ADCQ_MR_EOQ_IRQ); +} + +static void mx25_gcq_enable_eoq(struct mx25_gcq_priv *priv) +{ + regmap_update_bits(priv->regs, MX25_ADCQ_MR, MX25_ADCQ_MR_EOQ_IRQ, 0); +} + +static irqreturn_t mx25_gcq_irq(int irq, void *data) +{ + struct mx25_gcq_priv *priv = data; + u32 stats; + + regmap_read(priv->regs, MX25_ADCQ_SR, &stats); + + if (stats & MX25_ADCQ_SR_EOQ) { + mx25_gcq_disable_eoq(priv); + complete(&priv->completed); + } + + /* Disable conversion queue run */ + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FQS, 0); + + /* Acknowledge all possible irqs */ + regmap_write(priv->regs, MX25_ADCQ_SR, MX25_ADCQ_SR_FRR | + MX25_ADCQ_SR_FUR | MX25_ADCQ_SR_FOR | MX25_ADCQ_SR_EOQ | + MX25_ADCQ_SR_PD); + + return IRQ_HANDLED; +} + +static int mx25_gcq_read_raw(struct iio_dev *idev, + struct iio_chan_spec const *chan, int *val, int *val2, + long mask) +{ + struct mx25_gcq_priv *priv = iio_priv(idev); + unsigned long timeout; + u32 data; + int ret; + + if (mask != IIO_CHAN_INFO_RAW) + return -EINVAL; + + mutex_lock(&idev->mlock); + + /* Setup the configuration we want to use */ + regmap_write(priv->regs, MX25_ADCQ_ITEM_7_0, + MX25_ADCQ_ITEM(0, chan->address)); + + mx25_gcq_enable_eoq(priv); + + /* Trigger queue for one run */ + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FQS, + MX25_ADCQ_CR_FQS); + + timeout = wait_for_completion_interruptible_timeout(&priv->completed, + MX25_GCQ_TIMEOUT); + if (timeout < 0) { + dev_err(&idev->dev, "ADC wait for measurement failed\n"); + ret = timeout; + goto out; + } else if (timeout == 0) { + dev_err(&idev->dev, "ADC timed out\n"); + ret = -ETIMEDOUT; + goto out; + } + + regmap_read(priv->regs, MX25_ADCQ_FIFO, &data); + *val = MX25_ADCQ_FIFO_DATA(data); + + ret = IIO_VAL_INT; + +out: + mutex_unlock(&idev->mlock); + + return ret; +} + +struct iio_info mx25_gcq_iio_info = { + .read_raw = mx25_gcq_read_raw, +}; + +static struct regmap_config mx25_gcq_regconfig = { + .fast_io = true, + .max_register = 0x5c, + .reg_bits = 32, + .val_bits = 32, + .reg_stride = 4, +}; + +static void mx25_gcq_iio_dev_setup(struct platform_device *pdev, + struct iio_dev *idev) +{ + idev->dev.parent = &pdev->dev; + idev->channels = mx25_gcq_channels; + idev->num_channels = ARRAY_SIZE(mx25_gcq_channels); + idev->info = &mx25_gcq_iio_info; +} + +static int mx25_gcq_setup_cfgs(struct platform_device *pdev, + struct mx25_gcq_priv *priv) +{ + struct device_node *np = pdev->dev.of_node; + struct device_node *child; + struct device *dev = &pdev->dev; + int ret; + int i; + + /* Setup all configurations registers with a default conversion + * configuration for each input */ + for (i = 0; i != MX25_NUM_CFGS; ++i) + regmap_write(priv->regs, MX25_ADCQ_CFG(i), + MX25_ADCQ_CFG_YPLL_OFF | + MX25_ADCQ_CFG_XNUR_OFF | + MX25_ADCQ_CFG_XPUL_OFF | + MX25_ADCQ_CFG_REFP_INT | + (i << 4) | + MX25_ADCQ_CFG_REFN_NGND2); + + for_each_child_of_node(np, child) { + u32 reg; + u32 refn; + u32 refp; + + ret = of_property_read_u32(child, "reg", ®); + if (ret) { + dev_err(dev, "Failed to get reg property\n"); + return ret; + } + if (reg > MX25_NUM_CFGS) { + dev_err(dev, "reg value is greater than the number of available configuration registers\n"); + return -EINVAL; + } + + ret = of_property_read_u32(child, "fsl,adc-refn", &refn); + if (ret) { + dev_err(dev, "Failed to get fsl,adc-refn property\n"); + return ret; + } + + ret = of_property_read_u32(child, "fsl,adc-refp", &refp); + if (ret) { + dev_err(dev, "Failed to get fsl,adc-refp property\n"); + return ret; + } + + regmap_update_bits(priv->regs, MX25_ADCQ_CFG(reg), + MX25_ADCQ_CFG_REFP_MASK | + MX25_ADCQ_CFG_REFN_MASK, + (refp << 7) | (refn << 2)); + } + regmap_update_bits(priv->regs, MX25_ADCQ_CR, + MX25_ADCQ_CR_FRST | MX25_ADCQ_CR_QRST, + MX25_ADCQ_CR_FRST | MX25_ADCQ_CR_QRST); + + regmap_write(priv->regs, MX25_ADCQ_CR, + MX25_ADCQ_CR_PDMSK | + MX25_ADCQ_CR_QSM_FQS); + + return 0; +} + +static int mx25_gcq_probe(struct platform_device *pdev) +{ + struct iio_dev *idev; + struct mx25_gcq_priv *priv; + struct resource *res; + struct device *dev = &pdev->dev; + int ret; + int irq; + void __iomem *mem; + + idev = devm_iio_device_alloc(&pdev->dev, sizeof(*priv)); + if (!idev) + return -ENOMEM; + + priv = iio_priv(idev); + + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + mem = devm_ioremap_resource(dev, res); + if (!mem) { + dev_err(dev, "Failed to get iomem"); + return -ENOMEM; + } + + priv->regs = devm_regmap_init_mmio(dev, mem, &mx25_gcq_regconfig); + if (IS_ERR(priv->regs)) { + dev_err(dev, "Failed to initialize regmap\n"); + return PTR_ERR(priv->regs); + } + + irq = platform_get_irq(pdev, 0); + if (irq < 0) { + dev_err(dev, "Failed to get IRQ\n"); + return irq; + } + + ret = devm_request_irq(dev, irq, mx25_gcq_irq, IRQF_ONESHOT, pdev->name, + priv); + if (ret) { + dev_err(dev, "Failed requesting IRQ\n"); + return ret; + } + + ret = mx25_gcq_setup_cfgs(pdev, priv); + if (ret) + return ret; + + mx25_gcq_iio_dev_setup(pdev, idev); + + ret = iio_device_register(idev); + if (ret) { + dev_err(dev, "Failed to register iio device\n"); + return ret; + } + + init_completion(&priv->completed); + + priv->clk = mx25_tsadc_get_ipg(pdev->dev.parent); + ret = clk_prepare_enable(priv->clk); + if (ret) { + dev_err(dev, "Failed to enable clock\n"); + return ret; + } + + platform_set_drvdata(pdev, priv); + + return 0; +} + +static int mx25_gcq_remove(struct platform_device *pdev) +{ + struct mx25_gcq_priv *priv = platform_get_drvdata(pdev); + + clk_disable_unprepare(priv->clk); + + return 0; +} + +static struct of_device_id mx25_gcq_ids[] = { + { .compatible = "fsl,imx25-gcq", }, + { /* Senitel */ } +}; + +static struct platform_driver mx25_gcq_driver = { + .driver = { + .name = "mx25-gcq", + .owner = THIS_MODULE, + .of_match_table = mx25_gcq_ids, + }, + .probe = mx25_gcq_probe, + .remove = mx25_gcq_remove, +}; +module_platform_driver(mx25_gcq_driver); + +MODULE_DESCRIPTION("ADC driver for Freescale mx25"); +MODULE_AUTHOR("Markus Pargmann <mpa@pengutronix.de>"); +MODULE_LICENSE("GPL v2"); -- 1.8.5.3 ^ permalink raw reply related [flat|nested] 76+ messages in thread
* Re: [PATCH 3/3] iio: adc: fsl,imx25-gcq driver 2014-02-20 16:21 ` Markus Pargmann (?) @ 2014-02-20 17:46 ` Lars-Peter Clausen -1 siblings, 0 replies; 76+ messages in thread From: Lars-Peter Clausen @ 2014-02-20 17:46 UTC (permalink / raw) To: Markus Pargmann Cc: devicetree, Samuel Ortiz, linux-iio, Dmitry Torokhov, linux-arm-kernel, kernel, linux-input, Lee Jones, Jonathan Cameron On 02/20/2014 05:21 PM, Markus Pargmann wrote: > This is a conversion queue driver for the mx25 SoC. It uses the central > ADC which is used by two seperate independent queues. This driver > prepares different conversion configurations for each possible input. > For a conversion it creates a conversionqueue of one item with the > correct configuration for the chosen channel. It then executes the queue > once and disables the conversion queue afterwards. > > The reference voltages are configurable through devicetree subnodes, > depending on the connections of the ADC inputs. > > Signed-off-by: Markus Pargmann <mpa@pengutronix.de> Looks good mostly. Just a couple of minor code-style issues. Try to run checkpatch, sparse and friends on your driver before submission. They catch most of the stuff that needs to be fixed in this driver. [..] > diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig > index 2209f28..a421445 100644 > --- a/drivers/iio/adc/Kconfig > +++ b/drivers/iio/adc/Kconfig > @@ -113,6 +113,13 @@ config EXYNOS_ADC > of SoCs for drivers such as the touchscreen and hwmon to use to share > this resource. > > +config MX25_ADC > + tristate "Freescale MX25 ADC driver" > + depends on MFD_MX25_TSADC > + help > + Generic Conversion Queue driver used for general purpose ADC in the > + MX25. This driver supports single measurements using the MX25 ADC. > + alphabetical order > config LP8788_ADC > bool "LP8788 ADC driver" > depends on MFD_LP8788 > diff --git a/drivers/iio/adc/Makefile b/drivers/iio/adc/Makefile > index ba9a10a..63daa2c 100644 > --- a/drivers/iio/adc/Makefile > +++ b/drivers/iio/adc/Makefile > @@ -22,3 +22,4 @@ obj-$(CONFIG_TI_ADC081C) += ti-adc081c.o > obj-$(CONFIG_TI_AM335X_ADC) += ti_am335x_adc.o > obj-$(CONFIG_TWL6030_GPADC) += twl6030-gpadc.o > obj-$(CONFIG_VIPERBOARD_ADC) += viperboard_adc.o > +obj-$(CONFIG_MX25_ADC) += fsl-imx25-gcq.o Here too [...] > +const struct iio_chan_spec mx25_gcq_channels[MX25_NUM_CFGS] = { static > + MX25_IIO_CHAN(0, "xp"), > + MX25_IIO_CHAN(1, "yp"), > + MX25_IIO_CHAN(2, "xn"), > + MX25_IIO_CHAN(3, "yn"), > + MX25_IIO_CHAN(4, "wiper"), > + MX25_IIO_CHAN(5, "inaux0"), > + MX25_IIO_CHAN(6, "inaux1"), > + MX25_IIO_CHAN(7, "inaux2"), > +}; > + > +struct iio_info mx25_gcq_iio_info = { static const > + .read_raw = mx25_gcq_read_raw, > +}; > + > +static struct regmap_config mx25_gcq_regconfig = { const > + .fast_io = true, You don't need to set fast_io since this is already done at the regmap_bus level. > + .max_register = 0x5c, > + .reg_bits = 32, > + .val_bits = 32, > + .reg_stride = 4, > +}; > + > +static void mx25_gcq_iio_dev_setup(struct platform_device *pdev, > + struct iio_dev *idev) > +{ > + idev->dev.parent = &pdev->dev; > + idev->channels = mx25_gcq_channels; > + idev->num_channels = ARRAY_SIZE(mx25_gcq_channels); > + idev->info = &mx25_gcq_iio_info; Any reason why this needs to be in a separate function and can't be inlined in probe()? > +} > + > +static int mx25_gcq_setup_cfgs(struct platform_device *pdev, > + struct mx25_gcq_priv *priv) > +{ > + struct device_node *np = pdev->dev.of_node; > + struct device_node *child; > + struct device *dev = &pdev->dev; > + int ret; > + int i; > + > + /* Setup all configurations registers with a default conversion > + * configuration for each input */ > + for (i = 0; i != MX25_NUM_CFGS; ++i) > + regmap_write(priv->regs, MX25_ADCQ_CFG(i), > + MX25_ADCQ_CFG_YPLL_OFF | > + MX25_ADCQ_CFG_XNUR_OFF | > + MX25_ADCQ_CFG_XPUL_OFF | > + MX25_ADCQ_CFG_REFP_INT | > + (i << 4) | > + MX25_ADCQ_CFG_REFN_NGND2); > + > + for_each_child_of_node(np, child) { > + u32 reg; > + u32 refn; > + u32 refp; > + > + ret = of_property_read_u32(child, "reg", ®); > + if (ret) { > + dev_err(dev, "Failed to get reg property\n"); > + return ret; > + } > + if (reg > MX25_NUM_CFGS) { > + dev_err(dev, "reg value is greater than the number of available configuration registers\n"); > + return -EINVAL; > + } > + > + ret = of_property_read_u32(child, "fsl,adc-refn", &refn); > + if (ret) { > + dev_err(dev, "Failed to get fsl,adc-refn property\n"); > + return ret; > + } > + > + ret = of_property_read_u32(child, "fsl,adc-refp", &refp); > + if (ret) { > + dev_err(dev, "Failed to get fsl,adc-refp property\n"); > + return ret; > + } Range check for refp and refn? > + > + regmap_update_bits(priv->regs, MX25_ADCQ_CFG(reg), > + MX25_ADCQ_CFG_REFP_MASK | > + MX25_ADCQ_CFG_REFN_MASK, > + (refp << 7) | (refn << 2)); > + } > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, > + MX25_ADCQ_CR_FRST | MX25_ADCQ_CR_QRST, > + MX25_ADCQ_CR_FRST | MX25_ADCQ_CR_QRST); > + > + regmap_write(priv->regs, MX25_ADCQ_CR, > + MX25_ADCQ_CR_PDMSK | > + MX25_ADCQ_CR_QSM_FQS); > + > + return 0; > +} > + > +static int mx25_gcq_probe(struct platform_device *pdev) > +{ > + struct iio_dev *idev; > + struct mx25_gcq_priv *priv; > + struct resource *res; > + struct device *dev = &pdev->dev; > + int ret; > + int irq; > + void __iomem *mem; > + > + idev = devm_iio_device_alloc(&pdev->dev, sizeof(*priv)); > + if (!idev) > + return -ENOMEM; > + > + priv = iio_priv(idev); > + > + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > + mem = devm_ioremap_resource(dev, res); > + if (!mem) { > + dev_err(dev, "Failed to get iomem"); devm_ioremap_resource already prints a error message for you > + return -ENOMEM; > + } > + > + priv->regs = devm_regmap_init_mmio(dev, mem, &mx25_gcq_regconfig); > + if (IS_ERR(priv->regs)) { > + dev_err(dev, "Failed to initialize regmap\n"); > + return PTR_ERR(priv->regs); > + } > + > + irq = platform_get_irq(pdev, 0); > + if (irq < 0) { 0 is not a valid IRQ number either > + dev_err(dev, "Failed to get IRQ\n"); > + return irq; > + } > + > + ret = devm_request_irq(dev, irq, mx25_gcq_irq, IRQF_ONESHOT, pdev->name, > + priv); IRQF_ONESHOT does not make much sense for non-threaded IRQs. Also it is probably safer to use the non managed variant of request_irq here. > + if (ret) { > + dev_err(dev, "Failed requesting IRQ\n"); It usually makes sense to include the error number in the message. Same for the other error messages in probe. > + return ret; > + } > + > + ret = mx25_gcq_setup_cfgs(pdev, priv); > + if (ret) > + return ret; > + > + mx25_gcq_iio_dev_setup(pdev, idev); > + > + ret = iio_device_register(idev); > + if (ret) { > + dev_err(dev, "Failed to register iio device\n"); > + return ret; > + } > + > + init_completion(&priv->completed); Should be done before the interrupt handler is registered. You reference it in there. > + > + priv->clk = mx25_tsadc_get_ipg(pdev->dev.parent); > + ret = clk_prepare_enable(priv->clk); The clock should probably also be enabled before the interrupt handler and the IIO device are registered. > + if (ret) { > + dev_err(dev, "Failed to enable clock\n"); > + return ret; > + } > + > + platform_set_drvdata(pdev, priv); > + > + return 0; > +} > + > +static int mx25_gcq_remove(struct platform_device *pdev) > +{ > + struct mx25_gcq_priv *priv = platform_get_drvdata(pdev); > + iio_device_unregister(). > + clk_disable_unprepare(priv->clk); > + > + return 0; > +} ^ permalink raw reply [flat|nested] 76+ messages in thread
* [PATCH 3/3] iio: adc: fsl,imx25-gcq driver @ 2014-02-20 17:46 ` Lars-Peter Clausen 0 siblings, 0 replies; 76+ messages in thread From: Lars-Peter Clausen @ 2014-02-20 17:46 UTC (permalink / raw) To: linux-arm-kernel On 02/20/2014 05:21 PM, Markus Pargmann wrote: > This is a conversion queue driver for the mx25 SoC. It uses the central > ADC which is used by two seperate independent queues. This driver > prepares different conversion configurations for each possible input. > For a conversion it creates a conversionqueue of one item with the > correct configuration for the chosen channel. It then executes the queue > once and disables the conversion queue afterwards. > > The reference voltages are configurable through devicetree subnodes, > depending on the connections of the ADC inputs. > > Signed-off-by: Markus Pargmann <mpa@pengutronix.de> Looks good mostly. Just a couple of minor code-style issues. Try to run checkpatch, sparse and friends on your driver before submission. They catch most of the stuff that needs to be fixed in this driver. [..] > diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig > index 2209f28..a421445 100644 > --- a/drivers/iio/adc/Kconfig > +++ b/drivers/iio/adc/Kconfig > @@ -113,6 +113,13 @@ config EXYNOS_ADC > of SoCs for drivers such as the touchscreen and hwmon to use to share > this resource. > > +config MX25_ADC > + tristate "Freescale MX25 ADC driver" > + depends on MFD_MX25_TSADC > + help > + Generic Conversion Queue driver used for general purpose ADC in the > + MX25. This driver supports single measurements using the MX25 ADC. > + alphabetical order > config LP8788_ADC > bool "LP8788 ADC driver" > depends on MFD_LP8788 > diff --git a/drivers/iio/adc/Makefile b/drivers/iio/adc/Makefile > index ba9a10a..63daa2c 100644 > --- a/drivers/iio/adc/Makefile > +++ b/drivers/iio/adc/Makefile > @@ -22,3 +22,4 @@ obj-$(CONFIG_TI_ADC081C) += ti-adc081c.o > obj-$(CONFIG_TI_AM335X_ADC) += ti_am335x_adc.o > obj-$(CONFIG_TWL6030_GPADC) += twl6030-gpadc.o > obj-$(CONFIG_VIPERBOARD_ADC) += viperboard_adc.o > +obj-$(CONFIG_MX25_ADC) += fsl-imx25-gcq.o Here too [...] > +const struct iio_chan_spec mx25_gcq_channels[MX25_NUM_CFGS] = { static > + MX25_IIO_CHAN(0, "xp"), > + MX25_IIO_CHAN(1, "yp"), > + MX25_IIO_CHAN(2, "xn"), > + MX25_IIO_CHAN(3, "yn"), > + MX25_IIO_CHAN(4, "wiper"), > + MX25_IIO_CHAN(5, "inaux0"), > + MX25_IIO_CHAN(6, "inaux1"), > + MX25_IIO_CHAN(7, "inaux2"), > +}; > + > +struct iio_info mx25_gcq_iio_info = { static const > + .read_raw = mx25_gcq_read_raw, > +}; > + > +static struct regmap_config mx25_gcq_regconfig = { const > + .fast_io = true, You don't need to set fast_io since this is already done at the regmap_bus level. > + .max_register = 0x5c, > + .reg_bits = 32, > + .val_bits = 32, > + .reg_stride = 4, > +}; > + > +static void mx25_gcq_iio_dev_setup(struct platform_device *pdev, > + struct iio_dev *idev) > +{ > + idev->dev.parent = &pdev->dev; > + idev->channels = mx25_gcq_channels; > + idev->num_channels = ARRAY_SIZE(mx25_gcq_channels); > + idev->info = &mx25_gcq_iio_info; Any reason why this needs to be in a separate function and can't be inlined in probe()? > +} > + > +static int mx25_gcq_setup_cfgs(struct platform_device *pdev, > + struct mx25_gcq_priv *priv) > +{ > + struct device_node *np = pdev->dev.of_node; > + struct device_node *child; > + struct device *dev = &pdev->dev; > + int ret; > + int i; > + > + /* Setup all configurations registers with a default conversion > + * configuration for each input */ > + for (i = 0; i != MX25_NUM_CFGS; ++i) > + regmap_write(priv->regs, MX25_ADCQ_CFG(i), > + MX25_ADCQ_CFG_YPLL_OFF | > + MX25_ADCQ_CFG_XNUR_OFF | > + MX25_ADCQ_CFG_XPUL_OFF | > + MX25_ADCQ_CFG_REFP_INT | > + (i << 4) | > + MX25_ADCQ_CFG_REFN_NGND2); > + > + for_each_child_of_node(np, child) { > + u32 reg; > + u32 refn; > + u32 refp; > + > + ret = of_property_read_u32(child, "reg", ®); > + if (ret) { > + dev_err(dev, "Failed to get reg property\n"); > + return ret; > + } > + if (reg > MX25_NUM_CFGS) { > + dev_err(dev, "reg value is greater than the number of available configuration registers\n"); > + return -EINVAL; > + } > + > + ret = of_property_read_u32(child, "fsl,adc-refn", &refn); > + if (ret) { > + dev_err(dev, "Failed to get fsl,adc-refn property\n"); > + return ret; > + } > + > + ret = of_property_read_u32(child, "fsl,adc-refp", &refp); > + if (ret) { > + dev_err(dev, "Failed to get fsl,adc-refp property\n"); > + return ret; > + } Range check for refp and refn? > + > + regmap_update_bits(priv->regs, MX25_ADCQ_CFG(reg), > + MX25_ADCQ_CFG_REFP_MASK | > + MX25_ADCQ_CFG_REFN_MASK, > + (refp << 7) | (refn << 2)); > + } > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, > + MX25_ADCQ_CR_FRST | MX25_ADCQ_CR_QRST, > + MX25_ADCQ_CR_FRST | MX25_ADCQ_CR_QRST); > + > + regmap_write(priv->regs, MX25_ADCQ_CR, > + MX25_ADCQ_CR_PDMSK | > + MX25_ADCQ_CR_QSM_FQS); > + > + return 0; > +} > + > +static int mx25_gcq_probe(struct platform_device *pdev) > +{ > + struct iio_dev *idev; > + struct mx25_gcq_priv *priv; > + struct resource *res; > + struct device *dev = &pdev->dev; > + int ret; > + int irq; > + void __iomem *mem; > + > + idev = devm_iio_device_alloc(&pdev->dev, sizeof(*priv)); > + if (!idev) > + return -ENOMEM; > + > + priv = iio_priv(idev); > + > + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > + mem = devm_ioremap_resource(dev, res); > + if (!mem) { > + dev_err(dev, "Failed to get iomem"); devm_ioremap_resource already prints a error message for you > + return -ENOMEM; > + } > + > + priv->regs = devm_regmap_init_mmio(dev, mem, &mx25_gcq_regconfig); > + if (IS_ERR(priv->regs)) { > + dev_err(dev, "Failed to initialize regmap\n"); > + return PTR_ERR(priv->regs); > + } > + > + irq = platform_get_irq(pdev, 0); > + if (irq < 0) { 0 is not a valid IRQ number either > + dev_err(dev, "Failed to get IRQ\n"); > + return irq; > + } > + > + ret = devm_request_irq(dev, irq, mx25_gcq_irq, IRQF_ONESHOT, pdev->name, > + priv); IRQF_ONESHOT does not make much sense for non-threaded IRQs. Also it is probably safer to use the non managed variant of request_irq here. > + if (ret) { > + dev_err(dev, "Failed requesting IRQ\n"); It usually makes sense to include the error number in the message. Same for the other error messages in probe. > + return ret; > + } > + > + ret = mx25_gcq_setup_cfgs(pdev, priv); > + if (ret) > + return ret; > + > + mx25_gcq_iio_dev_setup(pdev, idev); > + > + ret = iio_device_register(idev); > + if (ret) { > + dev_err(dev, "Failed to register iio device\n"); > + return ret; > + } > + > + init_completion(&priv->completed); Should be done before the interrupt handler is registered. You reference it in there. > + > + priv->clk = mx25_tsadc_get_ipg(pdev->dev.parent); > + ret = clk_prepare_enable(priv->clk); The clock should probably also be enabled before the interrupt handler and the IIO device are registered. > + if (ret) { > + dev_err(dev, "Failed to enable clock\n"); > + return ret; > + } > + > + platform_set_drvdata(pdev, priv); > + > + return 0; > +} > + > +static int mx25_gcq_remove(struct platform_device *pdev) > +{ > + struct mx25_gcq_priv *priv = platform_get_drvdata(pdev); > + iio_device_unregister(). > + clk_disable_unprepare(priv->clk); > + > + return 0; > +} ^ permalink raw reply [flat|nested] 76+ messages in thread
* Re: [PATCH 3/3] iio: adc: fsl,imx25-gcq driver @ 2014-02-20 17:46 ` Lars-Peter Clausen 0 siblings, 0 replies; 76+ messages in thread From: Lars-Peter Clausen @ 2014-02-20 17:46 UTC (permalink / raw) To: Markus Pargmann Cc: devicetree, linux-input, linux-iio, Dmitry Torokhov, Samuel Ortiz, Lee Jones, Jonathan Cameron, linux-arm-kernel, kernel On 02/20/2014 05:21 PM, Markus Pargmann wrote: > This is a conversion queue driver for the mx25 SoC. It uses the central > ADC which is used by two seperate independent queues. This driver > prepares different conversion configurations for each possible input. > For a conversion it creates a conversionqueue of one item with the > correct configuration for the chosen channel. It then executes the queue > once and disables the conversion queue afterwards. > > The reference voltages are configurable through devicetree subnodes, > depending on the connections of the ADC inputs. > > Signed-off-by: Markus Pargmann <mpa@pengutronix.de> Looks good mostly. Just a couple of minor code-style issues. Try to run checkpatch, sparse and friends on your driver before submission. They catch most of the stuff that needs to be fixed in this driver. [..] > diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig > index 2209f28..a421445 100644 > --- a/drivers/iio/adc/Kconfig > +++ b/drivers/iio/adc/Kconfig > @@ -113,6 +113,13 @@ config EXYNOS_ADC > of SoCs for drivers such as the touchscreen and hwmon to use to share > this resource. > > +config MX25_ADC > + tristate "Freescale MX25 ADC driver" > + depends on MFD_MX25_TSADC > + help > + Generic Conversion Queue driver used for general purpose ADC in the > + MX25. This driver supports single measurements using the MX25 ADC. > + alphabetical order > config LP8788_ADC > bool "LP8788 ADC driver" > depends on MFD_LP8788 > diff --git a/drivers/iio/adc/Makefile b/drivers/iio/adc/Makefile > index ba9a10a..63daa2c 100644 > --- a/drivers/iio/adc/Makefile > +++ b/drivers/iio/adc/Makefile > @@ -22,3 +22,4 @@ obj-$(CONFIG_TI_ADC081C) += ti-adc081c.o > obj-$(CONFIG_TI_AM335X_ADC) += ti_am335x_adc.o > obj-$(CONFIG_TWL6030_GPADC) += twl6030-gpadc.o > obj-$(CONFIG_VIPERBOARD_ADC) += viperboard_adc.o > +obj-$(CONFIG_MX25_ADC) += fsl-imx25-gcq.o Here too [...] > +const struct iio_chan_spec mx25_gcq_channels[MX25_NUM_CFGS] = { static > + MX25_IIO_CHAN(0, "xp"), > + MX25_IIO_CHAN(1, "yp"), > + MX25_IIO_CHAN(2, "xn"), > + MX25_IIO_CHAN(3, "yn"), > + MX25_IIO_CHAN(4, "wiper"), > + MX25_IIO_CHAN(5, "inaux0"), > + MX25_IIO_CHAN(6, "inaux1"), > + MX25_IIO_CHAN(7, "inaux2"), > +}; > + > +struct iio_info mx25_gcq_iio_info = { static const > + .read_raw = mx25_gcq_read_raw, > +}; > + > +static struct regmap_config mx25_gcq_regconfig = { const > + .fast_io = true, You don't need to set fast_io since this is already done at the regmap_bus level. > + .max_register = 0x5c, > + .reg_bits = 32, > + .val_bits = 32, > + .reg_stride = 4, > +}; > + > +static void mx25_gcq_iio_dev_setup(struct platform_device *pdev, > + struct iio_dev *idev) > +{ > + idev->dev.parent = &pdev->dev; > + idev->channels = mx25_gcq_channels; > + idev->num_channels = ARRAY_SIZE(mx25_gcq_channels); > + idev->info = &mx25_gcq_iio_info; Any reason why this needs to be in a separate function and can't be inlined in probe()? > +} > + > +static int mx25_gcq_setup_cfgs(struct platform_device *pdev, > + struct mx25_gcq_priv *priv) > +{ > + struct device_node *np = pdev->dev.of_node; > + struct device_node *child; > + struct device *dev = &pdev->dev; > + int ret; > + int i; > + > + /* Setup all configurations registers with a default conversion > + * configuration for each input */ > + for (i = 0; i != MX25_NUM_CFGS; ++i) > + regmap_write(priv->regs, MX25_ADCQ_CFG(i), > + MX25_ADCQ_CFG_YPLL_OFF | > + MX25_ADCQ_CFG_XNUR_OFF | > + MX25_ADCQ_CFG_XPUL_OFF | > + MX25_ADCQ_CFG_REFP_INT | > + (i << 4) | > + MX25_ADCQ_CFG_REFN_NGND2); > + > + for_each_child_of_node(np, child) { > + u32 reg; > + u32 refn; > + u32 refp; > + > + ret = of_property_read_u32(child, "reg", ®); > + if (ret) { > + dev_err(dev, "Failed to get reg property\n"); > + return ret; > + } > + if (reg > MX25_NUM_CFGS) { > + dev_err(dev, "reg value is greater than the number of available configuration registers\n"); > + return -EINVAL; > + } > + > + ret = of_property_read_u32(child, "fsl,adc-refn", &refn); > + if (ret) { > + dev_err(dev, "Failed to get fsl,adc-refn property\n"); > + return ret; > + } > + > + ret = of_property_read_u32(child, "fsl,adc-refp", &refp); > + if (ret) { > + dev_err(dev, "Failed to get fsl,adc-refp property\n"); > + return ret; > + } Range check for refp and refn? > + > + regmap_update_bits(priv->regs, MX25_ADCQ_CFG(reg), > + MX25_ADCQ_CFG_REFP_MASK | > + MX25_ADCQ_CFG_REFN_MASK, > + (refp << 7) | (refn << 2)); > + } > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, > + MX25_ADCQ_CR_FRST | MX25_ADCQ_CR_QRST, > + MX25_ADCQ_CR_FRST | MX25_ADCQ_CR_QRST); > + > + regmap_write(priv->regs, MX25_ADCQ_CR, > + MX25_ADCQ_CR_PDMSK | > + MX25_ADCQ_CR_QSM_FQS); > + > + return 0; > +} > + > +static int mx25_gcq_probe(struct platform_device *pdev) > +{ > + struct iio_dev *idev; > + struct mx25_gcq_priv *priv; > + struct resource *res; > + struct device *dev = &pdev->dev; > + int ret; > + int irq; > + void __iomem *mem; > + > + idev = devm_iio_device_alloc(&pdev->dev, sizeof(*priv)); > + if (!idev) > + return -ENOMEM; > + > + priv = iio_priv(idev); > + > + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > + mem = devm_ioremap_resource(dev, res); > + if (!mem) { > + dev_err(dev, "Failed to get iomem"); devm_ioremap_resource already prints a error message for you > + return -ENOMEM; > + } > + > + priv->regs = devm_regmap_init_mmio(dev, mem, &mx25_gcq_regconfig); > + if (IS_ERR(priv->regs)) { > + dev_err(dev, "Failed to initialize regmap\n"); > + return PTR_ERR(priv->regs); > + } > + > + irq = platform_get_irq(pdev, 0); > + if (irq < 0) { 0 is not a valid IRQ number either > + dev_err(dev, "Failed to get IRQ\n"); > + return irq; > + } > + > + ret = devm_request_irq(dev, irq, mx25_gcq_irq, IRQF_ONESHOT, pdev->name, > + priv); IRQF_ONESHOT does not make much sense for non-threaded IRQs. Also it is probably safer to use the non managed variant of request_irq here. > + if (ret) { > + dev_err(dev, "Failed requesting IRQ\n"); It usually makes sense to include the error number in the message. Same for the other error messages in probe. > + return ret; > + } > + > + ret = mx25_gcq_setup_cfgs(pdev, priv); > + if (ret) > + return ret; > + > + mx25_gcq_iio_dev_setup(pdev, idev); > + > + ret = iio_device_register(idev); > + if (ret) { > + dev_err(dev, "Failed to register iio device\n"); > + return ret; > + } > + > + init_completion(&priv->completed); Should be done before the interrupt handler is registered. You reference it in there. > + > + priv->clk = mx25_tsadc_get_ipg(pdev->dev.parent); > + ret = clk_prepare_enable(priv->clk); The clock should probably also be enabled before the interrupt handler and the IIO device are registered. > + if (ret) { > + dev_err(dev, "Failed to enable clock\n"); > + return ret; > + } > + > + platform_set_drvdata(pdev, priv); > + > + return 0; > +} > + > +static int mx25_gcq_remove(struct platform_device *pdev) > +{ > + struct mx25_gcq_priv *priv = platform_get_drvdata(pdev); > + iio_device_unregister(). > + clk_disable_unprepare(priv->clk); > + > + return 0; > +} ^ permalink raw reply [flat|nested] 76+ messages in thread
* Re: [PATCH 3/3] iio: adc: fsl,imx25-gcq driver 2014-02-20 17:46 ` Lars-Peter Clausen @ 2014-02-21 10:12 ` Markus Pargmann -1 siblings, 0 replies; 76+ messages in thread From: Markus Pargmann @ 2014-02-21 10:12 UTC (permalink / raw) To: Lars-Peter Clausen Cc: devicetree, linux-input, linux-iio, Dmitry Torokhov, Samuel Ortiz, Lee Jones, Jonathan Cameron, linux-arm-kernel, kernel [-- Attachment #1: Type: text/plain, Size: 8952 bytes --] Hi, On Thu, Feb 20, 2014 at 06:46:26PM +0100, Lars-Peter Clausen wrote: > On 02/20/2014 05:21 PM, Markus Pargmann wrote: > >This is a conversion queue driver for the mx25 SoC. It uses the central > >ADC which is used by two seperate independent queues. This driver > >prepares different conversion configurations for each possible input. > >For a conversion it creates a conversionqueue of one item with the > >correct configuration for the chosen channel. It then executes the queue > >once and disables the conversion queue afterwards. > > > >The reference voltages are configurable through devicetree subnodes, > >depending on the connections of the ADC inputs. > > > >Signed-off-by: Markus Pargmann <mpa@pengutronix.de> > > Looks good mostly. Just a couple of minor code-style issues. Try to > run checkpatch, sparse and friends on your driver before submission. > They catch most of the stuff that needs to be fixed in this driver. I used checkpatch and will have a look at sparse. > > [..] > >diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig > >index 2209f28..a421445 100644 > >--- a/drivers/iio/adc/Kconfig > >+++ b/drivers/iio/adc/Kconfig > >@@ -113,6 +113,13 @@ config EXYNOS_ADC > > of SoCs for drivers such as the touchscreen and hwmon to use to share > > this resource. > > > >+config MX25_ADC > >+ tristate "Freescale MX25 ADC driver" > >+ depends on MFD_MX25_TSADC > >+ help > >+ Generic Conversion Queue driver used for general purpose ADC in the > >+ MX25. This driver supports single measurements using the MX25 ADC. > >+ > > alphabetical order I changed the config option name to "FSL_MX25_ADC" to have it in alphabetical order for the user visible menuconfig and the config symbols. > > > config LP8788_ADC > > bool "LP8788 ADC driver" > > depends on MFD_LP8788 > >diff --git a/drivers/iio/adc/Makefile b/drivers/iio/adc/Makefile > >index ba9a10a..63daa2c 100644 > >--- a/drivers/iio/adc/Makefile > >+++ b/drivers/iio/adc/Makefile > >@@ -22,3 +22,4 @@ obj-$(CONFIG_TI_ADC081C) += ti-adc081c.o > > obj-$(CONFIG_TI_AM335X_ADC) += ti_am335x_adc.o > > obj-$(CONFIG_TWL6030_GPADC) += twl6030-gpadc.o > > obj-$(CONFIG_VIPERBOARD_ADC) += viperboard_adc.o > >+obj-$(CONFIG_MX25_ADC) += fsl-imx25-gcq.o > > Here too Fixed. > > [...] > > >+const struct iio_chan_spec mx25_gcq_channels[MX25_NUM_CFGS] = { > > static Fixed. > > >+ MX25_IIO_CHAN(0, "xp"), > >+ MX25_IIO_CHAN(1, "yp"), > >+ MX25_IIO_CHAN(2, "xn"), > >+ MX25_IIO_CHAN(3, "yn"), > >+ MX25_IIO_CHAN(4, "wiper"), > >+ MX25_IIO_CHAN(5, "inaux0"), > >+ MX25_IIO_CHAN(6, "inaux1"), > >+ MX25_IIO_CHAN(7, "inaux2"), > >+}; > >+ > > >+struct iio_info mx25_gcq_iio_info = { > > static const Fixed. > > >+ .read_raw = mx25_gcq_read_raw, > >+}; > >+ > >+static struct regmap_config mx25_gcq_regconfig = { > > const Fixed. > > >+ .fast_io = true, > > You don't need to set fast_io since this is already done at the > regmap_bus level. Okay, I removed it. > > >+ .max_register = 0x5c, > >+ .reg_bits = 32, > >+ .val_bits = 32, > >+ .reg_stride = 4, > >+}; > >+ > >+static void mx25_gcq_iio_dev_setup(struct platform_device *pdev, > >+ struct iio_dev *idev) > >+{ > >+ idev->dev.parent = &pdev->dev; > >+ idev->channels = mx25_gcq_channels; > >+ idev->num_channels = ARRAY_SIZE(mx25_gcq_channels); > >+ idev->info = &mx25_gcq_iio_info; > > Any reason why this needs to be in a separate function and can't be > inlined in probe()? No reason for that. I moved it back to probe(). > > >+} > >+ > >+static int mx25_gcq_setup_cfgs(struct platform_device *pdev, > >+ struct mx25_gcq_priv *priv) > >+{ > >+ struct device_node *np = pdev->dev.of_node; > >+ struct device_node *child; > >+ struct device *dev = &pdev->dev; > >+ int ret; > >+ int i; > >+ > >+ /* Setup all configurations registers with a default conversion > >+ * configuration for each input */ > >+ for (i = 0; i != MX25_NUM_CFGS; ++i) > >+ regmap_write(priv->regs, MX25_ADCQ_CFG(i), > >+ MX25_ADCQ_CFG_YPLL_OFF | > >+ MX25_ADCQ_CFG_XNUR_OFF | > >+ MX25_ADCQ_CFG_XPUL_OFF | > >+ MX25_ADCQ_CFG_REFP_INT | > >+ (i << 4) | > >+ MX25_ADCQ_CFG_REFN_NGND2); > >+ > >+ for_each_child_of_node(np, child) { > >+ u32 reg; > >+ u32 refn; > >+ u32 refp; > >+ > >+ ret = of_property_read_u32(child, "reg", ®); > >+ if (ret) { > >+ dev_err(dev, "Failed to get reg property\n"); > >+ return ret; > >+ } > >+ if (reg > MX25_NUM_CFGS) { > >+ dev_err(dev, "reg value is greater than the number of available configuration registers\n"); > >+ return -EINVAL; > >+ } > >+ > >+ ret = of_property_read_u32(child, "fsl,adc-refn", &refn); > >+ if (ret) { > >+ dev_err(dev, "Failed to get fsl,adc-refn property\n"); > >+ return ret; > >+ } > >+ > >+ ret = of_property_read_u32(child, "fsl,adc-refp", &refp); > >+ if (ret) { > >+ dev_err(dev, "Failed to get fsl,adc-refp property\n"); > >+ return ret; > >+ } > > Range check for refp and refn? Range check added for both. > > >+ > >+ regmap_update_bits(priv->regs, MX25_ADCQ_CFG(reg), > >+ MX25_ADCQ_CFG_REFP_MASK | > >+ MX25_ADCQ_CFG_REFN_MASK, > >+ (refp << 7) | (refn << 2)); > >+ } > >+ regmap_update_bits(priv->regs, MX25_ADCQ_CR, > >+ MX25_ADCQ_CR_FRST | MX25_ADCQ_CR_QRST, > >+ MX25_ADCQ_CR_FRST | MX25_ADCQ_CR_QRST); > >+ > >+ regmap_write(priv->regs, MX25_ADCQ_CR, > >+ MX25_ADCQ_CR_PDMSK | > >+ MX25_ADCQ_CR_QSM_FQS); > >+ > >+ return 0; > >+} > >+ > >+static int mx25_gcq_probe(struct platform_device *pdev) > >+{ > >+ struct iio_dev *idev; > >+ struct mx25_gcq_priv *priv; > >+ struct resource *res; > >+ struct device *dev = &pdev->dev; > >+ int ret; > >+ int irq; > >+ void __iomem *mem; > >+ > >+ idev = devm_iio_device_alloc(&pdev->dev, sizeof(*priv)); > >+ if (!idev) > >+ return -ENOMEM; > >+ > >+ priv = iio_priv(idev); > >+ > >+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > >+ mem = devm_ioremap_resource(dev, res); > >+ if (!mem) { > >+ dev_err(dev, "Failed to get iomem"); > > devm_ioremap_resource already prints a error message for you Okay, I removed dev_err. > > >+ return -ENOMEM; > >+ } > >+ > >+ priv->regs = devm_regmap_init_mmio(dev, mem, &mx25_gcq_regconfig); > >+ if (IS_ERR(priv->regs)) { > >+ dev_err(dev, "Failed to initialize regmap\n"); > >+ return PTR_ERR(priv->regs); > >+ } > >+ > >+ irq = platform_get_irq(pdev, 0); > >+ if (irq < 0) { > > 0 is not a valid IRQ number either Fixed. > > >+ dev_err(dev, "Failed to get IRQ\n"); > >+ return irq; > >+ } > >+ > >+ ret = devm_request_irq(dev, irq, mx25_gcq_irq, IRQF_ONESHOT, pdev->name, > >+ priv); > > IRQF_ONESHOT does not make much sense for non-threaded IRQs. Also it > is probably safer to use the non managed variant of request_irq > here. Right, I removed the IRQF_ONESHOT flag. Why is it safer to use the non managed request_irq? > > >+ if (ret) { > >+ dev_err(dev, "Failed requesting IRQ\n"); > > It usually makes sense to include the error number in the message. > Same for the other error messages in probe. The error values are returned from the probe function, so the error number should be displayed by really_probe() in drivers/base/dd.c . > > >+ return ret; > >+ } > >+ > >+ ret = mx25_gcq_setup_cfgs(pdev, priv); > >+ if (ret) > >+ return ret; > >+ > >+ mx25_gcq_iio_dev_setup(pdev, idev); > >+ > >+ ret = iio_device_register(idev); > >+ if (ret) { > >+ dev_err(dev, "Failed to register iio device\n"); > >+ return ret; > >+ } > >+ > >+ init_completion(&priv->completed); > > Should be done before the interrupt handler is registered. You > reference it in there. > > >+ > >+ priv->clk = mx25_tsadc_get_ipg(pdev->dev.parent); > >+ ret = clk_prepare_enable(priv->clk); > > The clock should probably also be enabled before the interrupt > handler and the IIO device are registered. Fixed. The last two items are request_irq() and iio_device_register(). > > >+ if (ret) { > >+ dev_err(dev, "Failed to enable clock\n"); > >+ return ret; > >+ } > >+ > >+ platform_set_drvdata(pdev, priv); > >+ > >+ return 0; > >+} > >+ > >+static int mx25_gcq_remove(struct platform_device *pdev) > >+{ > >+ struct mx25_gcq_priv *priv = platform_get_drvdata(pdev); > >+ > > iio_device_unregister(). Fixed. > > >+ clk_disable_unprepare(priv->clk); > >+ > >+ return 0; > >+} > > Thanks, Markus -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 836 bytes --] ^ permalink raw reply [flat|nested] 76+ messages in thread
* [PATCH 3/3] iio: adc: fsl,imx25-gcq driver @ 2014-02-21 10:12 ` Markus Pargmann 0 siblings, 0 replies; 76+ messages in thread From: Markus Pargmann @ 2014-02-21 10:12 UTC (permalink / raw) To: linux-arm-kernel Hi, On Thu, Feb 20, 2014 at 06:46:26PM +0100, Lars-Peter Clausen wrote: > On 02/20/2014 05:21 PM, Markus Pargmann wrote: > >This is a conversion queue driver for the mx25 SoC. It uses the central > >ADC which is used by two seperate independent queues. This driver > >prepares different conversion configurations for each possible input. > >For a conversion it creates a conversionqueue of one item with the > >correct configuration for the chosen channel. It then executes the queue > >once and disables the conversion queue afterwards. > > > >The reference voltages are configurable through devicetree subnodes, > >depending on the connections of the ADC inputs. > > > >Signed-off-by: Markus Pargmann <mpa@pengutronix.de> > > Looks good mostly. Just a couple of minor code-style issues. Try to > run checkpatch, sparse and friends on your driver before submission. > They catch most of the stuff that needs to be fixed in this driver. I used checkpatch and will have a look at sparse. > > [..] > >diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig > >index 2209f28..a421445 100644 > >--- a/drivers/iio/adc/Kconfig > >+++ b/drivers/iio/adc/Kconfig > >@@ -113,6 +113,13 @@ config EXYNOS_ADC > > of SoCs for drivers such as the touchscreen and hwmon to use to share > > this resource. > > > >+config MX25_ADC > >+ tristate "Freescale MX25 ADC driver" > >+ depends on MFD_MX25_TSADC > >+ help > >+ Generic Conversion Queue driver used for general purpose ADC in the > >+ MX25. This driver supports single measurements using the MX25 ADC. > >+ > > alphabetical order I changed the config option name to "FSL_MX25_ADC" to have it in alphabetical order for the user visible menuconfig and the config symbols. > > > config LP8788_ADC > > bool "LP8788 ADC driver" > > depends on MFD_LP8788 > >diff --git a/drivers/iio/adc/Makefile b/drivers/iio/adc/Makefile > >index ba9a10a..63daa2c 100644 > >--- a/drivers/iio/adc/Makefile > >+++ b/drivers/iio/adc/Makefile > >@@ -22,3 +22,4 @@ obj-$(CONFIG_TI_ADC081C) += ti-adc081c.o > > obj-$(CONFIG_TI_AM335X_ADC) += ti_am335x_adc.o > > obj-$(CONFIG_TWL6030_GPADC) += twl6030-gpadc.o > > obj-$(CONFIG_VIPERBOARD_ADC) += viperboard_adc.o > >+obj-$(CONFIG_MX25_ADC) += fsl-imx25-gcq.o > > Here too Fixed. > > [...] > > >+const struct iio_chan_spec mx25_gcq_channels[MX25_NUM_CFGS] = { > > static Fixed. > > >+ MX25_IIO_CHAN(0, "xp"), > >+ MX25_IIO_CHAN(1, "yp"), > >+ MX25_IIO_CHAN(2, "xn"), > >+ MX25_IIO_CHAN(3, "yn"), > >+ MX25_IIO_CHAN(4, "wiper"), > >+ MX25_IIO_CHAN(5, "inaux0"), > >+ MX25_IIO_CHAN(6, "inaux1"), > >+ MX25_IIO_CHAN(7, "inaux2"), > >+}; > >+ > > >+struct iio_info mx25_gcq_iio_info = { > > static const Fixed. > > >+ .read_raw = mx25_gcq_read_raw, > >+}; > >+ > >+static struct regmap_config mx25_gcq_regconfig = { > > const Fixed. > > >+ .fast_io = true, > > You don't need to set fast_io since this is already done at the > regmap_bus level. Okay, I removed it. > > >+ .max_register = 0x5c, > >+ .reg_bits = 32, > >+ .val_bits = 32, > >+ .reg_stride = 4, > >+}; > >+ > >+static void mx25_gcq_iio_dev_setup(struct platform_device *pdev, > >+ struct iio_dev *idev) > >+{ > >+ idev->dev.parent = &pdev->dev; > >+ idev->channels = mx25_gcq_channels; > >+ idev->num_channels = ARRAY_SIZE(mx25_gcq_channels); > >+ idev->info = &mx25_gcq_iio_info; > > Any reason why this needs to be in a separate function and can't be > inlined in probe()? No reason for that. I moved it back to probe(). > > >+} > >+ > >+static int mx25_gcq_setup_cfgs(struct platform_device *pdev, > >+ struct mx25_gcq_priv *priv) > >+{ > >+ struct device_node *np = pdev->dev.of_node; > >+ struct device_node *child; > >+ struct device *dev = &pdev->dev; > >+ int ret; > >+ int i; > >+ > >+ /* Setup all configurations registers with a default conversion > >+ * configuration for each input */ > >+ for (i = 0; i != MX25_NUM_CFGS; ++i) > >+ regmap_write(priv->regs, MX25_ADCQ_CFG(i), > >+ MX25_ADCQ_CFG_YPLL_OFF | > >+ MX25_ADCQ_CFG_XNUR_OFF | > >+ MX25_ADCQ_CFG_XPUL_OFF | > >+ MX25_ADCQ_CFG_REFP_INT | > >+ (i << 4) | > >+ MX25_ADCQ_CFG_REFN_NGND2); > >+ > >+ for_each_child_of_node(np, child) { > >+ u32 reg; > >+ u32 refn; > >+ u32 refp; > >+ > >+ ret = of_property_read_u32(child, "reg", ®); > >+ if (ret) { > >+ dev_err(dev, "Failed to get reg property\n"); > >+ return ret; > >+ } > >+ if (reg > MX25_NUM_CFGS) { > >+ dev_err(dev, "reg value is greater than the number of available configuration registers\n"); > >+ return -EINVAL; > >+ } > >+ > >+ ret = of_property_read_u32(child, "fsl,adc-refn", &refn); > >+ if (ret) { > >+ dev_err(dev, "Failed to get fsl,adc-refn property\n"); > >+ return ret; > >+ } > >+ > >+ ret = of_property_read_u32(child, "fsl,adc-refp", &refp); > >+ if (ret) { > >+ dev_err(dev, "Failed to get fsl,adc-refp property\n"); > >+ return ret; > >+ } > > Range check for refp and refn? Range check added for both. > > >+ > >+ regmap_update_bits(priv->regs, MX25_ADCQ_CFG(reg), > >+ MX25_ADCQ_CFG_REFP_MASK | > >+ MX25_ADCQ_CFG_REFN_MASK, > >+ (refp << 7) | (refn << 2)); > >+ } > >+ regmap_update_bits(priv->regs, MX25_ADCQ_CR, > >+ MX25_ADCQ_CR_FRST | MX25_ADCQ_CR_QRST, > >+ MX25_ADCQ_CR_FRST | MX25_ADCQ_CR_QRST); > >+ > >+ regmap_write(priv->regs, MX25_ADCQ_CR, > >+ MX25_ADCQ_CR_PDMSK | > >+ MX25_ADCQ_CR_QSM_FQS); > >+ > >+ return 0; > >+} > >+ > >+static int mx25_gcq_probe(struct platform_device *pdev) > >+{ > >+ struct iio_dev *idev; > >+ struct mx25_gcq_priv *priv; > >+ struct resource *res; > >+ struct device *dev = &pdev->dev; > >+ int ret; > >+ int irq; > >+ void __iomem *mem; > >+ > >+ idev = devm_iio_device_alloc(&pdev->dev, sizeof(*priv)); > >+ if (!idev) > >+ return -ENOMEM; > >+ > >+ priv = iio_priv(idev); > >+ > >+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > >+ mem = devm_ioremap_resource(dev, res); > >+ if (!mem) { > >+ dev_err(dev, "Failed to get iomem"); > > devm_ioremap_resource already prints a error message for you Okay, I removed dev_err. > > >+ return -ENOMEM; > >+ } > >+ > >+ priv->regs = devm_regmap_init_mmio(dev, mem, &mx25_gcq_regconfig); > >+ if (IS_ERR(priv->regs)) { > >+ dev_err(dev, "Failed to initialize regmap\n"); > >+ return PTR_ERR(priv->regs); > >+ } > >+ > >+ irq = platform_get_irq(pdev, 0); > >+ if (irq < 0) { > > 0 is not a valid IRQ number either Fixed. > > >+ dev_err(dev, "Failed to get IRQ\n"); > >+ return irq; > >+ } > >+ > >+ ret = devm_request_irq(dev, irq, mx25_gcq_irq, IRQF_ONESHOT, pdev->name, > >+ priv); > > IRQF_ONESHOT does not make much sense for non-threaded IRQs. Also it > is probably safer to use the non managed variant of request_irq > here. Right, I removed the IRQF_ONESHOT flag. Why is it safer to use the non managed request_irq? > > >+ if (ret) { > >+ dev_err(dev, "Failed requesting IRQ\n"); > > It usually makes sense to include the error number in the message. > Same for the other error messages in probe. The error values are returned from the probe function, so the error number should be displayed by really_probe() in drivers/base/dd.c . > > >+ return ret; > >+ } > >+ > >+ ret = mx25_gcq_setup_cfgs(pdev, priv); > >+ if (ret) > >+ return ret; > >+ > >+ mx25_gcq_iio_dev_setup(pdev, idev); > >+ > >+ ret = iio_device_register(idev); > >+ if (ret) { > >+ dev_err(dev, "Failed to register iio device\n"); > >+ return ret; > >+ } > >+ > >+ init_completion(&priv->completed); > > Should be done before the interrupt handler is registered. You > reference it in there. > > >+ > >+ priv->clk = mx25_tsadc_get_ipg(pdev->dev.parent); > >+ ret = clk_prepare_enable(priv->clk); > > The clock should probably also be enabled before the interrupt > handler and the IIO device are registered. Fixed. The last two items are request_irq() and iio_device_register(). > > >+ if (ret) { > >+ dev_err(dev, "Failed to enable clock\n"); > >+ return ret; > >+ } > >+ > >+ platform_set_drvdata(pdev, priv); > >+ > >+ return 0; > >+} > >+ > >+static int mx25_gcq_remove(struct platform_device *pdev) > >+{ > >+ struct mx25_gcq_priv *priv = platform_get_drvdata(pdev); > >+ > > iio_device_unregister(). Fixed. > > >+ clk_disable_unprepare(priv->clk); > >+ > >+ return 0; > >+} > > Thanks, Markus -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140221/abd68b6e/attachment-0001.sig> ^ permalink raw reply [flat|nested] 76+ messages in thread
* Dust off the "arm imx25 touchscreen/ADC drivers" patch serie. 2014-02-20 16:21 ` Markus Pargmann @ 2014-06-13 15:21 ` Denis Carikli -1 siblings, 0 replies; 76+ messages in thread From: Denis Carikli @ 2014-06-13 15:21 UTC (permalink / raw) To: Shawn Guo, Samuel Ortiz, Dmitry Torokhov, Jonathan Cameron Cc: Eric Bénard, Sascha Hauer, linux-arm-kernel, Lee Jones, linux-input, linux-iio, Fabio Estevam, Lars-Peter Clausen, Markus Pargmann Hi, I haven't seen any new comments on that serie since february, so I picked it again and I tried to address all remaining comments. To be able to test that patch, the following patch will need to be cherry-picked. http://lists.infradead.org/pipermail/linux-arm-kernel/2014-June/263494.html Denis. ^ permalink raw reply [flat|nested] 76+ messages in thread
* Dust off the "arm imx25 touchscreen/ADC drivers" patch serie. @ 2014-06-13 15:21 ` Denis Carikli 0 siblings, 0 replies; 76+ messages in thread From: Denis Carikli @ 2014-06-13 15:21 UTC (permalink / raw) To: linux-arm-kernel Hi, I haven't seen any new comments on that serie since february, so I picked it again and I tried to address all remaining comments. To be able to test that patch, the following patch will need to be cherry-picked. http://lists.infradead.org/pipermail/linux-arm-kernel/2014-June/263494.html Denis. ^ permalink raw reply [flat|nested] 76+ messages in thread
* [PATCH v2 1/6] mfd: fsl imx25 Touchscreen ADC driver 2014-06-13 15:21 ` Denis Carikli @ 2014-06-13 15:21 ` Denis Carikli -1 siblings, 0 replies; 76+ messages in thread From: Denis Carikli @ 2014-06-13 15:21 UTC (permalink / raw) To: Shawn Guo, Samuel Ortiz, Dmitry Torokhov, Jonathan Cameron Cc: Eric Bénard, Sascha Hauer, linux-arm-kernel, Lee Jones, linux-input, linux-iio, Fabio Estevam, Lars-Peter Clausen, Markus Pargmann, Denis Carikli From: Markus Pargmann <mpa@pengutronix.de> This is the core driver for imx25 touchscreen/adc driver. The module has one shared ADC and two different conversion queues which use the ADC. The two queues are identical. Both can be used for general purpose ADC but one is meant to be used for touchscreens. This driver is the core which manages the central components and registers of the TSC/ADC unit. It manages the IRQs and forwards them to the correct components. Signed-off-by: Markus Pargmann <mpa@pengutronix.de> Signed-off-by: Denis Carikli <denis@eukrea.com> --- .../devicetree/bindings/mfd/fsl-imx25-tsadc.txt | 46 ++++ drivers/mfd/Kconfig | 9 + drivers/mfd/Makefile | 2 + drivers/mfd/fsl-imx25-tsadc.c | 232 ++++++++++++++++++++ include/linux/mfd/imx25-tsadc.h | 138 ++++++++++++ 5 files changed, 427 insertions(+) create mode 100644 Documentation/devicetree/bindings/mfd/fsl-imx25-tsadc.txt create mode 100644 drivers/mfd/fsl-imx25-tsadc.c create mode 100644 include/linux/mfd/imx25-tsadc.h diff --git a/Documentation/devicetree/bindings/mfd/fsl-imx25-tsadc.txt b/Documentation/devicetree/bindings/mfd/fsl-imx25-tsadc.txt new file mode 100644 index 0000000..a857af0e --- /dev/null +++ b/Documentation/devicetree/bindings/mfd/fsl-imx25-tsadc.txt @@ -0,0 +1,46 @@ +Freescale mx25 ADC/TSC multifunction device + +This device combines two general purpose conversion queues one used for general +ADC and the other used for touchscreens. + +Required properties: + - compatible: Should be "fsl,imx25-tsadc". + - reg: Memory range of the device. + - interrupts: Interrupt for this device as described in + interrupts/interrupts.txt + - clocks: An 'ipg' clock defined as described in clocks/clock.txt + - interrupt-controller: This device is an interrupt controller. It controls + the interrupts of both conversion queues. + - #interrupt-cells: Should be '<1>'. + - #address-cells: Should be '<1>'. + - #size-cells: Should be '<1>'. + - ranges + +This device includes two conversion queues which can be added as subnodes. +The first queue is for the touchscreen, the second for general purpose ADC. + +Example: + tscadc: tscadc@50030000 { + compatible = "fsl,imx25-tsadc"; + reg = <0x50030000 0xc>; + interrupts = <46>; + clocks = <&clks 119>; + clock-names = "ipg"; + interrupt-controller; + #interrupt-cells = <1>; + #address-cells = <1>; + #size-cells = <1>; + ranges; + + tsc: tcq@50030400 { + compatible = "fsl,imx25-tcq"; + reg = <0x50030400 0x60>; + ... + }; + + adc: gcq@50030800 { + compatible = "fsl,imx25-gcq"; + reg = <0x50030800 0x60>; + ... + }; + }; diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig index ee8204c..73f4e66 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig @@ -183,6 +183,15 @@ config MFD_DA9063 Additional drivers must be enabled in order to use the functionality of the device. +config MFD_MX25_TSADC + tristate "Freescale i.MX25 integrated Touchscreen and ADC unit" + depends on ARCH_MXC + select REGMAP_MMIO + help + Enable support for the integrated Touchscreen and ADC unit of the + i.MX25 processors. They consist of a conversion queue for general + purpose ADC and a queue for Touchscreens. + config MFD_MC13XXX tristate depends on (SPI_MASTER || I2C) diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile index 8afedba..7ff1013 100644 --- a/drivers/mfd/Makefile +++ b/drivers/mfd/Makefile @@ -78,6 +78,8 @@ obj-$(CONFIG_TWL4030_POWER) += twl4030-power.o obj-$(CONFIG_MFD_TWL4030_AUDIO) += twl4030-audio.o obj-$(CONFIG_TWL6040_CORE) += twl6040.o +obj-$(CONFIG_MFD_MX25_TSADC) += fsl-imx25-tsadc.o + obj-$(CONFIG_MFD_MC13XXX) += mc13xxx-core.o obj-$(CONFIG_MFD_MC13XXX_SPI) += mc13xxx-spi.o obj-$(CONFIG_MFD_MC13XXX_I2C) += mc13xxx-i2c.o diff --git a/drivers/mfd/fsl-imx25-tsadc.c b/drivers/mfd/fsl-imx25-tsadc.c new file mode 100644 index 0000000..10332c2 --- /dev/null +++ b/drivers/mfd/fsl-imx25-tsadc.c @@ -0,0 +1,232 @@ +/* + * Copyright 2014 Markus Pargmann, Pengutronix <mpa@pengutronix.de> + * + * The code contained herein is licensed under the GNU General Public + * License. You may obtain a copy of the GNU General Public License + * Version 2 or later at the following locations: + * + * http://www.opensource.org/licenses/gpl-license.html + * http://www.gnu.org/copyleft/gpl.html + */ + +#include <linux/clk.h> +#include <linux/interrupt.h> +#include <linux/irq.h> +#include <linux/irqdesc.h> +#include <linux/irqdomain.h> +#include <linux/irqchip/chained_irq.h> +#include <linux/mfd/imx25-tsadc.h> +#include <linux/module.h> +#include <linux/of.h> +#include <linux/of_platform.h> +#include <linux/platform_device.h> +#include <linux/regmap.h> + +struct mx25_tsadc_priv { + struct regmap *regs; + struct irq_domain *domain; + struct clk *clk; +}; + +static struct regmap_config mx25_tsadc = { + .fast_io = true, + .max_register = 0x8, + .reg_bits = 32, + .val_bits = 32, + .reg_stride = 4, +}; + +struct regmap *mx25_tsadc_get_regmap(struct device *dev) +{ + struct platform_device *pdev; + struct mx25_tsadc_priv *priv; + + if (!dev) + return NULL; + + pdev = container_of(dev, struct platform_device, dev); + priv = platform_get_drvdata(pdev); + if (IS_ERR_OR_NULL(priv->regs)) + return NULL; + + return priv->regs; +} +EXPORT_SYMBOL(mx25_tsadc_get_regmap); + +struct clk *mx25_tsadc_get_ipg(struct device *dev) +{ + struct platform_device *pdev; + struct mx25_tsadc_priv *priv; + + if (!dev) + return NULL; + + pdev = container_of(dev, struct platform_device, dev); + priv = platform_get_drvdata(pdev); + if (IS_ERR_OR_NULL(priv->clk)) + return NULL; + + return priv->clk; +} +EXPORT_SYMBOL(mx25_tsadc_get_ipg); + +static void mx25_tsadc_irq_handler(u32 irq, struct irq_desc *desc) +{ + struct mx25_tsadc_priv *priv = irq_desc_get_handler_data(desc); + struct irq_chip *chip = irq_get_chip(irq); + u32 status; + + chained_irq_enter(chip, desc); + + regmap_read(priv->regs, MX25_TSC_TGSR, &status); + + if (status & MX25_TGSR_GCQ_INT) + generic_handle_irq(irq_find_mapping(priv->domain, 1)); + + if (status & MX25_TGSR_TCQ_INT) + generic_handle_irq(irq_find_mapping(priv->domain, 0)); + + chained_irq_exit(chip, desc); +} + +static void mx25_tsadc_nop(struct irq_data *d) +{ +} + +static int mx25_tsadc_set_wake_nop(struct irq_data *d, unsigned int state) +{ + return 0; +} + +static struct irq_chip mx25_tsadc_irq_chip = { + .name = "mx25-tsadc", + .irq_ack = mx25_tsadc_nop, + .irq_mask = mx25_tsadc_nop, + .irq_unmask = mx25_tsadc_nop, + .irq_set_wake = mx25_tsadc_set_wake_nop, +}; + +static int mx25_tsadc_domain_map(struct irq_domain *d, unsigned int irq, + irq_hw_number_t hwirq) +{ + struct mx25_tsadc_priv *priv = d->host_data; + + irq_set_chip_data(irq, priv); + irq_set_chip_and_handler(irq, &mx25_tsadc_irq_chip, + handle_level_irq); + + + set_irq_flags(irq, IRQF_VALID); + + return 0; +} + +static struct irq_domain_ops mx25_tsadc_domain_ops = { + .map = mx25_tsadc_domain_map, + .xlate = irq_domain_xlate_onecell, +}; + +static int mx25_tsadc_setup_irq(struct platform_device *pdev, + struct mx25_tsadc_priv *priv) +{ + struct device *dev = &pdev->dev; + struct device_node *np = dev->of_node; + int irq; + + irq = platform_get_irq(pdev, 0); + if (irq < 0) { + dev_err(dev, "Failed to get irq\n"); + return irq; + } + + priv->domain = irq_domain_add_simple(np, 2, 0, &mx25_tsadc_domain_ops, + priv); + if (!priv->domain) { + dev_err(dev, "Failed to add irq domain\n"); + return -ENOMEM; + } + + irq_set_chained_handler(irq, mx25_tsadc_irq_handler); + irq_set_handler_data(irq, priv); + + return 0; +} + +static int mx25_tsadc_probe(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + struct device_node *np = dev->of_node; + struct mx25_tsadc_priv *priv; + struct resource *iores; + int ret; + void __iomem *iomem; + + priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); + if (!priv) + return -ENOMEM; + + iores = platform_get_resource(pdev, IORESOURCE_MEM, 0); + iomem = devm_ioremap_resource(dev, iores); + if (IS_ERR(iomem)) { + dev_err(dev, "Failed to remap iomem\n"); + return PTR_ERR(iomem); + } + + priv->regs = regmap_init_mmio(dev, iomem, &mx25_tsadc); + if (IS_ERR(priv->regs)) { + dev_err(dev, "Failed to initialize regmap\n"); + return PTR_ERR(priv->regs); + } + + priv->clk = devm_clk_get(dev, "ipg"); + if (IS_ERR(priv->clk)) { + dev_err(dev, "Failed to get ipg clock\n"); + return PTR_ERR(priv->clk); + } + + /* Enable clock and reset the component */ + regmap_update_bits(priv->regs, MX25_TSC_TGCR, MX25_TGCR_CLK_EN, + MX25_TGCR_CLK_EN); + regmap_update_bits(priv->regs, MX25_TSC_TGCR, MX25_TGCR_TSC_RST, + MX25_TGCR_TSC_RST); + + /* Setup powersaving mode, but enable internal reference voltage */ + regmap_update_bits(priv->regs, MX25_TSC_TGCR, MX25_TGCR_POWERMODE_MASK, + MX25_TGCR_POWERMODE_SAVE); + regmap_update_bits(priv->regs, MX25_TSC_TGCR, MX25_TGCR_INTREFEN, + MX25_TGCR_INTREFEN); + + ret = mx25_tsadc_setup_irq(pdev, priv); + if (ret) { + dev_err(dev, "Failed to setup irqs\n"); + return ret; + } + + platform_set_drvdata(pdev, priv); + + of_platform_populate(np, NULL, NULL, dev); + + dev_info(dev, "i.MX25 Touchscreen and ADC core driver loaded\n"); + + return 0; +} + +static const struct of_device_id mx25_tsadc_ids[] = { + { .compatible = "fsl,imx25-tsadc", }, + { /* Sentinel */ } +}; + +static struct platform_driver mx25_tsadc_driver = { + .driver = { + .name = "mx25-tsadc", + .owner = THIS_MODULE, + .of_match_table = mx25_tsadc_ids, + }, + .probe = mx25_tsadc_probe, +}; +module_platform_driver(mx25_tsadc_driver); + +MODULE_DESCRIPTION("MFD for ADC/TSC for Freescale mx25"); +MODULE_AUTHOR("Markus Pargmann <mpa@pengutronix.de>"); +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:mx25-tsadc"); diff --git a/include/linux/mfd/imx25-tsadc.h b/include/linux/mfd/imx25-tsadc.h new file mode 100644 index 0000000..6fba341 --- /dev/null +++ b/include/linux/mfd/imx25-tsadc.h @@ -0,0 +1,138 @@ +#ifndef _LINUX_INCLUDE_INPUT_IMX25_TSADC_H_ +#define _LINUX_INCLUDE_INPUT_IMX25_TSADC_H_ + +struct regmap; +struct device; +struct clk; + +struct regmap *mx25_tsadc_get_regmap(struct device *dev); +struct clk *mx25_tsadc_get_ipg(struct device *dev); + +#define MX25_TSC_TGCR 0x00 +#define MX25_TSC_TGSR 0x04 +#define MX25_TSC_TICR 0x08 + +/* The same register layout for TC and GC queue */ +#define MX25_ADCQ_FIFO 0x00 +#define MX25_ADCQ_CR 0x04 +#define MX25_ADCQ_SR 0x08 +#define MX25_ADCQ_MR 0x0c +#define MX25_ADCQ_ITEM_7_0 0x20 +#define MX25_ADCQ_ITEM_15_8 0x24 +#define MX25_ADCQ_CFG(n) (0x40 + ((n) * 0x4)) + +/* Register values */ +/* Queue Config register */ +#define MX25_ADCQ_MR_MASK 0xffffffff + +/* TGCR */ +#define MX25_TGCR_PDBTIME(x) ((x) << 25) +#define MX25_TGCR_PDBTIME_MASK MX25_TGCR_PDBTIME(0x7f) +#define MX25_TGCR_PDBEN (1 << 24) +#define MX25_TGCR_PDEN (1 << 23) +#define MX25_TGCR_ADCCLKCFG(x) ((x) << 16) +#define MX25_TGCR_GET_ADCCLK(x) (((x) >> 16) & 0x1f) +#define MX25_TGCR_INTREFEN (1 << 10) +#define MX25_TGCR_POWERMODE_MASK (3 << 8) +#define MX25_TGCR_POWERMODE_SAVE (1 << 8) +#define MX25_TGCR_POWERMODE_ON (2 << 8) +#define MX25_TGCR_STLC (1 << 5) +#define MX25_TGCR_SLPC (1 << 4) +#define MX25_TGCR_FUNC_RST (1 << 2) +#define MX25_TGCR_TSC_RST (1 << 1) +#define MX25_TGCR_CLK_EN (1 << 0) + +/* TGSR */ +#define MX25_TGSR_SLP_INT (1 << 2) +#define MX25_TGSR_GCQ_INT (1 << 1) +#define MX25_TGSR_TCQ_INT (1 << 0) + +/* ADCQ_ITEM_* */ +#define _MX25_ADCQ_ITEM(item, x) ((x) << ((item) * 4)) +#define MX25_ADCQ_ITEM(item, x) ((item) >= 8 ? \ + _MX25_ADCQ_ITEM((item) - 8, (x)) : _MX25_ADCQ_ITEM((item), (x))) + +/* ADCQ_FIFO (TCQFIFO and GCQFIFO) */ +#define MX25_ADCQ_FIFO_DATA(x) (((x) >> 4) & 0xfff) +#define MX25_ADCQ_FIFO_ID(x) ((x) & 0xf) + +/* ADCQ_CR (TCQR and GCQR) */ +#define MX25_ADCQ_CR_PDCFG_LEVEL (1 << 19) +#define MX25_ADCQ_CR_PDMSK (1 << 18) +#define MX25_ADCQ_CR_FRST (1 << 17) +#define MX25_ADCQ_CR_QRST (1 << 16) +#define MX25_ADCQ_CR_RWAIT_MASK (0xf << 12) +#define MX25_ADCQ_CR_RWAIT(x) ((x) << 12) +#define MX25_ADCQ_CR_WMRK_MASK (0xf << 8) +#define MX25_ADCQ_CR_WMRK(x) ((x) << 8) +#define MX25_ADCQ_CR_LITEMID_MASK (0xf << 4) +#define MX25_ADCQ_CR_LITEMID(x) ((x) << 4) +#define MX25_ADCQ_CR_RPT (1 << 3) +#define MX25_ADCQ_CR_FQS (1 << 2) +#define MX25_ADCQ_CR_QSM_MASK 0x3 +#define MX25_ADCQ_CR_QSM_PD 0x1 +#define MX25_ADCQ_CR_QSM_FQS 0x2 +#define MX25_ADCQ_CR_QSM_FQS_PD 0x3 + +/* ADCQ_SR (TCQSR and GCQSR) */ +#define MX25_ADCQ_SR_FDRY (1 << 15) +#define MX25_ADCQ_SR_FULL (1 << 14) +#define MX25_ADCQ_SR_EMPT (1 << 13) +#define MX25_ADCQ_SR_FDN(x) (((x) >> 8) & 0x1f) +#define MX25_ADCQ_SR_FRR (1 << 6) +#define MX25_ADCQ_SR_FUR (1 << 5) +#define MX25_ADCQ_SR_FOR (1 << 4) +#define MX25_ADCQ_SR_EOQ (1 << 1) +#define MX25_ADCQ_SR_PD (1 << 0) + +/* ADCQ_MR (TCQMR and GCQMR) */ +#define MX25_ADCQ_MR_FDRY_DMA (1 << 31) +#define MX25_ADCQ_MR_FER_DMA (1 << 22) +#define MX25_ADCQ_MR_FUR_DMA (1 << 21) +#define MX25_ADCQ_MR_FOR_DMA (1 << 20) +#define MX25_ADCQ_MR_EOQ_DMA (1 << 17) +#define MX25_ADCQ_MR_PD_DMA (1 << 16) +#define MX25_ADCQ_MR_FDRY_IRQ (1 << 15) +#define MX25_ADCQ_MR_FER_IRQ (1 << 6) +#define MX25_ADCQ_MR_FUR_IRQ (1 << 5) +#define MX25_ADCQ_MR_FOR_IRQ (1 << 4) +#define MX25_ADCQ_MR_EOQ_IRQ (1 << 1) +#define MX25_ADCQ_MR_PD_IRQ (1 << 0) + +/* ADCQ_CFG (TICR, TCC0-7,GCC0-7) */ +#define MX25_ADCQ_CFG_SETTLING_TIME(x) ((x) << 24) +#define MX25_ADCQ_CFG_IGS (1 << 20) +#define MX25_ADCQ_CFG_NOS_MASK (0xf << 16) +#define MX25_ADCQ_CFG_NOS(x) (((x) - 1) << 16) +#define MX25_ADCQ_CFG_WIPER (1 << 15) +#define MX25_ADCQ_CFG_YNLR (1 << 14) +#define MX25_ADCQ_CFG_YPLL_HIGH 0 +#define MX25_ADCQ_CFG_YPLL_OFF (1 << 12) +#define MX25_ADCQ_CFG_YPLL_LOW (3 << 12) +#define MX25_ADCQ_CFG_XNUR_HIGH 0 +#define MX25_ADCQ_CFG_XNUR_OFF (1 << 10) +#define MX25_ADCQ_CFG_XNUR_LOW (3 << 10) +#define MX25_ADCQ_CFG_XPUL_OFF (1 << 9) +#define MX25_ADCQ_CFG_XPUL_HIGH 0 +#define MX25_ADCQ_CFG_REFP_YP 0 +#define MX25_ADCQ_CFG_REFP_XP (1 << 7) +#define MX25_ADCQ_CFG_REFP_EXT (2 << 7) +#define MX25_ADCQ_CFG_REFP_INT (3 << 7) +#define MX25_ADCQ_CFG_REFP_MASK (3 << 7) +#define MX25_ADCQ_CFG_IN_XP 0 +#define MX25_ADCQ_CFG_IN_YP (1 << 4) +#define MX25_ADCQ_CFG_IN_XN (2 << 4) +#define MX25_ADCQ_CFG_IN_YN (3 << 4) +#define MX25_ADCQ_CFG_IN_WIPER (4 << 4) +#define MX25_ADCQ_CFG_IN_AUX0 (5 << 4) +#define MX25_ADCQ_CFG_IN_AUX1 (6 << 4) +#define MX25_ADCQ_CFG_IN_AUX2 (7 << 4) +#define MX25_ADCQ_CFG_REFN_XN 0 +#define MX25_ADCQ_CFG_REFN_YN (1 << 2) +#define MX25_ADCQ_CFG_REFN_NGND (2 << 2) +#define MX25_ADCQ_CFG_REFN_NGND2 (3 << 2) +#define MX25_ADCQ_CFG_REFN_MASK (3 << 2) +#define MX25_ADCQ_CFG_PENIACK (1 << 1) + + +#endif /* _LINUX_INCLUDE_INPUT_IMX25_TSADC_H_ */ -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 76+ messages in thread
* [PATCH v2 1/6] mfd: fsl imx25 Touchscreen ADC driver @ 2014-06-13 15:21 ` Denis Carikli 0 siblings, 0 replies; 76+ messages in thread From: Denis Carikli @ 2014-06-13 15:21 UTC (permalink / raw) To: linux-arm-kernel From: Markus Pargmann <mpa@pengutronix.de> This is the core driver for imx25 touchscreen/adc driver. The module has one shared ADC and two different conversion queues which use the ADC. The two queues are identical. Both can be used for general purpose ADC but one is meant to be used for touchscreens. This driver is the core which manages the central components and registers of the TSC/ADC unit. It manages the IRQs and forwards them to the correct components. Signed-off-by: Markus Pargmann <mpa@pengutronix.de> Signed-off-by: Denis Carikli <denis@eukrea.com> --- .../devicetree/bindings/mfd/fsl-imx25-tsadc.txt | 46 ++++ drivers/mfd/Kconfig | 9 + drivers/mfd/Makefile | 2 + drivers/mfd/fsl-imx25-tsadc.c | 232 ++++++++++++++++++++ include/linux/mfd/imx25-tsadc.h | 138 ++++++++++++ 5 files changed, 427 insertions(+) create mode 100644 Documentation/devicetree/bindings/mfd/fsl-imx25-tsadc.txt create mode 100644 drivers/mfd/fsl-imx25-tsadc.c create mode 100644 include/linux/mfd/imx25-tsadc.h diff --git a/Documentation/devicetree/bindings/mfd/fsl-imx25-tsadc.txt b/Documentation/devicetree/bindings/mfd/fsl-imx25-tsadc.txt new file mode 100644 index 0000000..a857af0e --- /dev/null +++ b/Documentation/devicetree/bindings/mfd/fsl-imx25-tsadc.txt @@ -0,0 +1,46 @@ +Freescale mx25 ADC/TSC multifunction device + +This device combines two general purpose conversion queues one used for general +ADC and the other used for touchscreens. + +Required properties: + - compatible: Should be "fsl,imx25-tsadc". + - reg: Memory range of the device. + - interrupts: Interrupt for this device as described in + interrupts/interrupts.txt + - clocks: An 'ipg' clock defined as described in clocks/clock.txt + - interrupt-controller: This device is an interrupt controller. It controls + the interrupts of both conversion queues. + - #interrupt-cells: Should be '<1>'. + - #address-cells: Should be '<1>'. + - #size-cells: Should be '<1>'. + - ranges + +This device includes two conversion queues which can be added as subnodes. +The first queue is for the touchscreen, the second for general purpose ADC. + +Example: + tscadc: tscadc at 50030000 { + compatible = "fsl,imx25-tsadc"; + reg = <0x50030000 0xc>; + interrupts = <46>; + clocks = <&clks 119>; + clock-names = "ipg"; + interrupt-controller; + #interrupt-cells = <1>; + #address-cells = <1>; + #size-cells = <1>; + ranges; + + tsc: tcq at 50030400 { + compatible = "fsl,imx25-tcq"; + reg = <0x50030400 0x60>; + ... + }; + + adc: gcq at 50030800 { + compatible = "fsl,imx25-gcq"; + reg = <0x50030800 0x60>; + ... + }; + }; diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig index ee8204c..73f4e66 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig @@ -183,6 +183,15 @@ config MFD_DA9063 Additional drivers must be enabled in order to use the functionality of the device. +config MFD_MX25_TSADC + tristate "Freescale i.MX25 integrated Touchscreen and ADC unit" + depends on ARCH_MXC + select REGMAP_MMIO + help + Enable support for the integrated Touchscreen and ADC unit of the + i.MX25 processors. They consist of a conversion queue for general + purpose ADC and a queue for Touchscreens. + config MFD_MC13XXX tristate depends on (SPI_MASTER || I2C) diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile index 8afedba..7ff1013 100644 --- a/drivers/mfd/Makefile +++ b/drivers/mfd/Makefile @@ -78,6 +78,8 @@ obj-$(CONFIG_TWL4030_POWER) += twl4030-power.o obj-$(CONFIG_MFD_TWL4030_AUDIO) += twl4030-audio.o obj-$(CONFIG_TWL6040_CORE) += twl6040.o +obj-$(CONFIG_MFD_MX25_TSADC) += fsl-imx25-tsadc.o + obj-$(CONFIG_MFD_MC13XXX) += mc13xxx-core.o obj-$(CONFIG_MFD_MC13XXX_SPI) += mc13xxx-spi.o obj-$(CONFIG_MFD_MC13XXX_I2C) += mc13xxx-i2c.o diff --git a/drivers/mfd/fsl-imx25-tsadc.c b/drivers/mfd/fsl-imx25-tsadc.c new file mode 100644 index 0000000..10332c2 --- /dev/null +++ b/drivers/mfd/fsl-imx25-tsadc.c @@ -0,0 +1,232 @@ +/* + * Copyright 2014 Markus Pargmann, Pengutronix <mpa@pengutronix.de> + * + * The code contained herein is licensed under the GNU General Public + * License. You may obtain a copy of the GNU General Public License + * Version 2 or later at the following locations: + * + * http://www.opensource.org/licenses/gpl-license.html + * http://www.gnu.org/copyleft/gpl.html + */ + +#include <linux/clk.h> +#include <linux/interrupt.h> +#include <linux/irq.h> +#include <linux/irqdesc.h> +#include <linux/irqdomain.h> +#include <linux/irqchip/chained_irq.h> +#include <linux/mfd/imx25-tsadc.h> +#include <linux/module.h> +#include <linux/of.h> +#include <linux/of_platform.h> +#include <linux/platform_device.h> +#include <linux/regmap.h> + +struct mx25_tsadc_priv { + struct regmap *regs; + struct irq_domain *domain; + struct clk *clk; +}; + +static struct regmap_config mx25_tsadc = { + .fast_io = true, + .max_register = 0x8, + .reg_bits = 32, + .val_bits = 32, + .reg_stride = 4, +}; + +struct regmap *mx25_tsadc_get_regmap(struct device *dev) +{ + struct platform_device *pdev; + struct mx25_tsadc_priv *priv; + + if (!dev) + return NULL; + + pdev = container_of(dev, struct platform_device, dev); + priv = platform_get_drvdata(pdev); + if (IS_ERR_OR_NULL(priv->regs)) + return NULL; + + return priv->regs; +} +EXPORT_SYMBOL(mx25_tsadc_get_regmap); + +struct clk *mx25_tsadc_get_ipg(struct device *dev) +{ + struct platform_device *pdev; + struct mx25_tsadc_priv *priv; + + if (!dev) + return NULL; + + pdev = container_of(dev, struct platform_device, dev); + priv = platform_get_drvdata(pdev); + if (IS_ERR_OR_NULL(priv->clk)) + return NULL; + + return priv->clk; +} +EXPORT_SYMBOL(mx25_tsadc_get_ipg); + +static void mx25_tsadc_irq_handler(u32 irq, struct irq_desc *desc) +{ + struct mx25_tsadc_priv *priv = irq_desc_get_handler_data(desc); + struct irq_chip *chip = irq_get_chip(irq); + u32 status; + + chained_irq_enter(chip, desc); + + regmap_read(priv->regs, MX25_TSC_TGSR, &status); + + if (status & MX25_TGSR_GCQ_INT) + generic_handle_irq(irq_find_mapping(priv->domain, 1)); + + if (status & MX25_TGSR_TCQ_INT) + generic_handle_irq(irq_find_mapping(priv->domain, 0)); + + chained_irq_exit(chip, desc); +} + +static void mx25_tsadc_nop(struct irq_data *d) +{ +} + +static int mx25_tsadc_set_wake_nop(struct irq_data *d, unsigned int state) +{ + return 0; +} + +static struct irq_chip mx25_tsadc_irq_chip = { + .name = "mx25-tsadc", + .irq_ack = mx25_tsadc_nop, + .irq_mask = mx25_tsadc_nop, + .irq_unmask = mx25_tsadc_nop, + .irq_set_wake = mx25_tsadc_set_wake_nop, +}; + +static int mx25_tsadc_domain_map(struct irq_domain *d, unsigned int irq, + irq_hw_number_t hwirq) +{ + struct mx25_tsadc_priv *priv = d->host_data; + + irq_set_chip_data(irq, priv); + irq_set_chip_and_handler(irq, &mx25_tsadc_irq_chip, + handle_level_irq); + + + set_irq_flags(irq, IRQF_VALID); + + return 0; +} + +static struct irq_domain_ops mx25_tsadc_domain_ops = { + .map = mx25_tsadc_domain_map, + .xlate = irq_domain_xlate_onecell, +}; + +static int mx25_tsadc_setup_irq(struct platform_device *pdev, + struct mx25_tsadc_priv *priv) +{ + struct device *dev = &pdev->dev; + struct device_node *np = dev->of_node; + int irq; + + irq = platform_get_irq(pdev, 0); + if (irq < 0) { + dev_err(dev, "Failed to get irq\n"); + return irq; + } + + priv->domain = irq_domain_add_simple(np, 2, 0, &mx25_tsadc_domain_ops, + priv); + if (!priv->domain) { + dev_err(dev, "Failed to add irq domain\n"); + return -ENOMEM; + } + + irq_set_chained_handler(irq, mx25_tsadc_irq_handler); + irq_set_handler_data(irq, priv); + + return 0; +} + +static int mx25_tsadc_probe(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + struct device_node *np = dev->of_node; + struct mx25_tsadc_priv *priv; + struct resource *iores; + int ret; + void __iomem *iomem; + + priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); + if (!priv) + return -ENOMEM; + + iores = platform_get_resource(pdev, IORESOURCE_MEM, 0); + iomem = devm_ioremap_resource(dev, iores); + if (IS_ERR(iomem)) { + dev_err(dev, "Failed to remap iomem\n"); + return PTR_ERR(iomem); + } + + priv->regs = regmap_init_mmio(dev, iomem, &mx25_tsadc); + if (IS_ERR(priv->regs)) { + dev_err(dev, "Failed to initialize regmap\n"); + return PTR_ERR(priv->regs); + } + + priv->clk = devm_clk_get(dev, "ipg"); + if (IS_ERR(priv->clk)) { + dev_err(dev, "Failed to get ipg clock\n"); + return PTR_ERR(priv->clk); + } + + /* Enable clock and reset the component */ + regmap_update_bits(priv->regs, MX25_TSC_TGCR, MX25_TGCR_CLK_EN, + MX25_TGCR_CLK_EN); + regmap_update_bits(priv->regs, MX25_TSC_TGCR, MX25_TGCR_TSC_RST, + MX25_TGCR_TSC_RST); + + /* Setup powersaving mode, but enable internal reference voltage */ + regmap_update_bits(priv->regs, MX25_TSC_TGCR, MX25_TGCR_POWERMODE_MASK, + MX25_TGCR_POWERMODE_SAVE); + regmap_update_bits(priv->regs, MX25_TSC_TGCR, MX25_TGCR_INTREFEN, + MX25_TGCR_INTREFEN); + + ret = mx25_tsadc_setup_irq(pdev, priv); + if (ret) { + dev_err(dev, "Failed to setup irqs\n"); + return ret; + } + + platform_set_drvdata(pdev, priv); + + of_platform_populate(np, NULL, NULL, dev); + + dev_info(dev, "i.MX25 Touchscreen and ADC core driver loaded\n"); + + return 0; +} + +static const struct of_device_id mx25_tsadc_ids[] = { + { .compatible = "fsl,imx25-tsadc", }, + { /* Sentinel */ } +}; + +static struct platform_driver mx25_tsadc_driver = { + .driver = { + .name = "mx25-tsadc", + .owner = THIS_MODULE, + .of_match_table = mx25_tsadc_ids, + }, + .probe = mx25_tsadc_probe, +}; +module_platform_driver(mx25_tsadc_driver); + +MODULE_DESCRIPTION("MFD for ADC/TSC for Freescale mx25"); +MODULE_AUTHOR("Markus Pargmann <mpa@pengutronix.de>"); +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:mx25-tsadc"); diff --git a/include/linux/mfd/imx25-tsadc.h b/include/linux/mfd/imx25-tsadc.h new file mode 100644 index 0000000..6fba341 --- /dev/null +++ b/include/linux/mfd/imx25-tsadc.h @@ -0,0 +1,138 @@ +#ifndef _LINUX_INCLUDE_INPUT_IMX25_TSADC_H_ +#define _LINUX_INCLUDE_INPUT_IMX25_TSADC_H_ + +struct regmap; +struct device; +struct clk; + +struct regmap *mx25_tsadc_get_regmap(struct device *dev); +struct clk *mx25_tsadc_get_ipg(struct device *dev); + +#define MX25_TSC_TGCR 0x00 +#define MX25_TSC_TGSR 0x04 +#define MX25_TSC_TICR 0x08 + +/* The same register layout for TC and GC queue */ +#define MX25_ADCQ_FIFO 0x00 +#define MX25_ADCQ_CR 0x04 +#define MX25_ADCQ_SR 0x08 +#define MX25_ADCQ_MR 0x0c +#define MX25_ADCQ_ITEM_7_0 0x20 +#define MX25_ADCQ_ITEM_15_8 0x24 +#define MX25_ADCQ_CFG(n) (0x40 + ((n) * 0x4)) + +/* Register values */ +/* Queue Config register */ +#define MX25_ADCQ_MR_MASK 0xffffffff + +/* TGCR */ +#define MX25_TGCR_PDBTIME(x) ((x) << 25) +#define MX25_TGCR_PDBTIME_MASK MX25_TGCR_PDBTIME(0x7f) +#define MX25_TGCR_PDBEN (1 << 24) +#define MX25_TGCR_PDEN (1 << 23) +#define MX25_TGCR_ADCCLKCFG(x) ((x) << 16) +#define MX25_TGCR_GET_ADCCLK(x) (((x) >> 16) & 0x1f) +#define MX25_TGCR_INTREFEN (1 << 10) +#define MX25_TGCR_POWERMODE_MASK (3 << 8) +#define MX25_TGCR_POWERMODE_SAVE (1 << 8) +#define MX25_TGCR_POWERMODE_ON (2 << 8) +#define MX25_TGCR_STLC (1 << 5) +#define MX25_TGCR_SLPC (1 << 4) +#define MX25_TGCR_FUNC_RST (1 << 2) +#define MX25_TGCR_TSC_RST (1 << 1) +#define MX25_TGCR_CLK_EN (1 << 0) + +/* TGSR */ +#define MX25_TGSR_SLP_INT (1 << 2) +#define MX25_TGSR_GCQ_INT (1 << 1) +#define MX25_TGSR_TCQ_INT (1 << 0) + +/* ADCQ_ITEM_* */ +#define _MX25_ADCQ_ITEM(item, x) ((x) << ((item) * 4)) +#define MX25_ADCQ_ITEM(item, x) ((item) >= 8 ? \ + _MX25_ADCQ_ITEM((item) - 8, (x)) : _MX25_ADCQ_ITEM((item), (x))) + +/* ADCQ_FIFO (TCQFIFO and GCQFIFO) */ +#define MX25_ADCQ_FIFO_DATA(x) (((x) >> 4) & 0xfff) +#define MX25_ADCQ_FIFO_ID(x) ((x) & 0xf) + +/* ADCQ_CR (TCQR and GCQR) */ +#define MX25_ADCQ_CR_PDCFG_LEVEL (1 << 19) +#define MX25_ADCQ_CR_PDMSK (1 << 18) +#define MX25_ADCQ_CR_FRST (1 << 17) +#define MX25_ADCQ_CR_QRST (1 << 16) +#define MX25_ADCQ_CR_RWAIT_MASK (0xf << 12) +#define MX25_ADCQ_CR_RWAIT(x) ((x) << 12) +#define MX25_ADCQ_CR_WMRK_MASK (0xf << 8) +#define MX25_ADCQ_CR_WMRK(x) ((x) << 8) +#define MX25_ADCQ_CR_LITEMID_MASK (0xf << 4) +#define MX25_ADCQ_CR_LITEMID(x) ((x) << 4) +#define MX25_ADCQ_CR_RPT (1 << 3) +#define MX25_ADCQ_CR_FQS (1 << 2) +#define MX25_ADCQ_CR_QSM_MASK 0x3 +#define MX25_ADCQ_CR_QSM_PD 0x1 +#define MX25_ADCQ_CR_QSM_FQS 0x2 +#define MX25_ADCQ_CR_QSM_FQS_PD 0x3 + +/* ADCQ_SR (TCQSR and GCQSR) */ +#define MX25_ADCQ_SR_FDRY (1 << 15) +#define MX25_ADCQ_SR_FULL (1 << 14) +#define MX25_ADCQ_SR_EMPT (1 << 13) +#define MX25_ADCQ_SR_FDN(x) (((x) >> 8) & 0x1f) +#define MX25_ADCQ_SR_FRR (1 << 6) +#define MX25_ADCQ_SR_FUR (1 << 5) +#define MX25_ADCQ_SR_FOR (1 << 4) +#define MX25_ADCQ_SR_EOQ (1 << 1) +#define MX25_ADCQ_SR_PD (1 << 0) + +/* ADCQ_MR (TCQMR and GCQMR) */ +#define MX25_ADCQ_MR_FDRY_DMA (1 << 31) +#define MX25_ADCQ_MR_FER_DMA (1 << 22) +#define MX25_ADCQ_MR_FUR_DMA (1 << 21) +#define MX25_ADCQ_MR_FOR_DMA (1 << 20) +#define MX25_ADCQ_MR_EOQ_DMA (1 << 17) +#define MX25_ADCQ_MR_PD_DMA (1 << 16) +#define MX25_ADCQ_MR_FDRY_IRQ (1 << 15) +#define MX25_ADCQ_MR_FER_IRQ (1 << 6) +#define MX25_ADCQ_MR_FUR_IRQ (1 << 5) +#define MX25_ADCQ_MR_FOR_IRQ (1 << 4) +#define MX25_ADCQ_MR_EOQ_IRQ (1 << 1) +#define MX25_ADCQ_MR_PD_IRQ (1 << 0) + +/* ADCQ_CFG (TICR, TCC0-7,GCC0-7) */ +#define MX25_ADCQ_CFG_SETTLING_TIME(x) ((x) << 24) +#define MX25_ADCQ_CFG_IGS (1 << 20) +#define MX25_ADCQ_CFG_NOS_MASK (0xf << 16) +#define MX25_ADCQ_CFG_NOS(x) (((x) - 1) << 16) +#define MX25_ADCQ_CFG_WIPER (1 << 15) +#define MX25_ADCQ_CFG_YNLR (1 << 14) +#define MX25_ADCQ_CFG_YPLL_HIGH 0 +#define MX25_ADCQ_CFG_YPLL_OFF (1 << 12) +#define MX25_ADCQ_CFG_YPLL_LOW (3 << 12) +#define MX25_ADCQ_CFG_XNUR_HIGH 0 +#define MX25_ADCQ_CFG_XNUR_OFF (1 << 10) +#define MX25_ADCQ_CFG_XNUR_LOW (3 << 10) +#define MX25_ADCQ_CFG_XPUL_OFF (1 << 9) +#define MX25_ADCQ_CFG_XPUL_HIGH 0 +#define MX25_ADCQ_CFG_REFP_YP 0 +#define MX25_ADCQ_CFG_REFP_XP (1 << 7) +#define MX25_ADCQ_CFG_REFP_EXT (2 << 7) +#define MX25_ADCQ_CFG_REFP_INT (3 << 7) +#define MX25_ADCQ_CFG_REFP_MASK (3 << 7) +#define MX25_ADCQ_CFG_IN_XP 0 +#define MX25_ADCQ_CFG_IN_YP (1 << 4) +#define MX25_ADCQ_CFG_IN_XN (2 << 4) +#define MX25_ADCQ_CFG_IN_YN (3 << 4) +#define MX25_ADCQ_CFG_IN_WIPER (4 << 4) +#define MX25_ADCQ_CFG_IN_AUX0 (5 << 4) +#define MX25_ADCQ_CFG_IN_AUX1 (6 << 4) +#define MX25_ADCQ_CFG_IN_AUX2 (7 << 4) +#define MX25_ADCQ_CFG_REFN_XN 0 +#define MX25_ADCQ_CFG_REFN_YN (1 << 2) +#define MX25_ADCQ_CFG_REFN_NGND (2 << 2) +#define MX25_ADCQ_CFG_REFN_NGND2 (3 << 2) +#define MX25_ADCQ_CFG_REFN_MASK (3 << 2) +#define MX25_ADCQ_CFG_PENIACK (1 << 1) + + +#endif /* _LINUX_INCLUDE_INPUT_IMX25_TSADC_H_ */ -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 76+ messages in thread
[parent not found: <1402672899-6995-2-git-send-email-denis-fO0SIAKYzcbQT0dZR+AlfA@public.gmane.org>]
* Re: [PATCH v2 1/6] mfd: fsl imx25 Touchscreen ADC driver 2014-06-13 15:21 ` Denis Carikli (?) @ 2014-06-21 10:09 ` Jonathan Cameron -1 siblings, 0 replies; 76+ messages in thread From: Jonathan Cameron @ 2014-06-21 10:09 UTC (permalink / raw) To: Denis Carikli, Shawn Guo, Samuel Ortiz, Dmitry Torokhov Cc: Eric Bénard, Sascha Hauer, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, Lee Jones, linux-input-u79uwXL29TY76Z2rM5mHXA, linux-iio-u79uwXL29TY76Z2rM5mHXA, Fabio Estevam, Lars-Peter Clausen, Markus Pargmann On 13/06/14 16:21, Denis Carikli wrote: > From: Markus Pargmann <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> > > This is the core driver for imx25 touchscreen/adc driver. The module > has one shared ADC and two different conversion queues which use the > ADC. The two queues are identical. Both can be used for general purpose > ADC but one is meant to be used for touchscreens. > > This driver is the core which manages the central components and > registers of the TSC/ADC unit. It manages the IRQs and forwards them to > the correct components. > > Signed-off-by: Markus Pargmann <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> > Signed-off-by: Denis Carikli <denis-fO0SIAKYzcbQT0dZR+AlfA@public.gmane.org> Hi, A couple of trivial bits inline. Otherwise, Acked-by: Jonathan Cameron <jic23-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> Note I have not dived into the datasheet for this review (hence not a reviewed by!) Too many other things to do today! > --- > .../devicetree/bindings/mfd/fsl-imx25-tsadc.txt | 46 ++++ > drivers/mfd/Kconfig | 9 + > drivers/mfd/Makefile | 2 + > drivers/mfd/fsl-imx25-tsadc.c | 232 ++++++++++++++++++++ > include/linux/mfd/imx25-tsadc.h | 138 ++++++++++++ > 5 files changed, 427 insertions(+) > create mode 100644 Documentation/devicetree/bindings/mfd/fsl-imx25-tsadc.txt > create mode 100644 drivers/mfd/fsl-imx25-tsadc.c > create mode 100644 include/linux/mfd/imx25-tsadc.h > > diff --git a/Documentation/devicetree/bindings/mfd/fsl-imx25-tsadc.txt b/Documentation/devicetree/bindings/mfd/fsl-imx25-tsadc.txt > new file mode 100644 > index 0000000..a857af0e > --- /dev/null > +++ b/Documentation/devicetree/bindings/mfd/fsl-imx25-tsadc.txt > @@ -0,0 +1,46 @@ > +Freescale mx25 ADC/TSC multifunction device > + > +This device combines two general purpose conversion queues one used for general > +ADC and the other used for touchscreens. > + > +Required properties: > + - compatible: Should be "fsl,imx25-tsadc". > + - reg: Memory range of the device. > + - interrupts: Interrupt for this device as described in > + interrupts/interrupts.txt > + - clocks: An 'ipg' clock defined as described in clocks/clock.txt > + - interrupt-controller: This device is an interrupt controller. It controls > + the interrupts of both conversion queues. > + - #interrupt-cells: Should be '<1>'. > + - #address-cells: Should be '<1>'. > + - #size-cells: Should be '<1>'. > + - ranges > + > +This device includes two conversion queues which can be added as subnodes. > +The first queue is for the touchscreen, the second for general purpose ADC. > + > +Example: > + tscadc: tscadc@50030000 { > + compatible = "fsl,imx25-tsadc"; > + reg = <0x50030000 0xc>; > + interrupts = <46>; > + clocks = <&clks 119>; > + clock-names = "ipg"; > + interrupt-controller; > + #interrupt-cells = <1>; > + #address-cells = <1>; > + #size-cells = <1>; > + ranges; > + > + tsc: tcq@50030400 { > + compatible = "fsl,imx25-tcq"; > + reg = <0x50030400 0x60>; > + ... > + }; > + > + adc: gcq@50030800 { > + compatible = "fsl,imx25-gcq"; > + reg = <0x50030800 0x60>; > + ... > + }; > + }; > diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig > index ee8204c..73f4e66 100644 > --- a/drivers/mfd/Kconfig > +++ b/drivers/mfd/Kconfig > @@ -183,6 +183,15 @@ config MFD_DA9063 > Additional drivers must be enabled in order to use the functionality > of the device. > > +config MFD_MX25_TSADC > + tristate "Freescale i.MX25 integrated Touchscreen and ADC unit" > + depends on ARCH_MXC > + select REGMAP_MMIO > + help > + Enable support for the integrated Touchscreen and ADC unit of the > + i.MX25 processors. They consist of a conversion queue for general > + purpose ADC and a queue for Touchscreens. > + > config MFD_MC13XXX > tristate > depends on (SPI_MASTER || I2C) > diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile > index 8afedba..7ff1013 100644 > --- a/drivers/mfd/Makefile > +++ b/drivers/mfd/Makefile > @@ -78,6 +78,8 @@ obj-$(CONFIG_TWL4030_POWER) += twl4030-power.o > obj-$(CONFIG_MFD_TWL4030_AUDIO) += twl4030-audio.o > obj-$(CONFIG_TWL6040_CORE) += twl6040.o > > +obj-$(CONFIG_MFD_MX25_TSADC) += fsl-imx25-tsadc.o > + > obj-$(CONFIG_MFD_MC13XXX) += mc13xxx-core.o > obj-$(CONFIG_MFD_MC13XXX_SPI) += mc13xxx-spi.o > obj-$(CONFIG_MFD_MC13XXX_I2C) += mc13xxx-i2c.o > diff --git a/drivers/mfd/fsl-imx25-tsadc.c b/drivers/mfd/fsl-imx25-tsadc.c > new file mode 100644 > index 0000000..10332c2 > --- /dev/null > +++ b/drivers/mfd/fsl-imx25-tsadc.c > @@ -0,0 +1,232 @@ > +/* > + * Copyright 2014 Markus Pargmann, Pengutronix <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> > + * > + * The code contained herein is licensed under the GNU General Public > + * License. You may obtain a copy of the GNU General Public License > + * Version 2 or later at the following locations: > + * > + * http://www.opensource.org/licenses/gpl-license.html > + * http://www.gnu.org/copyleft/gpl.html > + */ > + > +#include <linux/clk.h> > +#include <linux/interrupt.h> > +#include <linux/irq.h> > +#include <linux/irqdesc.h> > +#include <linux/irqdomain.h> > +#include <linux/irqchip/chained_irq.h> > +#include <linux/mfd/imx25-tsadc.h> > +#include <linux/module.h> > +#include <linux/of.h> > +#include <linux/of_platform.h> > +#include <linux/platform_device.h> > +#include <linux/regmap.h> > + > +struct mx25_tsadc_priv { > + struct regmap *regs; > + struct irq_domain *domain; > + struct clk *clk; > +}; > + > +static struct regmap_config mx25_tsadc = { > + .fast_io = true, > + .max_register = 0x8, > + .reg_bits = 32, > + .val_bits = 32, > + .reg_stride = 4, > +}; > + > +struct regmap *mx25_tsadc_get_regmap(struct device *dev) > +{ > + struct platform_device *pdev; > + struct mx25_tsadc_priv *priv; > + > + if (!dev) > + return NULL; > + > + pdev = container_of(dev, struct platform_device, dev); > + priv = platform_get_drvdata(pdev); > + if (IS_ERR_OR_NULL(priv->regs)) > + return NULL; > + > + return priv->regs; > +} > +EXPORT_SYMBOL(mx25_tsadc_get_regmap); > + > +struct clk *mx25_tsadc_get_ipg(struct device *dev) > +{ > + struct platform_device *pdev; > + struct mx25_tsadc_priv *priv; > + > + if (!dev) > + return NULL; > + > + pdev = container_of(dev, struct platform_device, dev); > + priv = platform_get_drvdata(pdev); > + if (IS_ERR_OR_NULL(priv->clk)) > + return NULL; > + > + return priv->clk; > +} > +EXPORT_SYMBOL(mx25_tsadc_get_ipg); > + > +static void mx25_tsadc_irq_handler(u32 irq, struct irq_desc *desc) > +{ > + struct mx25_tsadc_priv *priv = irq_desc_get_handler_data(desc); > + struct irq_chip *chip = irq_get_chip(irq); > + u32 status; > + > + chained_irq_enter(chip, desc); > + > + regmap_read(priv->regs, MX25_TSC_TGSR, &status); > + > + if (status & MX25_TGSR_GCQ_INT) > + generic_handle_irq(irq_find_mapping(priv->domain, 1)); > + > + if (status & MX25_TGSR_TCQ_INT) > + generic_handle_irq(irq_find_mapping(priv->domain, 0)); > + > + chained_irq_exit(chip, desc); > +} > + > +static void mx25_tsadc_nop(struct irq_data *d) > +{ > +} > + > +static int mx25_tsadc_set_wake_nop(struct irq_data *d, unsigned int state) > +{ > + return 0; > +} > + > +static struct irq_chip mx25_tsadc_irq_chip = { > + .name = "mx25-tsadc", > + .irq_ack = mx25_tsadc_nop, > + .irq_mask = mx25_tsadc_nop, > + .irq_unmask = mx25_tsadc_nop, > + .irq_set_wake = mx25_tsadc_set_wake_nop, Whilst this is not documented as being optional, in kernel/irq/manage.c it clearly is. Otherwise, what you appear to have here is the same (up to a name) as the dummy_irq_chip provided for just such dumb devices. Could you use that? > +}; > + > +static int mx25_tsadc_domain_map(struct irq_domain *d, unsigned int irq, > + irq_hw_number_t hwirq) > +{ > + struct mx25_tsadc_priv *priv = d->host_data; > + > + irq_set_chip_data(irq, priv); > + irq_set_chip_and_handler(irq, &mx25_tsadc_irq_chip, > + handle_level_irq); > + > + Bonus blank line here. > + set_irq_flags(irq, IRQF_VALID); > + > + return 0; > +} > + > +static struct irq_domain_ops mx25_tsadc_domain_ops = { > + .map = mx25_tsadc_domain_map, > + .xlate = irq_domain_xlate_onecell, > +}; > + > +static int mx25_tsadc_setup_irq(struct platform_device *pdev, > + struct mx25_tsadc_priv *priv) > +{ > + struct device *dev = &pdev->dev; > + struct device_node *np = dev->of_node; > + int irq; > + > + irq = platform_get_irq(pdev, 0); > + if (irq < 0) { > + dev_err(dev, "Failed to get irq\n"); > + return irq; > + } > + > + priv->domain = irq_domain_add_simple(np, 2, 0, &mx25_tsadc_domain_ops, > + priv); > + if (!priv->domain) { > + dev_err(dev, "Failed to add irq domain\n"); > + return -ENOMEM; > + } > + > + irq_set_chained_handler(irq, mx25_tsadc_irq_handler); > + irq_set_handler_data(irq, priv); > + > + return 0; > +} > + > +static int mx25_tsadc_probe(struct platform_device *pdev) > +{ > + struct device *dev = &pdev->dev; > + struct device_node *np = dev->of_node; > + struct mx25_tsadc_priv *priv; > + struct resource *iores; > + int ret; > + void __iomem *iomem; > + > + priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); > + if (!priv) > + return -ENOMEM; > + > + iores = platform_get_resource(pdev, IORESOURCE_MEM, 0); Worth checking whether this succeeded (!=NULL)? > + iomem = devm_ioremap_resource(dev, iores); > + if (IS_ERR(iomem)) { > + dev_err(dev, "Failed to remap iomem\n"); > + return PTR_ERR(iomem); > + } > + > + priv->regs = regmap_init_mmio(dev, iomem, &mx25_tsadc); > + if (IS_ERR(priv->regs)) { > + dev_err(dev, "Failed to initialize regmap\n"); > + return PTR_ERR(priv->regs); > + } > + > + priv->clk = devm_clk_get(dev, "ipg"); > + if (IS_ERR(priv->clk)) { > + dev_err(dev, "Failed to get ipg clock\n"); > + return PTR_ERR(priv->clk); > + } > + > + /* Enable clock and reset the component */ > + regmap_update_bits(priv->regs, MX25_TSC_TGCR, MX25_TGCR_CLK_EN, > + MX25_TGCR_CLK_EN); > + regmap_update_bits(priv->regs, MX25_TSC_TGCR, MX25_TGCR_TSC_RST, > + MX25_TGCR_TSC_RST); > + > + /* Setup powersaving mode, but enable internal reference voltage */ > + regmap_update_bits(priv->regs, MX25_TSC_TGCR, MX25_TGCR_POWERMODE_MASK, > + MX25_TGCR_POWERMODE_SAVE); > + regmap_update_bits(priv->regs, MX25_TSC_TGCR, MX25_TGCR_INTREFEN, > + MX25_TGCR_INTREFEN); > + > + ret = mx25_tsadc_setup_irq(pdev, priv); > + if (ret) { > + dev_err(dev, "Failed to setup irqs\n"); > + return ret; > + } > + > + platform_set_drvdata(pdev, priv); > + > + of_platform_populate(np, NULL, NULL, dev); > + > + dev_info(dev, "i.MX25 Touchscreen and ADC core driver loaded\n"); > + > + return 0; > +} > + > +static const struct of_device_id mx25_tsadc_ids[] = { > + { .compatible = "fsl,imx25-tsadc", }, > + { /* Sentinel */ } > +}; > + > +static struct platform_driver mx25_tsadc_driver = { > + .driver = { > + .name = "mx25-tsadc", > + .owner = THIS_MODULE, > + .of_match_table = mx25_tsadc_ids, > + }, > + .probe = mx25_tsadc_probe, > +}; > +module_platform_driver(mx25_tsadc_driver); > + > +MODULE_DESCRIPTION("MFD for ADC/TSC for Freescale mx25"); > +MODULE_AUTHOR("Markus Pargmann <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>"); > +MODULE_LICENSE("GPL v2"); > +MODULE_ALIAS("platform:mx25-tsadc"); > diff --git a/include/linux/mfd/imx25-tsadc.h b/include/linux/mfd/imx25-tsadc.h > new file mode 100644 > index 0000000..6fba341 > --- /dev/null > +++ b/include/linux/mfd/imx25-tsadc.h > @@ -0,0 +1,138 @@ > +#ifndef _LINUX_INCLUDE_INPUT_IMX25_TSADC_H_ > +#define _LINUX_INCLUDE_INPUT_IMX25_TSADC_H_ > + > +struct regmap; > +struct device; > +struct clk; > + > +struct regmap *mx25_tsadc_get_regmap(struct device *dev); > +struct clk *mx25_tsadc_get_ipg(struct device *dev); > + > +#define MX25_TSC_TGCR 0x00 > +#define MX25_TSC_TGSR 0x04 > +#define MX25_TSC_TICR 0x08 > + > +/* The same register layout for TC and GC queue */ > +#define MX25_ADCQ_FIFO 0x00 > +#define MX25_ADCQ_CR 0x04 > +#define MX25_ADCQ_SR 0x08 > +#define MX25_ADCQ_MR 0x0c > +#define MX25_ADCQ_ITEM_7_0 0x20 > +#define MX25_ADCQ_ITEM_15_8 0x24 > +#define MX25_ADCQ_CFG(n) (0x40 + ((n) * 0x4)) > + > +/* Register values */ > +/* Queue Config register */ > +#define MX25_ADCQ_MR_MASK 0xffffffff > + > +/* TGCR */ > +#define MX25_TGCR_PDBTIME(x) ((x) << 25) > +#define MX25_TGCR_PDBTIME_MASK MX25_TGCR_PDBTIME(0x7f) > +#define MX25_TGCR_PDBEN (1 << 24) > +#define MX25_TGCR_PDEN (1 << 23) > +#define MX25_TGCR_ADCCLKCFG(x) ((x) << 16) > +#define MX25_TGCR_GET_ADCCLK(x) (((x) >> 16) & 0x1f) > +#define MX25_TGCR_INTREFEN (1 << 10) > +#define MX25_TGCR_POWERMODE_MASK (3 << 8) > +#define MX25_TGCR_POWERMODE_SAVE (1 << 8) > +#define MX25_TGCR_POWERMODE_ON (2 << 8) > +#define MX25_TGCR_STLC (1 << 5) > +#define MX25_TGCR_SLPC (1 << 4) > +#define MX25_TGCR_FUNC_RST (1 << 2) > +#define MX25_TGCR_TSC_RST (1 << 1) > +#define MX25_TGCR_CLK_EN (1 << 0) > + > +/* TGSR */ > +#define MX25_TGSR_SLP_INT (1 << 2) > +#define MX25_TGSR_GCQ_INT (1 << 1) > +#define MX25_TGSR_TCQ_INT (1 << 0) > + > +/* ADCQ_ITEM_* */ > +#define _MX25_ADCQ_ITEM(item, x) ((x) << ((item) * 4)) > +#define MX25_ADCQ_ITEM(item, x) ((item) >= 8 ? \ > + _MX25_ADCQ_ITEM((item) - 8, (x)) : _MX25_ADCQ_ITEM((item), (x))) > + > +/* ADCQ_FIFO (TCQFIFO and GCQFIFO) */ > +#define MX25_ADCQ_FIFO_DATA(x) (((x) >> 4) & 0xfff) > +#define MX25_ADCQ_FIFO_ID(x) ((x) & 0xf) > + > +/* ADCQ_CR (TCQR and GCQR) */ > +#define MX25_ADCQ_CR_PDCFG_LEVEL (1 << 19) > +#define MX25_ADCQ_CR_PDMSK (1 << 18) > +#define MX25_ADCQ_CR_FRST (1 << 17) > +#define MX25_ADCQ_CR_QRST (1 << 16) > +#define MX25_ADCQ_CR_RWAIT_MASK (0xf << 12) > +#define MX25_ADCQ_CR_RWAIT(x) ((x) << 12) > +#define MX25_ADCQ_CR_WMRK_MASK (0xf << 8) > +#define MX25_ADCQ_CR_WMRK(x) ((x) << 8) > +#define MX25_ADCQ_CR_LITEMID_MASK (0xf << 4) > +#define MX25_ADCQ_CR_LITEMID(x) ((x) << 4) > +#define MX25_ADCQ_CR_RPT (1 << 3) > +#define MX25_ADCQ_CR_FQS (1 << 2) > +#define MX25_ADCQ_CR_QSM_MASK 0x3 > +#define MX25_ADCQ_CR_QSM_PD 0x1 > +#define MX25_ADCQ_CR_QSM_FQS 0x2 > +#define MX25_ADCQ_CR_QSM_FQS_PD 0x3 > + > +/* ADCQ_SR (TCQSR and GCQSR) */ > +#define MX25_ADCQ_SR_FDRY (1 << 15) > +#define MX25_ADCQ_SR_FULL (1 << 14) > +#define MX25_ADCQ_SR_EMPT (1 << 13) > +#define MX25_ADCQ_SR_FDN(x) (((x) >> 8) & 0x1f) > +#define MX25_ADCQ_SR_FRR (1 << 6) > +#define MX25_ADCQ_SR_FUR (1 << 5) > +#define MX25_ADCQ_SR_FOR (1 << 4) > +#define MX25_ADCQ_SR_EOQ (1 << 1) > +#define MX25_ADCQ_SR_PD (1 << 0) > + > +/* ADCQ_MR (TCQMR and GCQMR) */ > +#define MX25_ADCQ_MR_FDRY_DMA (1 << 31) > +#define MX25_ADCQ_MR_FER_DMA (1 << 22) > +#define MX25_ADCQ_MR_FUR_DMA (1 << 21) > +#define MX25_ADCQ_MR_FOR_DMA (1 << 20) > +#define MX25_ADCQ_MR_EOQ_DMA (1 << 17) > +#define MX25_ADCQ_MR_PD_DMA (1 << 16) > +#define MX25_ADCQ_MR_FDRY_IRQ (1 << 15) > +#define MX25_ADCQ_MR_FER_IRQ (1 << 6) > +#define MX25_ADCQ_MR_FUR_IRQ (1 << 5) > +#define MX25_ADCQ_MR_FOR_IRQ (1 << 4) > +#define MX25_ADCQ_MR_EOQ_IRQ (1 << 1) > +#define MX25_ADCQ_MR_PD_IRQ (1 << 0) > + > +/* ADCQ_CFG (TICR, TCC0-7,GCC0-7) */ > +#define MX25_ADCQ_CFG_SETTLING_TIME(x) ((x) << 24) > +#define MX25_ADCQ_CFG_IGS (1 << 20) > +#define MX25_ADCQ_CFG_NOS_MASK (0xf << 16) > +#define MX25_ADCQ_CFG_NOS(x) (((x) - 1) << 16) > +#define MX25_ADCQ_CFG_WIPER (1 << 15) > +#define MX25_ADCQ_CFG_YNLR (1 << 14) > +#define MX25_ADCQ_CFG_YPLL_HIGH 0 > +#define MX25_ADCQ_CFG_YPLL_OFF (1 << 12) > +#define MX25_ADCQ_CFG_YPLL_LOW (3 << 12) > +#define MX25_ADCQ_CFG_XNUR_HIGH 0 > +#define MX25_ADCQ_CFG_XNUR_OFF (1 << 10) > +#define MX25_ADCQ_CFG_XNUR_LOW (3 << 10) > +#define MX25_ADCQ_CFG_XPUL_OFF (1 << 9) > +#define MX25_ADCQ_CFG_XPUL_HIGH 0 > +#define MX25_ADCQ_CFG_REFP_YP 0 > +#define MX25_ADCQ_CFG_REFP_XP (1 << 7) > +#define MX25_ADCQ_CFG_REFP_EXT (2 << 7) > +#define MX25_ADCQ_CFG_REFP_INT (3 << 7) > +#define MX25_ADCQ_CFG_REFP_MASK (3 << 7) > +#define MX25_ADCQ_CFG_IN_XP 0 > +#define MX25_ADCQ_CFG_IN_YP (1 << 4) > +#define MX25_ADCQ_CFG_IN_XN (2 << 4) > +#define MX25_ADCQ_CFG_IN_YN (3 << 4) > +#define MX25_ADCQ_CFG_IN_WIPER (4 << 4) > +#define MX25_ADCQ_CFG_IN_AUX0 (5 << 4) > +#define MX25_ADCQ_CFG_IN_AUX1 (6 << 4) > +#define MX25_ADCQ_CFG_IN_AUX2 (7 << 4) > +#define MX25_ADCQ_CFG_REFN_XN 0 > +#define MX25_ADCQ_CFG_REFN_YN (1 << 2) > +#define MX25_ADCQ_CFG_REFN_NGND (2 << 2) > +#define MX25_ADCQ_CFG_REFN_NGND2 (3 << 2) > +#define MX25_ADCQ_CFG_REFN_MASK (3 << 2) > +#define MX25_ADCQ_CFG_PENIACK (1 << 1) > + > + > +#endif /* _LINUX_INCLUDE_INPUT_IMX25_TSADC_H_ */ > ^ permalink raw reply [flat|nested] 76+ messages in thread
* [PATCH v2 1/6] mfd: fsl imx25 Touchscreen ADC driver @ 2014-06-21 10:09 ` Jonathan Cameron 0 siblings, 0 replies; 76+ messages in thread From: Jonathan Cameron @ 2014-06-21 10:09 UTC (permalink / raw) To: linux-arm-kernel On 13/06/14 16:21, Denis Carikli wrote: > From: Markus Pargmann <mpa@pengutronix.de> > > This is the core driver for imx25 touchscreen/adc driver. The module > has one shared ADC and two different conversion queues which use the > ADC. The two queues are identical. Both can be used for general purpose > ADC but one is meant to be used for touchscreens. > > This driver is the core which manages the central components and > registers of the TSC/ADC unit. It manages the IRQs and forwards them to > the correct components. > > Signed-off-by: Markus Pargmann <mpa@pengutronix.de> > Signed-off-by: Denis Carikli <denis@eukrea.com> Hi, A couple of trivial bits inline. Otherwise, Acked-by: Jonathan Cameron <jic23@kernel.org> Note I have not dived into the datasheet for this review (hence not a reviewed by!) Too many other things to do today! > --- > .../devicetree/bindings/mfd/fsl-imx25-tsadc.txt | 46 ++++ > drivers/mfd/Kconfig | 9 + > drivers/mfd/Makefile | 2 + > drivers/mfd/fsl-imx25-tsadc.c | 232 ++++++++++++++++++++ > include/linux/mfd/imx25-tsadc.h | 138 ++++++++++++ > 5 files changed, 427 insertions(+) > create mode 100644 Documentation/devicetree/bindings/mfd/fsl-imx25-tsadc.txt > create mode 100644 drivers/mfd/fsl-imx25-tsadc.c > create mode 100644 include/linux/mfd/imx25-tsadc.h > > diff --git a/Documentation/devicetree/bindings/mfd/fsl-imx25-tsadc.txt b/Documentation/devicetree/bindings/mfd/fsl-imx25-tsadc.txt > new file mode 100644 > index 0000000..a857af0e > --- /dev/null > +++ b/Documentation/devicetree/bindings/mfd/fsl-imx25-tsadc.txt > @@ -0,0 +1,46 @@ > +Freescale mx25 ADC/TSC multifunction device > + > +This device combines two general purpose conversion queues one used for general > +ADC and the other used for touchscreens. > + > +Required properties: > + - compatible: Should be "fsl,imx25-tsadc". > + - reg: Memory range of the device. > + - interrupts: Interrupt for this device as described in > + interrupts/interrupts.txt > + - clocks: An 'ipg' clock defined as described in clocks/clock.txt > + - interrupt-controller: This device is an interrupt controller. It controls > + the interrupts of both conversion queues. > + - #interrupt-cells: Should be '<1>'. > + - #address-cells: Should be '<1>'. > + - #size-cells: Should be '<1>'. > + - ranges > + > +This device includes two conversion queues which can be added as subnodes. > +The first queue is for the touchscreen, the second for general purpose ADC. > + > +Example: > + tscadc: tscadc at 50030000 { > + compatible = "fsl,imx25-tsadc"; > + reg = <0x50030000 0xc>; > + interrupts = <46>; > + clocks = <&clks 119>; > + clock-names = "ipg"; > + interrupt-controller; > + #interrupt-cells = <1>; > + #address-cells = <1>; > + #size-cells = <1>; > + ranges; > + > + tsc: tcq at 50030400 { > + compatible = "fsl,imx25-tcq"; > + reg = <0x50030400 0x60>; > + ... > + }; > + > + adc: gcq at 50030800 { > + compatible = "fsl,imx25-gcq"; > + reg = <0x50030800 0x60>; > + ... > + }; > + }; > diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig > index ee8204c..73f4e66 100644 > --- a/drivers/mfd/Kconfig > +++ b/drivers/mfd/Kconfig > @@ -183,6 +183,15 @@ config MFD_DA9063 > Additional drivers must be enabled in order to use the functionality > of the device. > > +config MFD_MX25_TSADC > + tristate "Freescale i.MX25 integrated Touchscreen and ADC unit" > + depends on ARCH_MXC > + select REGMAP_MMIO > + help > + Enable support for the integrated Touchscreen and ADC unit of the > + i.MX25 processors. They consist of a conversion queue for general > + purpose ADC and a queue for Touchscreens. > + > config MFD_MC13XXX > tristate > depends on (SPI_MASTER || I2C) > diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile > index 8afedba..7ff1013 100644 > --- a/drivers/mfd/Makefile > +++ b/drivers/mfd/Makefile > @@ -78,6 +78,8 @@ obj-$(CONFIG_TWL4030_POWER) += twl4030-power.o > obj-$(CONFIG_MFD_TWL4030_AUDIO) += twl4030-audio.o > obj-$(CONFIG_TWL6040_CORE) += twl6040.o > > +obj-$(CONFIG_MFD_MX25_TSADC) += fsl-imx25-tsadc.o > + > obj-$(CONFIG_MFD_MC13XXX) += mc13xxx-core.o > obj-$(CONFIG_MFD_MC13XXX_SPI) += mc13xxx-spi.o > obj-$(CONFIG_MFD_MC13XXX_I2C) += mc13xxx-i2c.o > diff --git a/drivers/mfd/fsl-imx25-tsadc.c b/drivers/mfd/fsl-imx25-tsadc.c > new file mode 100644 > index 0000000..10332c2 > --- /dev/null > +++ b/drivers/mfd/fsl-imx25-tsadc.c > @@ -0,0 +1,232 @@ > +/* > + * Copyright 2014 Markus Pargmann, Pengutronix <mpa@pengutronix.de> > + * > + * The code contained herein is licensed under the GNU General Public > + * License. You may obtain a copy of the GNU General Public License > + * Version 2 or later at the following locations: > + * > + * http://www.opensource.org/licenses/gpl-license.html > + * http://www.gnu.org/copyleft/gpl.html > + */ > + > +#include <linux/clk.h> > +#include <linux/interrupt.h> > +#include <linux/irq.h> > +#include <linux/irqdesc.h> > +#include <linux/irqdomain.h> > +#include <linux/irqchip/chained_irq.h> > +#include <linux/mfd/imx25-tsadc.h> > +#include <linux/module.h> > +#include <linux/of.h> > +#include <linux/of_platform.h> > +#include <linux/platform_device.h> > +#include <linux/regmap.h> > + > +struct mx25_tsadc_priv { > + struct regmap *regs; > + struct irq_domain *domain; > + struct clk *clk; > +}; > + > +static struct regmap_config mx25_tsadc = { > + .fast_io = true, > + .max_register = 0x8, > + .reg_bits = 32, > + .val_bits = 32, > + .reg_stride = 4, > +}; > + > +struct regmap *mx25_tsadc_get_regmap(struct device *dev) > +{ > + struct platform_device *pdev; > + struct mx25_tsadc_priv *priv; > + > + if (!dev) > + return NULL; > + > + pdev = container_of(dev, struct platform_device, dev); > + priv = platform_get_drvdata(pdev); > + if (IS_ERR_OR_NULL(priv->regs)) > + return NULL; > + > + return priv->regs; > +} > +EXPORT_SYMBOL(mx25_tsadc_get_regmap); > + > +struct clk *mx25_tsadc_get_ipg(struct device *dev) > +{ > + struct platform_device *pdev; > + struct mx25_tsadc_priv *priv; > + > + if (!dev) > + return NULL; > + > + pdev = container_of(dev, struct platform_device, dev); > + priv = platform_get_drvdata(pdev); > + if (IS_ERR_OR_NULL(priv->clk)) > + return NULL; > + > + return priv->clk; > +} > +EXPORT_SYMBOL(mx25_tsadc_get_ipg); > + > +static void mx25_tsadc_irq_handler(u32 irq, struct irq_desc *desc) > +{ > + struct mx25_tsadc_priv *priv = irq_desc_get_handler_data(desc); > + struct irq_chip *chip = irq_get_chip(irq); > + u32 status; > + > + chained_irq_enter(chip, desc); > + > + regmap_read(priv->regs, MX25_TSC_TGSR, &status); > + > + if (status & MX25_TGSR_GCQ_INT) > + generic_handle_irq(irq_find_mapping(priv->domain, 1)); > + > + if (status & MX25_TGSR_TCQ_INT) > + generic_handle_irq(irq_find_mapping(priv->domain, 0)); > + > + chained_irq_exit(chip, desc); > +} > + > +static void mx25_tsadc_nop(struct irq_data *d) > +{ > +} > + > +static int mx25_tsadc_set_wake_nop(struct irq_data *d, unsigned int state) > +{ > + return 0; > +} > + > +static struct irq_chip mx25_tsadc_irq_chip = { > + .name = "mx25-tsadc", > + .irq_ack = mx25_tsadc_nop, > + .irq_mask = mx25_tsadc_nop, > + .irq_unmask = mx25_tsadc_nop, > + .irq_set_wake = mx25_tsadc_set_wake_nop, Whilst this is not documented as being optional, in kernel/irq/manage.c it clearly is. Otherwise, what you appear to have here is the same (up to a name) as the dummy_irq_chip provided for just such dumb devices. Could you use that? > +}; > + > +static int mx25_tsadc_domain_map(struct irq_domain *d, unsigned int irq, > + irq_hw_number_t hwirq) > +{ > + struct mx25_tsadc_priv *priv = d->host_data; > + > + irq_set_chip_data(irq, priv); > + irq_set_chip_and_handler(irq, &mx25_tsadc_irq_chip, > + handle_level_irq); > + > + Bonus blank line here. > + set_irq_flags(irq, IRQF_VALID); > + > + return 0; > +} > + > +static struct irq_domain_ops mx25_tsadc_domain_ops = { > + .map = mx25_tsadc_domain_map, > + .xlate = irq_domain_xlate_onecell, > +}; > + > +static int mx25_tsadc_setup_irq(struct platform_device *pdev, > + struct mx25_tsadc_priv *priv) > +{ > + struct device *dev = &pdev->dev; > + struct device_node *np = dev->of_node; > + int irq; > + > + irq = platform_get_irq(pdev, 0); > + if (irq < 0) { > + dev_err(dev, "Failed to get irq\n"); > + return irq; > + } > + > + priv->domain = irq_domain_add_simple(np, 2, 0, &mx25_tsadc_domain_ops, > + priv); > + if (!priv->domain) { > + dev_err(dev, "Failed to add irq domain\n"); > + return -ENOMEM; > + } > + > + irq_set_chained_handler(irq, mx25_tsadc_irq_handler); > + irq_set_handler_data(irq, priv); > + > + return 0; > +} > + > +static int mx25_tsadc_probe(struct platform_device *pdev) > +{ > + struct device *dev = &pdev->dev; > + struct device_node *np = dev->of_node; > + struct mx25_tsadc_priv *priv; > + struct resource *iores; > + int ret; > + void __iomem *iomem; > + > + priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); > + if (!priv) > + return -ENOMEM; > + > + iores = platform_get_resource(pdev, IORESOURCE_MEM, 0); Worth checking whether this succeeded (!=NULL)? > + iomem = devm_ioremap_resource(dev, iores); > + if (IS_ERR(iomem)) { > + dev_err(dev, "Failed to remap iomem\n"); > + return PTR_ERR(iomem); > + } > + > + priv->regs = regmap_init_mmio(dev, iomem, &mx25_tsadc); > + if (IS_ERR(priv->regs)) { > + dev_err(dev, "Failed to initialize regmap\n"); > + return PTR_ERR(priv->regs); > + } > + > + priv->clk = devm_clk_get(dev, "ipg"); > + if (IS_ERR(priv->clk)) { > + dev_err(dev, "Failed to get ipg clock\n"); > + return PTR_ERR(priv->clk); > + } > + > + /* Enable clock and reset the component */ > + regmap_update_bits(priv->regs, MX25_TSC_TGCR, MX25_TGCR_CLK_EN, > + MX25_TGCR_CLK_EN); > + regmap_update_bits(priv->regs, MX25_TSC_TGCR, MX25_TGCR_TSC_RST, > + MX25_TGCR_TSC_RST); > + > + /* Setup powersaving mode, but enable internal reference voltage */ > + regmap_update_bits(priv->regs, MX25_TSC_TGCR, MX25_TGCR_POWERMODE_MASK, > + MX25_TGCR_POWERMODE_SAVE); > + regmap_update_bits(priv->regs, MX25_TSC_TGCR, MX25_TGCR_INTREFEN, > + MX25_TGCR_INTREFEN); > + > + ret = mx25_tsadc_setup_irq(pdev, priv); > + if (ret) { > + dev_err(dev, "Failed to setup irqs\n"); > + return ret; > + } > + > + platform_set_drvdata(pdev, priv); > + > + of_platform_populate(np, NULL, NULL, dev); > + > + dev_info(dev, "i.MX25 Touchscreen and ADC core driver loaded\n"); > + > + return 0; > +} > + > +static const struct of_device_id mx25_tsadc_ids[] = { > + { .compatible = "fsl,imx25-tsadc", }, > + { /* Sentinel */ } > +}; > + > +static struct platform_driver mx25_tsadc_driver = { > + .driver = { > + .name = "mx25-tsadc", > + .owner = THIS_MODULE, > + .of_match_table = mx25_tsadc_ids, > + }, > + .probe = mx25_tsadc_probe, > +}; > +module_platform_driver(mx25_tsadc_driver); > + > +MODULE_DESCRIPTION("MFD for ADC/TSC for Freescale mx25"); > +MODULE_AUTHOR("Markus Pargmann <mpa@pengutronix.de>"); > +MODULE_LICENSE("GPL v2"); > +MODULE_ALIAS("platform:mx25-tsadc"); > diff --git a/include/linux/mfd/imx25-tsadc.h b/include/linux/mfd/imx25-tsadc.h > new file mode 100644 > index 0000000..6fba341 > --- /dev/null > +++ b/include/linux/mfd/imx25-tsadc.h > @@ -0,0 +1,138 @@ > +#ifndef _LINUX_INCLUDE_INPUT_IMX25_TSADC_H_ > +#define _LINUX_INCLUDE_INPUT_IMX25_TSADC_H_ > + > +struct regmap; > +struct device; > +struct clk; > + > +struct regmap *mx25_tsadc_get_regmap(struct device *dev); > +struct clk *mx25_tsadc_get_ipg(struct device *dev); > + > +#define MX25_TSC_TGCR 0x00 > +#define MX25_TSC_TGSR 0x04 > +#define MX25_TSC_TICR 0x08 > + > +/* The same register layout for TC and GC queue */ > +#define MX25_ADCQ_FIFO 0x00 > +#define MX25_ADCQ_CR 0x04 > +#define MX25_ADCQ_SR 0x08 > +#define MX25_ADCQ_MR 0x0c > +#define MX25_ADCQ_ITEM_7_0 0x20 > +#define MX25_ADCQ_ITEM_15_8 0x24 > +#define MX25_ADCQ_CFG(n) (0x40 + ((n) * 0x4)) > + > +/* Register values */ > +/* Queue Config register */ > +#define MX25_ADCQ_MR_MASK 0xffffffff > + > +/* TGCR */ > +#define MX25_TGCR_PDBTIME(x) ((x) << 25) > +#define MX25_TGCR_PDBTIME_MASK MX25_TGCR_PDBTIME(0x7f) > +#define MX25_TGCR_PDBEN (1 << 24) > +#define MX25_TGCR_PDEN (1 << 23) > +#define MX25_TGCR_ADCCLKCFG(x) ((x) << 16) > +#define MX25_TGCR_GET_ADCCLK(x) (((x) >> 16) & 0x1f) > +#define MX25_TGCR_INTREFEN (1 << 10) > +#define MX25_TGCR_POWERMODE_MASK (3 << 8) > +#define MX25_TGCR_POWERMODE_SAVE (1 << 8) > +#define MX25_TGCR_POWERMODE_ON (2 << 8) > +#define MX25_TGCR_STLC (1 << 5) > +#define MX25_TGCR_SLPC (1 << 4) > +#define MX25_TGCR_FUNC_RST (1 << 2) > +#define MX25_TGCR_TSC_RST (1 << 1) > +#define MX25_TGCR_CLK_EN (1 << 0) > + > +/* TGSR */ > +#define MX25_TGSR_SLP_INT (1 << 2) > +#define MX25_TGSR_GCQ_INT (1 << 1) > +#define MX25_TGSR_TCQ_INT (1 << 0) > + > +/* ADCQ_ITEM_* */ > +#define _MX25_ADCQ_ITEM(item, x) ((x) << ((item) * 4)) > +#define MX25_ADCQ_ITEM(item, x) ((item) >= 8 ? \ > + _MX25_ADCQ_ITEM((item) - 8, (x)) : _MX25_ADCQ_ITEM((item), (x))) > + > +/* ADCQ_FIFO (TCQFIFO and GCQFIFO) */ > +#define MX25_ADCQ_FIFO_DATA(x) (((x) >> 4) & 0xfff) > +#define MX25_ADCQ_FIFO_ID(x) ((x) & 0xf) > + > +/* ADCQ_CR (TCQR and GCQR) */ > +#define MX25_ADCQ_CR_PDCFG_LEVEL (1 << 19) > +#define MX25_ADCQ_CR_PDMSK (1 << 18) > +#define MX25_ADCQ_CR_FRST (1 << 17) > +#define MX25_ADCQ_CR_QRST (1 << 16) > +#define MX25_ADCQ_CR_RWAIT_MASK (0xf << 12) > +#define MX25_ADCQ_CR_RWAIT(x) ((x) << 12) > +#define MX25_ADCQ_CR_WMRK_MASK (0xf << 8) > +#define MX25_ADCQ_CR_WMRK(x) ((x) << 8) > +#define MX25_ADCQ_CR_LITEMID_MASK (0xf << 4) > +#define MX25_ADCQ_CR_LITEMID(x) ((x) << 4) > +#define MX25_ADCQ_CR_RPT (1 << 3) > +#define MX25_ADCQ_CR_FQS (1 << 2) > +#define MX25_ADCQ_CR_QSM_MASK 0x3 > +#define MX25_ADCQ_CR_QSM_PD 0x1 > +#define MX25_ADCQ_CR_QSM_FQS 0x2 > +#define MX25_ADCQ_CR_QSM_FQS_PD 0x3 > + > +/* ADCQ_SR (TCQSR and GCQSR) */ > +#define MX25_ADCQ_SR_FDRY (1 << 15) > +#define MX25_ADCQ_SR_FULL (1 << 14) > +#define MX25_ADCQ_SR_EMPT (1 << 13) > +#define MX25_ADCQ_SR_FDN(x) (((x) >> 8) & 0x1f) > +#define MX25_ADCQ_SR_FRR (1 << 6) > +#define MX25_ADCQ_SR_FUR (1 << 5) > +#define MX25_ADCQ_SR_FOR (1 << 4) > +#define MX25_ADCQ_SR_EOQ (1 << 1) > +#define MX25_ADCQ_SR_PD (1 << 0) > + > +/* ADCQ_MR (TCQMR and GCQMR) */ > +#define MX25_ADCQ_MR_FDRY_DMA (1 << 31) > +#define MX25_ADCQ_MR_FER_DMA (1 << 22) > +#define MX25_ADCQ_MR_FUR_DMA (1 << 21) > +#define MX25_ADCQ_MR_FOR_DMA (1 << 20) > +#define MX25_ADCQ_MR_EOQ_DMA (1 << 17) > +#define MX25_ADCQ_MR_PD_DMA (1 << 16) > +#define MX25_ADCQ_MR_FDRY_IRQ (1 << 15) > +#define MX25_ADCQ_MR_FER_IRQ (1 << 6) > +#define MX25_ADCQ_MR_FUR_IRQ (1 << 5) > +#define MX25_ADCQ_MR_FOR_IRQ (1 << 4) > +#define MX25_ADCQ_MR_EOQ_IRQ (1 << 1) > +#define MX25_ADCQ_MR_PD_IRQ (1 << 0) > + > +/* ADCQ_CFG (TICR, TCC0-7,GCC0-7) */ > +#define MX25_ADCQ_CFG_SETTLING_TIME(x) ((x) << 24) > +#define MX25_ADCQ_CFG_IGS (1 << 20) > +#define MX25_ADCQ_CFG_NOS_MASK (0xf << 16) > +#define MX25_ADCQ_CFG_NOS(x) (((x) - 1) << 16) > +#define MX25_ADCQ_CFG_WIPER (1 << 15) > +#define MX25_ADCQ_CFG_YNLR (1 << 14) > +#define MX25_ADCQ_CFG_YPLL_HIGH 0 > +#define MX25_ADCQ_CFG_YPLL_OFF (1 << 12) > +#define MX25_ADCQ_CFG_YPLL_LOW (3 << 12) > +#define MX25_ADCQ_CFG_XNUR_HIGH 0 > +#define MX25_ADCQ_CFG_XNUR_OFF (1 << 10) > +#define MX25_ADCQ_CFG_XNUR_LOW (3 << 10) > +#define MX25_ADCQ_CFG_XPUL_OFF (1 << 9) > +#define MX25_ADCQ_CFG_XPUL_HIGH 0 > +#define MX25_ADCQ_CFG_REFP_YP 0 > +#define MX25_ADCQ_CFG_REFP_XP (1 << 7) > +#define MX25_ADCQ_CFG_REFP_EXT (2 << 7) > +#define MX25_ADCQ_CFG_REFP_INT (3 << 7) > +#define MX25_ADCQ_CFG_REFP_MASK (3 << 7) > +#define MX25_ADCQ_CFG_IN_XP 0 > +#define MX25_ADCQ_CFG_IN_YP (1 << 4) > +#define MX25_ADCQ_CFG_IN_XN (2 << 4) > +#define MX25_ADCQ_CFG_IN_YN (3 << 4) > +#define MX25_ADCQ_CFG_IN_WIPER (4 << 4) > +#define MX25_ADCQ_CFG_IN_AUX0 (5 << 4) > +#define MX25_ADCQ_CFG_IN_AUX1 (6 << 4) > +#define MX25_ADCQ_CFG_IN_AUX2 (7 << 4) > +#define MX25_ADCQ_CFG_REFN_XN 0 > +#define MX25_ADCQ_CFG_REFN_YN (1 << 2) > +#define MX25_ADCQ_CFG_REFN_NGND (2 << 2) > +#define MX25_ADCQ_CFG_REFN_NGND2 (3 << 2) > +#define MX25_ADCQ_CFG_REFN_MASK (3 << 2) > +#define MX25_ADCQ_CFG_PENIACK (1 << 1) > + > + > +#endif /* _LINUX_INCLUDE_INPUT_IMX25_TSADC_H_ */ > ^ permalink raw reply [flat|nested] 76+ messages in thread
* Re: [PATCH v2 1/6] mfd: fsl imx25 Touchscreen ADC driver @ 2014-06-21 10:09 ` Jonathan Cameron 0 siblings, 0 replies; 76+ messages in thread From: Jonathan Cameron @ 2014-06-21 10:09 UTC (permalink / raw) To: Denis Carikli, Shawn Guo, Samuel Ortiz, Dmitry Torokhov Cc: Eric Bénard, Sascha Hauer, linux-arm-kernel, Lee Jones, linux-input, linux-iio, Fabio Estevam, Lars-Peter Clausen, Markus Pargmann On 13/06/14 16:21, Denis Carikli wrote: > From: Markus Pargmann <mpa@pengutronix.de> > > This is the core driver for imx25 touchscreen/adc driver. The module > has one shared ADC and two different conversion queues which use the > ADC. The two queues are identical. Both can be used for general purpose > ADC but one is meant to be used for touchscreens. > > This driver is the core which manages the central components and > registers of the TSC/ADC unit. It manages the IRQs and forwards them to > the correct components. > > Signed-off-by: Markus Pargmann <mpa@pengutronix.de> > Signed-off-by: Denis Carikli <denis@eukrea.com> Hi, A couple of trivial bits inline. Otherwise, Acked-by: Jonathan Cameron <jic23@kernel.org> Note I have not dived into the datasheet for this review (hence not a reviewed by!) Too many other things to do today! > --- > .../devicetree/bindings/mfd/fsl-imx25-tsadc.txt | 46 ++++ > drivers/mfd/Kconfig | 9 + > drivers/mfd/Makefile | 2 + > drivers/mfd/fsl-imx25-tsadc.c | 232 ++++++++++++++++++++ > include/linux/mfd/imx25-tsadc.h | 138 ++++++++++++ > 5 files changed, 427 insertions(+) > create mode 100644 Documentation/devicetree/bindings/mfd/fsl-imx25-tsadc.txt > create mode 100644 drivers/mfd/fsl-imx25-tsadc.c > create mode 100644 include/linux/mfd/imx25-tsadc.h > > diff --git a/Documentation/devicetree/bindings/mfd/fsl-imx25-tsadc.txt b/Documentation/devicetree/bindings/mfd/fsl-imx25-tsadc.txt > new file mode 100644 > index 0000000..a857af0e > --- /dev/null > +++ b/Documentation/devicetree/bindings/mfd/fsl-imx25-tsadc.txt > @@ -0,0 +1,46 @@ > +Freescale mx25 ADC/TSC multifunction device > + > +This device combines two general purpose conversion queues one used for general > +ADC and the other used for touchscreens. > + > +Required properties: > + - compatible: Should be "fsl,imx25-tsadc". > + - reg: Memory range of the device. > + - interrupts: Interrupt for this device as described in > + interrupts/interrupts.txt > + - clocks: An 'ipg' clock defined as described in clocks/clock.txt > + - interrupt-controller: This device is an interrupt controller. It controls > + the interrupts of both conversion queues. > + - #interrupt-cells: Should be '<1>'. > + - #address-cells: Should be '<1>'. > + - #size-cells: Should be '<1>'. > + - ranges > + > +This device includes two conversion queues which can be added as subnodes. > +The first queue is for the touchscreen, the second for general purpose ADC. > + > +Example: > + tscadc: tscadc@50030000 { > + compatible = "fsl,imx25-tsadc"; > + reg = <0x50030000 0xc>; > + interrupts = <46>; > + clocks = <&clks 119>; > + clock-names = "ipg"; > + interrupt-controller; > + #interrupt-cells = <1>; > + #address-cells = <1>; > + #size-cells = <1>; > + ranges; > + > + tsc: tcq@50030400 { > + compatible = "fsl,imx25-tcq"; > + reg = <0x50030400 0x60>; > + ... > + }; > + > + adc: gcq@50030800 { > + compatible = "fsl,imx25-gcq"; > + reg = <0x50030800 0x60>; > + ... > + }; > + }; > diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig > index ee8204c..73f4e66 100644 > --- a/drivers/mfd/Kconfig > +++ b/drivers/mfd/Kconfig > @@ -183,6 +183,15 @@ config MFD_DA9063 > Additional drivers must be enabled in order to use the functionality > of the device. > > +config MFD_MX25_TSADC > + tristate "Freescale i.MX25 integrated Touchscreen and ADC unit" > + depends on ARCH_MXC > + select REGMAP_MMIO > + help > + Enable support for the integrated Touchscreen and ADC unit of the > + i.MX25 processors. They consist of a conversion queue for general > + purpose ADC and a queue for Touchscreens. > + > config MFD_MC13XXX > tristate > depends on (SPI_MASTER || I2C) > diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile > index 8afedba..7ff1013 100644 > --- a/drivers/mfd/Makefile > +++ b/drivers/mfd/Makefile > @@ -78,6 +78,8 @@ obj-$(CONFIG_TWL4030_POWER) += twl4030-power.o > obj-$(CONFIG_MFD_TWL4030_AUDIO) += twl4030-audio.o > obj-$(CONFIG_TWL6040_CORE) += twl6040.o > > +obj-$(CONFIG_MFD_MX25_TSADC) += fsl-imx25-tsadc.o > + > obj-$(CONFIG_MFD_MC13XXX) += mc13xxx-core.o > obj-$(CONFIG_MFD_MC13XXX_SPI) += mc13xxx-spi.o > obj-$(CONFIG_MFD_MC13XXX_I2C) += mc13xxx-i2c.o > diff --git a/drivers/mfd/fsl-imx25-tsadc.c b/drivers/mfd/fsl-imx25-tsadc.c > new file mode 100644 > index 0000000..10332c2 > --- /dev/null > +++ b/drivers/mfd/fsl-imx25-tsadc.c > @@ -0,0 +1,232 @@ > +/* > + * Copyright 2014 Markus Pargmann, Pengutronix <mpa@pengutronix.de> > + * > + * The code contained herein is licensed under the GNU General Public > + * License. You may obtain a copy of the GNU General Public License > + * Version 2 or later at the following locations: > + * > + * http://www.opensource.org/licenses/gpl-license.html > + * http://www.gnu.org/copyleft/gpl.html > + */ > + > +#include <linux/clk.h> > +#include <linux/interrupt.h> > +#include <linux/irq.h> > +#include <linux/irqdesc.h> > +#include <linux/irqdomain.h> > +#include <linux/irqchip/chained_irq.h> > +#include <linux/mfd/imx25-tsadc.h> > +#include <linux/module.h> > +#include <linux/of.h> > +#include <linux/of_platform.h> > +#include <linux/platform_device.h> > +#include <linux/regmap.h> > + > +struct mx25_tsadc_priv { > + struct regmap *regs; > + struct irq_domain *domain; > + struct clk *clk; > +}; > + > +static struct regmap_config mx25_tsadc = { > + .fast_io = true, > + .max_register = 0x8, > + .reg_bits = 32, > + .val_bits = 32, > + .reg_stride = 4, > +}; > + > +struct regmap *mx25_tsadc_get_regmap(struct device *dev) > +{ > + struct platform_device *pdev; > + struct mx25_tsadc_priv *priv; > + > + if (!dev) > + return NULL; > + > + pdev = container_of(dev, struct platform_device, dev); > + priv = platform_get_drvdata(pdev); > + if (IS_ERR_OR_NULL(priv->regs)) > + return NULL; > + > + return priv->regs; > +} > +EXPORT_SYMBOL(mx25_tsadc_get_regmap); > + > +struct clk *mx25_tsadc_get_ipg(struct device *dev) > +{ > + struct platform_device *pdev; > + struct mx25_tsadc_priv *priv; > + > + if (!dev) > + return NULL; > + > + pdev = container_of(dev, struct platform_device, dev); > + priv = platform_get_drvdata(pdev); > + if (IS_ERR_OR_NULL(priv->clk)) > + return NULL; > + > + return priv->clk; > +} > +EXPORT_SYMBOL(mx25_tsadc_get_ipg); > + > +static void mx25_tsadc_irq_handler(u32 irq, struct irq_desc *desc) > +{ > + struct mx25_tsadc_priv *priv = irq_desc_get_handler_data(desc); > + struct irq_chip *chip = irq_get_chip(irq); > + u32 status; > + > + chained_irq_enter(chip, desc); > + > + regmap_read(priv->regs, MX25_TSC_TGSR, &status); > + > + if (status & MX25_TGSR_GCQ_INT) > + generic_handle_irq(irq_find_mapping(priv->domain, 1)); > + > + if (status & MX25_TGSR_TCQ_INT) > + generic_handle_irq(irq_find_mapping(priv->domain, 0)); > + > + chained_irq_exit(chip, desc); > +} > + > +static void mx25_tsadc_nop(struct irq_data *d) > +{ > +} > + > +static int mx25_tsadc_set_wake_nop(struct irq_data *d, unsigned int state) > +{ > + return 0; > +} > + > +static struct irq_chip mx25_tsadc_irq_chip = { > + .name = "mx25-tsadc", > + .irq_ack = mx25_tsadc_nop, > + .irq_mask = mx25_tsadc_nop, > + .irq_unmask = mx25_tsadc_nop, > + .irq_set_wake = mx25_tsadc_set_wake_nop, Whilst this is not documented as being optional, in kernel/irq/manage.c it clearly is. Otherwise, what you appear to have here is the same (up to a name) as the dummy_irq_chip provided for just such dumb devices. Could you use that? > +}; > + > +static int mx25_tsadc_domain_map(struct irq_domain *d, unsigned int irq, > + irq_hw_number_t hwirq) > +{ > + struct mx25_tsadc_priv *priv = d->host_data; > + > + irq_set_chip_data(irq, priv); > + irq_set_chip_and_handler(irq, &mx25_tsadc_irq_chip, > + handle_level_irq); > + > + Bonus blank line here. > + set_irq_flags(irq, IRQF_VALID); > + > + return 0; > +} > + > +static struct irq_domain_ops mx25_tsadc_domain_ops = { > + .map = mx25_tsadc_domain_map, > + .xlate = irq_domain_xlate_onecell, > +}; > + > +static int mx25_tsadc_setup_irq(struct platform_device *pdev, > + struct mx25_tsadc_priv *priv) > +{ > + struct device *dev = &pdev->dev; > + struct device_node *np = dev->of_node; > + int irq; > + > + irq = platform_get_irq(pdev, 0); > + if (irq < 0) { > + dev_err(dev, "Failed to get irq\n"); > + return irq; > + } > + > + priv->domain = irq_domain_add_simple(np, 2, 0, &mx25_tsadc_domain_ops, > + priv); > + if (!priv->domain) { > + dev_err(dev, "Failed to add irq domain\n"); > + return -ENOMEM; > + } > + > + irq_set_chained_handler(irq, mx25_tsadc_irq_handler); > + irq_set_handler_data(irq, priv); > + > + return 0; > +} > + > +static int mx25_tsadc_probe(struct platform_device *pdev) > +{ > + struct device *dev = &pdev->dev; > + struct device_node *np = dev->of_node; > + struct mx25_tsadc_priv *priv; > + struct resource *iores; > + int ret; > + void __iomem *iomem; > + > + priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); > + if (!priv) > + return -ENOMEM; > + > + iores = platform_get_resource(pdev, IORESOURCE_MEM, 0); Worth checking whether this succeeded (!=NULL)? > + iomem = devm_ioremap_resource(dev, iores); > + if (IS_ERR(iomem)) { > + dev_err(dev, "Failed to remap iomem\n"); > + return PTR_ERR(iomem); > + } > + > + priv->regs = regmap_init_mmio(dev, iomem, &mx25_tsadc); > + if (IS_ERR(priv->regs)) { > + dev_err(dev, "Failed to initialize regmap\n"); > + return PTR_ERR(priv->regs); > + } > + > + priv->clk = devm_clk_get(dev, "ipg"); > + if (IS_ERR(priv->clk)) { > + dev_err(dev, "Failed to get ipg clock\n"); > + return PTR_ERR(priv->clk); > + } > + > + /* Enable clock and reset the component */ > + regmap_update_bits(priv->regs, MX25_TSC_TGCR, MX25_TGCR_CLK_EN, > + MX25_TGCR_CLK_EN); > + regmap_update_bits(priv->regs, MX25_TSC_TGCR, MX25_TGCR_TSC_RST, > + MX25_TGCR_TSC_RST); > + > + /* Setup powersaving mode, but enable internal reference voltage */ > + regmap_update_bits(priv->regs, MX25_TSC_TGCR, MX25_TGCR_POWERMODE_MASK, > + MX25_TGCR_POWERMODE_SAVE); > + regmap_update_bits(priv->regs, MX25_TSC_TGCR, MX25_TGCR_INTREFEN, > + MX25_TGCR_INTREFEN); > + > + ret = mx25_tsadc_setup_irq(pdev, priv); > + if (ret) { > + dev_err(dev, "Failed to setup irqs\n"); > + return ret; > + } > + > + platform_set_drvdata(pdev, priv); > + > + of_platform_populate(np, NULL, NULL, dev); > + > + dev_info(dev, "i.MX25 Touchscreen and ADC core driver loaded\n"); > + > + return 0; > +} > + > +static const struct of_device_id mx25_tsadc_ids[] = { > + { .compatible = "fsl,imx25-tsadc", }, > + { /* Sentinel */ } > +}; > + > +static struct platform_driver mx25_tsadc_driver = { > + .driver = { > + .name = "mx25-tsadc", > + .owner = THIS_MODULE, > + .of_match_table = mx25_tsadc_ids, > + }, > + .probe = mx25_tsadc_probe, > +}; > +module_platform_driver(mx25_tsadc_driver); > + > +MODULE_DESCRIPTION("MFD for ADC/TSC for Freescale mx25"); > +MODULE_AUTHOR("Markus Pargmann <mpa@pengutronix.de>"); > +MODULE_LICENSE("GPL v2"); > +MODULE_ALIAS("platform:mx25-tsadc"); > diff --git a/include/linux/mfd/imx25-tsadc.h b/include/linux/mfd/imx25-tsadc.h > new file mode 100644 > index 0000000..6fba341 > --- /dev/null > +++ b/include/linux/mfd/imx25-tsadc.h > @@ -0,0 +1,138 @@ > +#ifndef _LINUX_INCLUDE_INPUT_IMX25_TSADC_H_ > +#define _LINUX_INCLUDE_INPUT_IMX25_TSADC_H_ > + > +struct regmap; > +struct device; > +struct clk; > + > +struct regmap *mx25_tsadc_get_regmap(struct device *dev); > +struct clk *mx25_tsadc_get_ipg(struct device *dev); > + > +#define MX25_TSC_TGCR 0x00 > +#define MX25_TSC_TGSR 0x04 > +#define MX25_TSC_TICR 0x08 > + > +/* The same register layout for TC and GC queue */ > +#define MX25_ADCQ_FIFO 0x00 > +#define MX25_ADCQ_CR 0x04 > +#define MX25_ADCQ_SR 0x08 > +#define MX25_ADCQ_MR 0x0c > +#define MX25_ADCQ_ITEM_7_0 0x20 > +#define MX25_ADCQ_ITEM_15_8 0x24 > +#define MX25_ADCQ_CFG(n) (0x40 + ((n) * 0x4)) > + > +/* Register values */ > +/* Queue Config register */ > +#define MX25_ADCQ_MR_MASK 0xffffffff > + > +/* TGCR */ > +#define MX25_TGCR_PDBTIME(x) ((x) << 25) > +#define MX25_TGCR_PDBTIME_MASK MX25_TGCR_PDBTIME(0x7f) > +#define MX25_TGCR_PDBEN (1 << 24) > +#define MX25_TGCR_PDEN (1 << 23) > +#define MX25_TGCR_ADCCLKCFG(x) ((x) << 16) > +#define MX25_TGCR_GET_ADCCLK(x) (((x) >> 16) & 0x1f) > +#define MX25_TGCR_INTREFEN (1 << 10) > +#define MX25_TGCR_POWERMODE_MASK (3 << 8) > +#define MX25_TGCR_POWERMODE_SAVE (1 << 8) > +#define MX25_TGCR_POWERMODE_ON (2 << 8) > +#define MX25_TGCR_STLC (1 << 5) > +#define MX25_TGCR_SLPC (1 << 4) > +#define MX25_TGCR_FUNC_RST (1 << 2) > +#define MX25_TGCR_TSC_RST (1 << 1) > +#define MX25_TGCR_CLK_EN (1 << 0) > + > +/* TGSR */ > +#define MX25_TGSR_SLP_INT (1 << 2) > +#define MX25_TGSR_GCQ_INT (1 << 1) > +#define MX25_TGSR_TCQ_INT (1 << 0) > + > +/* ADCQ_ITEM_* */ > +#define _MX25_ADCQ_ITEM(item, x) ((x) << ((item) * 4)) > +#define MX25_ADCQ_ITEM(item, x) ((item) >= 8 ? \ > + _MX25_ADCQ_ITEM((item) - 8, (x)) : _MX25_ADCQ_ITEM((item), (x))) > + > +/* ADCQ_FIFO (TCQFIFO and GCQFIFO) */ > +#define MX25_ADCQ_FIFO_DATA(x) (((x) >> 4) & 0xfff) > +#define MX25_ADCQ_FIFO_ID(x) ((x) & 0xf) > + > +/* ADCQ_CR (TCQR and GCQR) */ > +#define MX25_ADCQ_CR_PDCFG_LEVEL (1 << 19) > +#define MX25_ADCQ_CR_PDMSK (1 << 18) > +#define MX25_ADCQ_CR_FRST (1 << 17) > +#define MX25_ADCQ_CR_QRST (1 << 16) > +#define MX25_ADCQ_CR_RWAIT_MASK (0xf << 12) > +#define MX25_ADCQ_CR_RWAIT(x) ((x) << 12) > +#define MX25_ADCQ_CR_WMRK_MASK (0xf << 8) > +#define MX25_ADCQ_CR_WMRK(x) ((x) << 8) > +#define MX25_ADCQ_CR_LITEMID_MASK (0xf << 4) > +#define MX25_ADCQ_CR_LITEMID(x) ((x) << 4) > +#define MX25_ADCQ_CR_RPT (1 << 3) > +#define MX25_ADCQ_CR_FQS (1 << 2) > +#define MX25_ADCQ_CR_QSM_MASK 0x3 > +#define MX25_ADCQ_CR_QSM_PD 0x1 > +#define MX25_ADCQ_CR_QSM_FQS 0x2 > +#define MX25_ADCQ_CR_QSM_FQS_PD 0x3 > + > +/* ADCQ_SR (TCQSR and GCQSR) */ > +#define MX25_ADCQ_SR_FDRY (1 << 15) > +#define MX25_ADCQ_SR_FULL (1 << 14) > +#define MX25_ADCQ_SR_EMPT (1 << 13) > +#define MX25_ADCQ_SR_FDN(x) (((x) >> 8) & 0x1f) > +#define MX25_ADCQ_SR_FRR (1 << 6) > +#define MX25_ADCQ_SR_FUR (1 << 5) > +#define MX25_ADCQ_SR_FOR (1 << 4) > +#define MX25_ADCQ_SR_EOQ (1 << 1) > +#define MX25_ADCQ_SR_PD (1 << 0) > + > +/* ADCQ_MR (TCQMR and GCQMR) */ > +#define MX25_ADCQ_MR_FDRY_DMA (1 << 31) > +#define MX25_ADCQ_MR_FER_DMA (1 << 22) > +#define MX25_ADCQ_MR_FUR_DMA (1 << 21) > +#define MX25_ADCQ_MR_FOR_DMA (1 << 20) > +#define MX25_ADCQ_MR_EOQ_DMA (1 << 17) > +#define MX25_ADCQ_MR_PD_DMA (1 << 16) > +#define MX25_ADCQ_MR_FDRY_IRQ (1 << 15) > +#define MX25_ADCQ_MR_FER_IRQ (1 << 6) > +#define MX25_ADCQ_MR_FUR_IRQ (1 << 5) > +#define MX25_ADCQ_MR_FOR_IRQ (1 << 4) > +#define MX25_ADCQ_MR_EOQ_IRQ (1 << 1) > +#define MX25_ADCQ_MR_PD_IRQ (1 << 0) > + > +/* ADCQ_CFG (TICR, TCC0-7,GCC0-7) */ > +#define MX25_ADCQ_CFG_SETTLING_TIME(x) ((x) << 24) > +#define MX25_ADCQ_CFG_IGS (1 << 20) > +#define MX25_ADCQ_CFG_NOS_MASK (0xf << 16) > +#define MX25_ADCQ_CFG_NOS(x) (((x) - 1) << 16) > +#define MX25_ADCQ_CFG_WIPER (1 << 15) > +#define MX25_ADCQ_CFG_YNLR (1 << 14) > +#define MX25_ADCQ_CFG_YPLL_HIGH 0 > +#define MX25_ADCQ_CFG_YPLL_OFF (1 << 12) > +#define MX25_ADCQ_CFG_YPLL_LOW (3 << 12) > +#define MX25_ADCQ_CFG_XNUR_HIGH 0 > +#define MX25_ADCQ_CFG_XNUR_OFF (1 << 10) > +#define MX25_ADCQ_CFG_XNUR_LOW (3 << 10) > +#define MX25_ADCQ_CFG_XPUL_OFF (1 << 9) > +#define MX25_ADCQ_CFG_XPUL_HIGH 0 > +#define MX25_ADCQ_CFG_REFP_YP 0 > +#define MX25_ADCQ_CFG_REFP_XP (1 << 7) > +#define MX25_ADCQ_CFG_REFP_EXT (2 << 7) > +#define MX25_ADCQ_CFG_REFP_INT (3 << 7) > +#define MX25_ADCQ_CFG_REFP_MASK (3 << 7) > +#define MX25_ADCQ_CFG_IN_XP 0 > +#define MX25_ADCQ_CFG_IN_YP (1 << 4) > +#define MX25_ADCQ_CFG_IN_XN (2 << 4) > +#define MX25_ADCQ_CFG_IN_YN (3 << 4) > +#define MX25_ADCQ_CFG_IN_WIPER (4 << 4) > +#define MX25_ADCQ_CFG_IN_AUX0 (5 << 4) > +#define MX25_ADCQ_CFG_IN_AUX1 (6 << 4) > +#define MX25_ADCQ_CFG_IN_AUX2 (7 << 4) > +#define MX25_ADCQ_CFG_REFN_XN 0 > +#define MX25_ADCQ_CFG_REFN_YN (1 << 2) > +#define MX25_ADCQ_CFG_REFN_NGND (2 << 2) > +#define MX25_ADCQ_CFG_REFN_NGND2 (3 << 2) > +#define MX25_ADCQ_CFG_REFN_MASK (3 << 2) > +#define MX25_ADCQ_CFG_PENIACK (1 << 1) > + > + > +#endif /* _LINUX_INCLUDE_INPUT_IMX25_TSADC_H_ */ > ^ permalink raw reply [flat|nested] 76+ messages in thread
* [PATCH v2 2/6] input: touchscreen: imx25 tcq driver 2014-06-13 15:21 ` Denis Carikli @ 2014-06-13 15:21 ` Denis Carikli -1 siblings, 0 replies; 76+ messages in thread From: Denis Carikli @ 2014-06-13 15:21 UTC (permalink / raw) To: Shawn Guo, Samuel Ortiz, Dmitry Torokhov, Jonathan Cameron Cc: Eric Bénard, Sascha Hauer, linux-arm-kernel, Lee Jones, linux-input, linux-iio, Fabio Estevam, Lars-Peter Clausen, Markus Pargmann, Denis Carikli From: Markus Pargmann <mpa@pengutronix.de> This is a driver for the imx25 ADC/TSC module. It controls the touchscreen conversion queue and creates a touchscreen input device. The driver currently only supports 4 wire touchscreens. The driver uses a simple conversion queue of precharge, touch detection, X measurement, Y measurement, precharge and another touch detection. This driver uses the regmap from the parent to setup some touch specific settings in the core driver and setup a idle configuration with touch detection. Signed-off-by: Markus Pargmann <mpa@pengutronix.de> Signed-off-by: Denis Carikli <denis@eukrea.com> --- .../bindings/input/touchscreen/fsl-mx25-tcq.txt | 29 + drivers/input/touchscreen/Kconfig | 6 + drivers/input/touchscreen/Makefile | 1 + drivers/input/touchscreen/fsl-imx25-tcq.c | 576 ++++++++++++++++++++ 4 files changed, 612 insertions(+) create mode 100644 Documentation/devicetree/bindings/input/touchscreen/fsl-mx25-tcq.txt create mode 100644 drivers/input/touchscreen/fsl-imx25-tcq.c diff --git a/Documentation/devicetree/bindings/input/touchscreen/fsl-mx25-tcq.txt b/Documentation/devicetree/bindings/input/touchscreen/fsl-mx25-tcq.txt new file mode 100644 index 0000000..4214a99 --- /dev/null +++ b/Documentation/devicetree/bindings/input/touchscreen/fsl-mx25-tcq.txt @@ -0,0 +1,29 @@ +Freescale mx25 TS conversion queue module + +mx25 touchscreen conversion queue module which controls the ADC unit of the +mx25 for attached touchscreens. + +Required properties: + - compatible: Should be "fsl,imx25-tcq". + - reg: Memory range of the device. + - interrupts: Should be the interrupt number associated with this module within + the tscadc unit (<0>). + - interrupt-parent: Should be a phandle to the tscadc unit. + - fsl,wires: Should be '<4>' or '<5>' + +Optional properties: + - fsl,pen-debounce: Pen debounce time. + - fsl,pen-threshold: Pen-down threshold for the touchscreen. + - fsl,settling-time: Settling time in nanoseconds. + +This device includes two conversion queues which can be added as subnodes. +The first queue is for the touchscreen, the second for general purpose ADC. + +Example: + tsc: tcq@50030400 { + compatible = "fsl,imx25-tcq"; + reg = <0x50030400 0x60>; + interrupt-parent = <&tscadc>; + interrupts = <0>; + fsl,wires = <4>; + }; diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig index a23a94b..a2290b9 100644 --- a/drivers/input/touchscreen/Kconfig +++ b/drivers/input/touchscreen/Kconfig @@ -699,6 +699,12 @@ config TOUCHSCREEN_USB_COMPOSITE To compile this driver as a module, choose M here: the module will be called usbtouchscreen. +config TOUCHSCREEN_MX25 + tristate "Freescale i.MX25 touchscreen input driver" + depends on MFD_MX25_TSADC + help + Enable support for touchscreen connected to your i.MX25. + config TOUCHSCREEN_MC13783 tristate "Freescale MC13783 touchscreen input driver" depends on MFD_MC13XXX diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile index 126479d..537d591 100644 --- a/drivers/input/touchscreen/Makefile +++ b/drivers/input/touchscreen/Makefile @@ -38,6 +38,7 @@ obj-$(CONFIG_TOUCHSCREEN_INEXIO) += inexio.o obj-$(CONFIG_TOUCHSCREEN_INTEL_MID) += intel-mid-touch.o obj-$(CONFIG_TOUCHSCREEN_LPC32XX) += lpc32xx_ts.o obj-$(CONFIG_TOUCHSCREEN_MAX11801) += max11801_ts.o +obj-$(CONFIG_TOUCHSCREEN_MX25) += fsl-imx25-tcq.o obj-$(CONFIG_TOUCHSCREEN_MC13783) += mc13783_ts.o obj-$(CONFIG_TOUCHSCREEN_MCS5000) += mcs5000_ts.o obj-$(CONFIG_TOUCHSCREEN_MIGOR) += migor_ts.o diff --git a/drivers/input/touchscreen/fsl-imx25-tcq.c b/drivers/input/touchscreen/fsl-imx25-tcq.c new file mode 100644 index 0000000..4ce576e --- /dev/null +++ b/drivers/input/touchscreen/fsl-imx25-tcq.c @@ -0,0 +1,576 @@ +/* + * Copyright 2014 Markus Pargmann, Pengutronix <mpa@pengutronix.de> + * Based on driver from 2011: + * Juergen Beisert, Pengutronix <kernel@pengutronix.de> + * + * The code contained herein is licensed under the GNU General Public + * License. You may obtain a copy of the GNU General Public License + * Version 2 or later at the following locations: + * + * http://www.opensource.org/licenses/gpl-license.html + * http://www.gnu.org/copyleft/gpl.html + * + * This is the driver for the imx25 TCQ (Touchscreen Conversion Queue) + * connected to the imx25 ADC. + */ + +#include <linux/clk.h> +#include <linux/interrupt.h> +#include <linux/input.h> +#include <linux/mfd/imx25-tsadc.h> +#include <linux/module.h> +#include <linux/of.h> +#include <linux/platform_device.h> +#include <linux/regmap.h> + +static const char mx25_tcq_name[] = "mx25-tcq"; + +enum mx25_tcq_mode { + MX25_TS_4WIRE, +}; + +struct mx25_tcq_priv { + struct regmap *regs; + struct regmap *core_regs; + struct input_dev *idev; + enum mx25_tcq_mode mode; + unsigned int pen_threshold; + unsigned int sample_count; + unsigned int expected_samples; + unsigned int pen_debounce; + unsigned int settling_time; + struct clk *clk; +}; + +static struct regmap_config mx25_tcq_regconfig = { + .fast_io = true, + .max_register = 0x5c, + .reg_bits = 32, + .val_bits = 32, + .reg_stride = 4, +}; + +static struct of_device_id mx25_tcq_ids[] = { + { .compatible = "fsl,imx25-tcq", }, + { /* Senitel */ } +}; + +#define TSC_4WIRE_PRE_INDEX 0 +#define TSC_4WIRE_X_INDEX 1 +#define TSC_4WIRE_Y_INDEX 2 +#define TSC_4WIRE_POST_INDEX 3 +#define TSC_4WIRE_LEAVE 4 + +#define MX25_TSC_DEF_THRESHOLD 80 +#define TSC_MAX_SAMPLES 16 + + +enum mx25_adc_configurations { + MX25_CFG_PRECHARGE = 0, + MX25_CFG_TOUCH_DETECT, + MX25_CFG_X_MEASUREMENT, + MX25_CFG_Y_MEASUREMENT, +}; + +#define MX25_PRECHARGE_VALUE (\ + MX25_ADCQ_CFG_YPLL_OFF | \ + MX25_ADCQ_CFG_XNUR_OFF | \ + MX25_ADCQ_CFG_XPUL_HIGH | \ + MX25_ADCQ_CFG_REFP_INT | \ + MX25_ADCQ_CFG_IN_XP | \ + MX25_ADCQ_CFG_REFN_NGND2 | \ + MX25_ADCQ_CFG_IGS) + +#define MX25_TOUCH_DETECT_VALUE (\ + MX25_ADCQ_CFG_YNLR | \ + MX25_ADCQ_CFG_YPLL_OFF | \ + MX25_ADCQ_CFG_XNUR_OFF | \ + MX25_ADCQ_CFG_XPUL_OFF | \ + MX25_ADCQ_CFG_REFP_INT | \ + MX25_ADCQ_CFG_IN_XP | \ + MX25_ADCQ_CFG_REFN_NGND2 | \ + MX25_ADCQ_CFG_PENIACK) + +static void imx25_setup_queue_cfgs(struct mx25_tcq_priv *priv, + unsigned int settling_time) +{ + u32 precharge_cfg = + MX25_PRECHARGE_VALUE | + MX25_ADCQ_CFG_SETTLING_TIME(settling_time); + u32 touch_detect_cfg = + MX25_TOUCH_DETECT_VALUE | + MX25_ADCQ_CFG_NOS(1) | + MX25_ADCQ_CFG_SETTLING_TIME(settling_time); + + regmap_write(priv->core_regs, MX25_TSC_TICR, precharge_cfg); + + /* PRECHARGE */ + regmap_write(priv->regs, MX25_ADCQ_CFG(MX25_CFG_PRECHARGE), + precharge_cfg); + + /* TOUCH_DETECT */ + regmap_write(priv->regs, MX25_ADCQ_CFG(MX25_CFG_TOUCH_DETECT), + touch_detect_cfg); + + /* X Measurement */ + regmap_write(priv->regs, MX25_ADCQ_CFG(MX25_CFG_X_MEASUREMENT), + MX25_ADCQ_CFG_YPLL_OFF | + MX25_ADCQ_CFG_XNUR_LOW | + MX25_ADCQ_CFG_XPUL_HIGH | + MX25_ADCQ_CFG_REFP_XP | + MX25_ADCQ_CFG_IN_YP | + MX25_ADCQ_CFG_REFN_XN | + MX25_ADCQ_CFG_NOS(priv->sample_count) | + MX25_ADCQ_CFG_SETTLING_TIME(settling_time)); + + /* Y Measurement */ + regmap_write(priv->regs, MX25_ADCQ_CFG(MX25_CFG_Y_MEASUREMENT), + MX25_ADCQ_CFG_YNLR | + MX25_ADCQ_CFG_YPLL_HIGH | + MX25_ADCQ_CFG_XNUR_OFF | + MX25_ADCQ_CFG_XPUL_OFF | + MX25_ADCQ_CFG_REFP_YP | + MX25_ADCQ_CFG_IN_XP | + MX25_ADCQ_CFG_REFN_YN | + MX25_ADCQ_CFG_NOS(priv->sample_count) | + MX25_ADCQ_CFG_SETTLING_TIME(settling_time)); + + /* Enable the touch detection right now */ + regmap_write(priv->core_regs, MX25_TSC_TICR, touch_detect_cfg | + MX25_ADCQ_CFG_IGS); +} + +static int imx25_setup_queue_4wire(struct mx25_tcq_priv *priv, + unsigned settling_time, int *items) +{ + imx25_setup_queue_cfgs(priv, settling_time); + + /* Setup the conversion queue */ + regmap_write(priv->regs, MX25_ADCQ_ITEM_7_0, + MX25_ADCQ_ITEM(0, MX25_CFG_PRECHARGE) | + MX25_ADCQ_ITEM(1, MX25_CFG_TOUCH_DETECT) | + MX25_ADCQ_ITEM(2, MX25_CFG_X_MEASUREMENT) | + MX25_ADCQ_ITEM(3, MX25_CFG_Y_MEASUREMENT) | + MX25_ADCQ_ITEM(4, MX25_CFG_PRECHARGE) | + MX25_ADCQ_ITEM(5, MX25_CFG_TOUCH_DETECT)); + + /* We measure X/Y with 'sample_count' number of samples and execute a + * touch detection twice, with 1 sample each */ + priv->expected_samples = priv->sample_count * 2 + 2; + *items = 6; + + return 0; +} + +static void mx25_tcq_disable_touch_irq(struct mx25_tcq_priv *priv) +{ + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_PDMSK, + MX25_ADCQ_CR_PDMSK); +} + +static void mx25_tcq_enable_touch_irq(struct mx25_tcq_priv *priv) +{ + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_PDMSK, 0); +} + +static void mx25_tcq_disable_fifo_irq(struct mx25_tcq_priv *priv) +{ + regmap_update_bits(priv->regs, MX25_ADCQ_MR, MX25_ADCQ_MR_FDRY_IRQ, + MX25_ADCQ_MR_FDRY_IRQ); +} + +static void mx25_tcq_enable_fifo_irq(struct mx25_tcq_priv *priv) +{ + regmap_update_bits(priv->regs, MX25_ADCQ_MR, MX25_ADCQ_MR_FDRY_IRQ, 0); +} + +static void mx25_tcq_force_queue_start(struct mx25_tcq_priv *priv) +{ + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FQS, + MX25_ADCQ_CR_FQS); + + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FQS, 0); +} + +static void mx25_tcq_force_queue_stop(struct mx25_tcq_priv *priv) +{ + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FQS, 0); +} + +static void mx25_tcq_fifo_reset(struct mx25_tcq_priv *priv) +{ + u32 tcqcr; + + regmap_read(priv->regs, MX25_ADCQ_CR, &tcqcr); + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FRST, + MX25_ADCQ_CR_FRST); + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FRST, + 0); + regmap_write(priv->regs, MX25_ADCQ_CR, tcqcr); +} + +static void mx25_tcq_re_enable_touch_detection(struct mx25_tcq_priv *priv) +{ + /* stop the queue from looping */ + mx25_tcq_force_queue_stop(priv); + + /* for a clean touch detection, preload the X plane */ + regmap_write(priv->core_regs, MX25_TSC_TICR, MX25_PRECHARGE_VALUE); + + /* waste some time now to pre-load the X plate to high voltage */ + mx25_tcq_fifo_reset(priv); + + /* re-enable the detection right now */ + regmap_write(priv->core_regs, MX25_TSC_TICR, MX25_TOUCH_DETECT_VALUE | + MX25_ADCQ_CFG_IGS); + + regmap_update_bits(priv->regs, MX25_ADCQ_SR, MX25_ADCQ_SR_PD, + MX25_ADCQ_SR_PD); + + /* enable the pen down event to be a source for the interrupt */ + regmap_update_bits(priv->regs, MX25_ADCQ_MR, MX25_ADCQ_MR_PD_IRQ, 0); + + /* lets fire the next IRQ if someone touches the touchscreen */ + mx25_tcq_enable_touch_irq(priv); +} + +static int mx25_tcq_create_event_for_4wire(struct mx25_tcq_priv *priv, + u32 *sample_buf, int samples) +{ + unsigned int x_pos = 0; + unsigned int y_pos = 0; + unsigned int touch_pre = 0; + unsigned int touch_post = 0; + unsigned i; + int ret = 0; + + for (i = 0; i < samples; i++) { + unsigned int index = MX25_ADCQ_FIFO_ID(sample_buf[i]); + unsigned int val = MX25_ADCQ_FIFO_DATA(sample_buf[i]); + + switch (index) { + case 1: + touch_pre = val; + break; + case 2: + x_pos = val; + break; + case 3: + y_pos = val; + break; + case 5: + touch_post = val; + break; + default: + ret = -EINVAL; + break; + } + } + + if (ret == 0 && samples != 0) { + /* + * only if both touch measures are below a treshold, + * the position is valid + */ + if (touch_pre < priv->pen_threshold && + touch_post < priv->pen_threshold) { + /* valid samples, generate a report */ + x_pos /= priv->sample_count; + y_pos /= priv->sample_count; + input_report_abs(priv->idev, ABS_X, x_pos); + input_report_abs(priv->idev, ABS_Y, y_pos); + input_report_key(priv->idev, BTN_TOUCH, + 0xfff - ((touch_pre + touch_post) / 2)); + input_sync(priv->idev); + + /* get next sample */ + mx25_tcq_force_queue_start(priv); + mx25_tcq_enable_fifo_irq(priv); + } else if (touch_pre >= priv->pen_threshold && + touch_post >= priv->pen_threshold) { + /* + * if both samples are invalid, + * generate a release report + */ + input_report_key(priv->idev, BTN_TOUCH, 0); + input_sync(priv->idev); + mx25_tcq_re_enable_touch_detection(priv); + } else { + /* + * if only one of both touch measurements are + * below the threshold, still some bouncing + * happens. Take additional samples in this + * case to be sure + */ + mx25_tcq_force_queue_start(priv); + mx25_tcq_enable_fifo_irq(priv); + } + } + + return ret; +} + +static irqreturn_t mx25_tcq_irq_thread(int irq, void *dev_id) +{ + struct mx25_tcq_priv *priv = (struct mx25_tcq_priv *) dev_id; + u32 sample_buf[TSC_MAX_SAMPLES]; + int samples = 0; + + /* read all samples */ + while (1) { + u32 stats; + + regmap_read(priv->regs, MX25_ADCQ_SR, &stats); + if (stats & MX25_ADCQ_SR_EMPT) + break; + + if (samples < TSC_MAX_SAMPLES) { + regmap_read(priv->regs, MX25_ADCQ_FIFO, + &sample_buf[samples]); + ++samples; + } else { + u32 discarded; + /* discard samples */ + regmap_read(priv->regs, MX25_ADCQ_FIFO, &discarded); + } + } + + mx25_tcq_create_event_for_4wire(priv, sample_buf, samples); + + return IRQ_HANDLED; +} + +static irqreturn_t mx25_tcq_irq(int irq, void *dev_id) +{ + struct mx25_tcq_priv *priv = (struct mx25_tcq_priv *)dev_id; + u32 stat; + int ret = IRQ_HANDLED; + + regmap_read(priv->regs, MX25_ADCQ_SR, &stat); + + if (stat & (MX25_ADCQ_SR_FRR | MX25_ADCQ_SR_FUR | MX25_ADCQ_SR_FOR)) + mx25_tcq_fifo_reset(priv); + + if (stat & MX25_ADCQ_SR_PD) { + mx25_tcq_disable_touch_irq(priv); + mx25_tcq_force_queue_start(priv); + mx25_tcq_enable_fifo_irq(priv); + } + + if (stat & MX25_ADCQ_SR_FDRY) { + mx25_tcq_disable_fifo_irq(priv); + ret = IRQ_WAKE_THREAD; + } + + regmap_update_bits(priv->regs, MX25_ADCQ_SR, MX25_ADCQ_SR_FRR | + MX25_ADCQ_SR_FUR | MX25_ADCQ_SR_FOR | MX25_ADCQ_SR_PD | + MX25_ADCQ_SR_EOQ, + MX25_ADCQ_SR_FRR | + MX25_ADCQ_SR_FUR | MX25_ADCQ_SR_FOR | MX25_ADCQ_SR_PD | + MX25_ADCQ_SR_EOQ); + + return ret; +} + +/* configure the statemachine for a 4-wire touchscreen */ +static int mx25_tcq_init(struct mx25_tcq_priv *priv) +{ + u32 tgcr; + unsigned int ipg_div; + unsigned int adc_period; + unsigned int debounce_cnt; + unsigned int settling_time; + int itemct; + int ret; + + regmap_read(priv->core_regs, MX25_TSC_TGCR, &tgcr); + ipg_div = max_t(unsigned int, 4, MX25_TGCR_GET_ADCCLK(tgcr)); + adc_period = clk_get_rate(priv->clk) / (ipg_div * 2 + 2); + debounce_cnt = DIV_ROUND_UP(priv->pen_debounce, adc_period * 8) - 1; + settling_time = DIV_ROUND_UP(priv->settling_time, adc_period); + + + /* Reset */ + regmap_write(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_QRST | + MX25_ADCQ_CR_FRST); + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_QRST | + MX25_ADCQ_CR_FRST, 0); + + /* up to 128 * 8 ADC clocks are possible */ + if (debounce_cnt > 127) + debounce_cnt = 127; + + ret = imx25_setup_queue_4wire(priv, 0x0, &itemct); + if (ret) + return ret; + + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_LITEMID_MASK | + MX25_ADCQ_CR_WMRK_MASK, + MX25_ADCQ_CR_LITEMID(itemct - 1) | + MX25_ADCQ_CR_WMRK(priv->expected_samples - 1)); + + /* setup debounce count */ + regmap_update_bits(priv->core_regs, MX25_TSC_TGCR, + MX25_TGCR_PDBTIME_MASK, + MX25_TGCR_PDBTIME(debounce_cnt)); + + /* enable debounce */ + regmap_update_bits(priv->core_regs, MX25_TSC_TGCR, MX25_TGCR_PDBEN, + MX25_TGCR_PDBEN); + regmap_update_bits(priv->core_regs, MX25_TSC_TGCR, MX25_TGCR_PDEN, + MX25_TGCR_PDEN); + + /* enable the engine on demand */ + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_QSM_FQS, + MX25_ADCQ_CR_QSM_FQS); + + mx25_tcq_re_enable_touch_detection(priv); + + return 0; +} + +static int mx25_tcq_parse_dt(struct platform_device *pdev, + struct mx25_tcq_priv *priv) +{ + struct device_node *np = pdev->dev.of_node; + u32 wires; + int ret; + + /* Setup defaults */ + priv->pen_threshold = 500; + priv->sample_count = 3; + priv->pen_debounce = 1000000; + priv->settling_time = 250000; + + ret = of_property_read_u32(np, "fsl,wires", &wires); + if (ret) { + dev_err(&pdev->dev, "Failed to find fsl,wires properties\n"); + return ret; + } + + if (wires == 4) { + priv->mode = MX25_TS_4WIRE; + } else { + dev_err(&pdev->dev, "%u-wire mode not supported\n", wires); + return -EINVAL; + } + + /* These are optional, we don't care about the return values */ + of_property_read_u32(np, "fsl,pen-threshold", &priv->pen_threshold); + of_property_read_u32(np, "fsl,settling-time", &priv->settling_time); + of_property_read_u32(np, "fsl,pen-debounce", &priv->pen_debounce); + + return 0; +} + +static int mx25_tcq_probe(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + struct input_dev *idev; + struct mx25_tcq_priv *priv; + struct resource *res; + void __iomem *mem; + int ret; + int irq; + + priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); + if (!priv) + return -ENOMEM; + + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + mem = devm_ioremap_resource(dev, res); + if (!mem) + return -ENOMEM; + + ret = mx25_tcq_parse_dt(pdev, priv); + if (ret) + return ret; + + priv->regs = devm_regmap_init_mmio(dev, mem, &mx25_tcq_regconfig); + if (IS_ERR(priv->regs)) { + dev_err(dev, "Failed to initialize regmap\n"); + return PTR_ERR(priv->regs); + } + + irq = platform_get_irq(pdev, 0); + if (irq <= 0) { + dev_err(dev, "Failed to get IRQ\n"); + return irq; + } + + idev = devm_input_allocate_device(dev); + if (!idev) { + dev_err(dev, "Failed to allocate input device\n"); + return -ENOMEM; + } + + idev->name = mx25_tcq_name; + idev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS); + idev->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH); + input_set_abs_params(idev, ABS_X, 0, 0xfff, 0, 0); + input_set_abs_params(idev, ABS_Y, 0, 0xfff, 0, 0); + + idev->id.bustype = BUS_HOST; + + ret = input_register_device(idev); + if (ret) { + dev_err(dev, "Failed to register input device\n"); + return ret; + } + + priv->idev = idev; + + priv->core_regs = mx25_tsadc_get_regmap(pdev->dev.parent); + priv->clk = mx25_tsadc_get_ipg(pdev->dev.parent); + + ret = clk_prepare_enable(priv->clk); + if (ret) { + dev_err(dev, "Failed to enable ipg clock\n"); + return ret; + } + + ret = devm_request_threaded_irq(dev, irq, mx25_tcq_irq, + mx25_tcq_irq_thread, IRQF_ONESHOT, pdev->name, priv); + if (ret) { + dev_err(dev, "Failed requesting IRQ\n"); + return ret; + } + + ret = mx25_tcq_init(priv); + if (ret) { + dev_err(dev, "Failed to init tcq\n"); + goto error_tcq_init; + } + + platform_set_drvdata(pdev, priv); + + return 0; + +error_tcq_init: + clk_disable_unprepare(priv->clk); + return ret; +} + +static int mx25_tcq_remove(struct platform_device *pdev) +{ + struct mx25_tcq_priv *priv = platform_get_drvdata(pdev); + + clk_disable_unprepare(priv->clk); + + return 0; +} + +static struct platform_driver mx25_tcq_driver = { + .driver = { + .name = "mx25-tcq", + .owner = THIS_MODULE, + .of_match_table = mx25_tcq_ids, + }, + .probe = mx25_tcq_probe, + .remove = mx25_tcq_remove, +}; +module_platform_driver(mx25_tcq_driver); + +MODULE_DESCRIPTION("TS input driver for Freescale mx25"); +MODULE_AUTHOR("Markus Pargmann <mpa@pengutronix.de>"); +MODULE_LICENSE("GPL v2"); -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 76+ messages in thread
* [PATCH v2 2/6] input: touchscreen: imx25 tcq driver @ 2014-06-13 15:21 ` Denis Carikli 0 siblings, 0 replies; 76+ messages in thread From: Denis Carikli @ 2014-06-13 15:21 UTC (permalink / raw) To: linux-arm-kernel From: Markus Pargmann <mpa@pengutronix.de> This is a driver for the imx25 ADC/TSC module. It controls the touchscreen conversion queue and creates a touchscreen input device. The driver currently only supports 4 wire touchscreens. The driver uses a simple conversion queue of precharge, touch detection, X measurement, Y measurement, precharge and another touch detection. This driver uses the regmap from the parent to setup some touch specific settings in the core driver and setup a idle configuration with touch detection. Signed-off-by: Markus Pargmann <mpa@pengutronix.de> Signed-off-by: Denis Carikli <denis@eukrea.com> --- .../bindings/input/touchscreen/fsl-mx25-tcq.txt | 29 + drivers/input/touchscreen/Kconfig | 6 + drivers/input/touchscreen/Makefile | 1 + drivers/input/touchscreen/fsl-imx25-tcq.c | 576 ++++++++++++++++++++ 4 files changed, 612 insertions(+) create mode 100644 Documentation/devicetree/bindings/input/touchscreen/fsl-mx25-tcq.txt create mode 100644 drivers/input/touchscreen/fsl-imx25-tcq.c diff --git a/Documentation/devicetree/bindings/input/touchscreen/fsl-mx25-tcq.txt b/Documentation/devicetree/bindings/input/touchscreen/fsl-mx25-tcq.txt new file mode 100644 index 0000000..4214a99 --- /dev/null +++ b/Documentation/devicetree/bindings/input/touchscreen/fsl-mx25-tcq.txt @@ -0,0 +1,29 @@ +Freescale mx25 TS conversion queue module + +mx25 touchscreen conversion queue module which controls the ADC unit of the +mx25 for attached touchscreens. + +Required properties: + - compatible: Should be "fsl,imx25-tcq". + - reg: Memory range of the device. + - interrupts: Should be the interrupt number associated with this module within + the tscadc unit (<0>). + - interrupt-parent: Should be a phandle to the tscadc unit. + - fsl,wires: Should be '<4>' or '<5>' + +Optional properties: + - fsl,pen-debounce: Pen debounce time. + - fsl,pen-threshold: Pen-down threshold for the touchscreen. + - fsl,settling-time: Settling time in nanoseconds. + +This device includes two conversion queues which can be added as subnodes. +The first queue is for the touchscreen, the second for general purpose ADC. + +Example: + tsc: tcq at 50030400 { + compatible = "fsl,imx25-tcq"; + reg = <0x50030400 0x60>; + interrupt-parent = <&tscadc>; + interrupts = <0>; + fsl,wires = <4>; + }; diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig index a23a94b..a2290b9 100644 --- a/drivers/input/touchscreen/Kconfig +++ b/drivers/input/touchscreen/Kconfig @@ -699,6 +699,12 @@ config TOUCHSCREEN_USB_COMPOSITE To compile this driver as a module, choose M here: the module will be called usbtouchscreen. +config TOUCHSCREEN_MX25 + tristate "Freescale i.MX25 touchscreen input driver" + depends on MFD_MX25_TSADC + help + Enable support for touchscreen connected to your i.MX25. + config TOUCHSCREEN_MC13783 tristate "Freescale MC13783 touchscreen input driver" depends on MFD_MC13XXX diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile index 126479d..537d591 100644 --- a/drivers/input/touchscreen/Makefile +++ b/drivers/input/touchscreen/Makefile @@ -38,6 +38,7 @@ obj-$(CONFIG_TOUCHSCREEN_INEXIO) += inexio.o obj-$(CONFIG_TOUCHSCREEN_INTEL_MID) += intel-mid-touch.o obj-$(CONFIG_TOUCHSCREEN_LPC32XX) += lpc32xx_ts.o obj-$(CONFIG_TOUCHSCREEN_MAX11801) += max11801_ts.o +obj-$(CONFIG_TOUCHSCREEN_MX25) += fsl-imx25-tcq.o obj-$(CONFIG_TOUCHSCREEN_MC13783) += mc13783_ts.o obj-$(CONFIG_TOUCHSCREEN_MCS5000) += mcs5000_ts.o obj-$(CONFIG_TOUCHSCREEN_MIGOR) += migor_ts.o diff --git a/drivers/input/touchscreen/fsl-imx25-tcq.c b/drivers/input/touchscreen/fsl-imx25-tcq.c new file mode 100644 index 0000000..4ce576e --- /dev/null +++ b/drivers/input/touchscreen/fsl-imx25-tcq.c @@ -0,0 +1,576 @@ +/* + * Copyright 2014 Markus Pargmann, Pengutronix <mpa@pengutronix.de> + * Based on driver from 2011: + * Juergen Beisert, Pengutronix <kernel@pengutronix.de> + * + * The code contained herein is licensed under the GNU General Public + * License. You may obtain a copy of the GNU General Public License + * Version 2 or later at the following locations: + * + * http://www.opensource.org/licenses/gpl-license.html + * http://www.gnu.org/copyleft/gpl.html + * + * This is the driver for the imx25 TCQ (Touchscreen Conversion Queue) + * connected to the imx25 ADC. + */ + +#include <linux/clk.h> +#include <linux/interrupt.h> +#include <linux/input.h> +#include <linux/mfd/imx25-tsadc.h> +#include <linux/module.h> +#include <linux/of.h> +#include <linux/platform_device.h> +#include <linux/regmap.h> + +static const char mx25_tcq_name[] = "mx25-tcq"; + +enum mx25_tcq_mode { + MX25_TS_4WIRE, +}; + +struct mx25_tcq_priv { + struct regmap *regs; + struct regmap *core_regs; + struct input_dev *idev; + enum mx25_tcq_mode mode; + unsigned int pen_threshold; + unsigned int sample_count; + unsigned int expected_samples; + unsigned int pen_debounce; + unsigned int settling_time; + struct clk *clk; +}; + +static struct regmap_config mx25_tcq_regconfig = { + .fast_io = true, + .max_register = 0x5c, + .reg_bits = 32, + .val_bits = 32, + .reg_stride = 4, +}; + +static struct of_device_id mx25_tcq_ids[] = { + { .compatible = "fsl,imx25-tcq", }, + { /* Senitel */ } +}; + +#define TSC_4WIRE_PRE_INDEX 0 +#define TSC_4WIRE_X_INDEX 1 +#define TSC_4WIRE_Y_INDEX 2 +#define TSC_4WIRE_POST_INDEX 3 +#define TSC_4WIRE_LEAVE 4 + +#define MX25_TSC_DEF_THRESHOLD 80 +#define TSC_MAX_SAMPLES 16 + + +enum mx25_adc_configurations { + MX25_CFG_PRECHARGE = 0, + MX25_CFG_TOUCH_DETECT, + MX25_CFG_X_MEASUREMENT, + MX25_CFG_Y_MEASUREMENT, +}; + +#define MX25_PRECHARGE_VALUE (\ + MX25_ADCQ_CFG_YPLL_OFF | \ + MX25_ADCQ_CFG_XNUR_OFF | \ + MX25_ADCQ_CFG_XPUL_HIGH | \ + MX25_ADCQ_CFG_REFP_INT | \ + MX25_ADCQ_CFG_IN_XP | \ + MX25_ADCQ_CFG_REFN_NGND2 | \ + MX25_ADCQ_CFG_IGS) + +#define MX25_TOUCH_DETECT_VALUE (\ + MX25_ADCQ_CFG_YNLR | \ + MX25_ADCQ_CFG_YPLL_OFF | \ + MX25_ADCQ_CFG_XNUR_OFF | \ + MX25_ADCQ_CFG_XPUL_OFF | \ + MX25_ADCQ_CFG_REFP_INT | \ + MX25_ADCQ_CFG_IN_XP | \ + MX25_ADCQ_CFG_REFN_NGND2 | \ + MX25_ADCQ_CFG_PENIACK) + +static void imx25_setup_queue_cfgs(struct mx25_tcq_priv *priv, + unsigned int settling_time) +{ + u32 precharge_cfg = + MX25_PRECHARGE_VALUE | + MX25_ADCQ_CFG_SETTLING_TIME(settling_time); + u32 touch_detect_cfg = + MX25_TOUCH_DETECT_VALUE | + MX25_ADCQ_CFG_NOS(1) | + MX25_ADCQ_CFG_SETTLING_TIME(settling_time); + + regmap_write(priv->core_regs, MX25_TSC_TICR, precharge_cfg); + + /* PRECHARGE */ + regmap_write(priv->regs, MX25_ADCQ_CFG(MX25_CFG_PRECHARGE), + precharge_cfg); + + /* TOUCH_DETECT */ + regmap_write(priv->regs, MX25_ADCQ_CFG(MX25_CFG_TOUCH_DETECT), + touch_detect_cfg); + + /* X Measurement */ + regmap_write(priv->regs, MX25_ADCQ_CFG(MX25_CFG_X_MEASUREMENT), + MX25_ADCQ_CFG_YPLL_OFF | + MX25_ADCQ_CFG_XNUR_LOW | + MX25_ADCQ_CFG_XPUL_HIGH | + MX25_ADCQ_CFG_REFP_XP | + MX25_ADCQ_CFG_IN_YP | + MX25_ADCQ_CFG_REFN_XN | + MX25_ADCQ_CFG_NOS(priv->sample_count) | + MX25_ADCQ_CFG_SETTLING_TIME(settling_time)); + + /* Y Measurement */ + regmap_write(priv->regs, MX25_ADCQ_CFG(MX25_CFG_Y_MEASUREMENT), + MX25_ADCQ_CFG_YNLR | + MX25_ADCQ_CFG_YPLL_HIGH | + MX25_ADCQ_CFG_XNUR_OFF | + MX25_ADCQ_CFG_XPUL_OFF | + MX25_ADCQ_CFG_REFP_YP | + MX25_ADCQ_CFG_IN_XP | + MX25_ADCQ_CFG_REFN_YN | + MX25_ADCQ_CFG_NOS(priv->sample_count) | + MX25_ADCQ_CFG_SETTLING_TIME(settling_time)); + + /* Enable the touch detection right now */ + regmap_write(priv->core_regs, MX25_TSC_TICR, touch_detect_cfg | + MX25_ADCQ_CFG_IGS); +} + +static int imx25_setup_queue_4wire(struct mx25_tcq_priv *priv, + unsigned settling_time, int *items) +{ + imx25_setup_queue_cfgs(priv, settling_time); + + /* Setup the conversion queue */ + regmap_write(priv->regs, MX25_ADCQ_ITEM_7_0, + MX25_ADCQ_ITEM(0, MX25_CFG_PRECHARGE) | + MX25_ADCQ_ITEM(1, MX25_CFG_TOUCH_DETECT) | + MX25_ADCQ_ITEM(2, MX25_CFG_X_MEASUREMENT) | + MX25_ADCQ_ITEM(3, MX25_CFG_Y_MEASUREMENT) | + MX25_ADCQ_ITEM(4, MX25_CFG_PRECHARGE) | + MX25_ADCQ_ITEM(5, MX25_CFG_TOUCH_DETECT)); + + /* We measure X/Y with 'sample_count' number of samples and execute a + * touch detection twice, with 1 sample each */ + priv->expected_samples = priv->sample_count * 2 + 2; + *items = 6; + + return 0; +} + +static void mx25_tcq_disable_touch_irq(struct mx25_tcq_priv *priv) +{ + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_PDMSK, + MX25_ADCQ_CR_PDMSK); +} + +static void mx25_tcq_enable_touch_irq(struct mx25_tcq_priv *priv) +{ + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_PDMSK, 0); +} + +static void mx25_tcq_disable_fifo_irq(struct mx25_tcq_priv *priv) +{ + regmap_update_bits(priv->regs, MX25_ADCQ_MR, MX25_ADCQ_MR_FDRY_IRQ, + MX25_ADCQ_MR_FDRY_IRQ); +} + +static void mx25_tcq_enable_fifo_irq(struct mx25_tcq_priv *priv) +{ + regmap_update_bits(priv->regs, MX25_ADCQ_MR, MX25_ADCQ_MR_FDRY_IRQ, 0); +} + +static void mx25_tcq_force_queue_start(struct mx25_tcq_priv *priv) +{ + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FQS, + MX25_ADCQ_CR_FQS); + + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FQS, 0); +} + +static void mx25_tcq_force_queue_stop(struct mx25_tcq_priv *priv) +{ + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FQS, 0); +} + +static void mx25_tcq_fifo_reset(struct mx25_tcq_priv *priv) +{ + u32 tcqcr; + + regmap_read(priv->regs, MX25_ADCQ_CR, &tcqcr); + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FRST, + MX25_ADCQ_CR_FRST); + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FRST, + 0); + regmap_write(priv->regs, MX25_ADCQ_CR, tcqcr); +} + +static void mx25_tcq_re_enable_touch_detection(struct mx25_tcq_priv *priv) +{ + /* stop the queue from looping */ + mx25_tcq_force_queue_stop(priv); + + /* for a clean touch detection, preload the X plane */ + regmap_write(priv->core_regs, MX25_TSC_TICR, MX25_PRECHARGE_VALUE); + + /* waste some time now to pre-load the X plate to high voltage */ + mx25_tcq_fifo_reset(priv); + + /* re-enable the detection right now */ + regmap_write(priv->core_regs, MX25_TSC_TICR, MX25_TOUCH_DETECT_VALUE | + MX25_ADCQ_CFG_IGS); + + regmap_update_bits(priv->regs, MX25_ADCQ_SR, MX25_ADCQ_SR_PD, + MX25_ADCQ_SR_PD); + + /* enable the pen down event to be a source for the interrupt */ + regmap_update_bits(priv->regs, MX25_ADCQ_MR, MX25_ADCQ_MR_PD_IRQ, 0); + + /* lets fire the next IRQ if someone touches the touchscreen */ + mx25_tcq_enable_touch_irq(priv); +} + +static int mx25_tcq_create_event_for_4wire(struct mx25_tcq_priv *priv, + u32 *sample_buf, int samples) +{ + unsigned int x_pos = 0; + unsigned int y_pos = 0; + unsigned int touch_pre = 0; + unsigned int touch_post = 0; + unsigned i; + int ret = 0; + + for (i = 0; i < samples; i++) { + unsigned int index = MX25_ADCQ_FIFO_ID(sample_buf[i]); + unsigned int val = MX25_ADCQ_FIFO_DATA(sample_buf[i]); + + switch (index) { + case 1: + touch_pre = val; + break; + case 2: + x_pos = val; + break; + case 3: + y_pos = val; + break; + case 5: + touch_post = val; + break; + default: + ret = -EINVAL; + break; + } + } + + if (ret == 0 && samples != 0) { + /* + * only if both touch measures are below a treshold, + * the position is valid + */ + if (touch_pre < priv->pen_threshold && + touch_post < priv->pen_threshold) { + /* valid samples, generate a report */ + x_pos /= priv->sample_count; + y_pos /= priv->sample_count; + input_report_abs(priv->idev, ABS_X, x_pos); + input_report_abs(priv->idev, ABS_Y, y_pos); + input_report_key(priv->idev, BTN_TOUCH, + 0xfff - ((touch_pre + touch_post) / 2)); + input_sync(priv->idev); + + /* get next sample */ + mx25_tcq_force_queue_start(priv); + mx25_tcq_enable_fifo_irq(priv); + } else if (touch_pre >= priv->pen_threshold && + touch_post >= priv->pen_threshold) { + /* + * if both samples are invalid, + * generate a release report + */ + input_report_key(priv->idev, BTN_TOUCH, 0); + input_sync(priv->idev); + mx25_tcq_re_enable_touch_detection(priv); + } else { + /* + * if only one of both touch measurements are + * below the threshold, still some bouncing + * happens. Take additional samples in this + * case to be sure + */ + mx25_tcq_force_queue_start(priv); + mx25_tcq_enable_fifo_irq(priv); + } + } + + return ret; +} + +static irqreturn_t mx25_tcq_irq_thread(int irq, void *dev_id) +{ + struct mx25_tcq_priv *priv = (struct mx25_tcq_priv *) dev_id; + u32 sample_buf[TSC_MAX_SAMPLES]; + int samples = 0; + + /* read all samples */ + while (1) { + u32 stats; + + regmap_read(priv->regs, MX25_ADCQ_SR, &stats); + if (stats & MX25_ADCQ_SR_EMPT) + break; + + if (samples < TSC_MAX_SAMPLES) { + regmap_read(priv->regs, MX25_ADCQ_FIFO, + &sample_buf[samples]); + ++samples; + } else { + u32 discarded; + /* discard samples */ + regmap_read(priv->regs, MX25_ADCQ_FIFO, &discarded); + } + } + + mx25_tcq_create_event_for_4wire(priv, sample_buf, samples); + + return IRQ_HANDLED; +} + +static irqreturn_t mx25_tcq_irq(int irq, void *dev_id) +{ + struct mx25_tcq_priv *priv = (struct mx25_tcq_priv *)dev_id; + u32 stat; + int ret = IRQ_HANDLED; + + regmap_read(priv->regs, MX25_ADCQ_SR, &stat); + + if (stat & (MX25_ADCQ_SR_FRR | MX25_ADCQ_SR_FUR | MX25_ADCQ_SR_FOR)) + mx25_tcq_fifo_reset(priv); + + if (stat & MX25_ADCQ_SR_PD) { + mx25_tcq_disable_touch_irq(priv); + mx25_tcq_force_queue_start(priv); + mx25_tcq_enable_fifo_irq(priv); + } + + if (stat & MX25_ADCQ_SR_FDRY) { + mx25_tcq_disable_fifo_irq(priv); + ret = IRQ_WAKE_THREAD; + } + + regmap_update_bits(priv->regs, MX25_ADCQ_SR, MX25_ADCQ_SR_FRR | + MX25_ADCQ_SR_FUR | MX25_ADCQ_SR_FOR | MX25_ADCQ_SR_PD | + MX25_ADCQ_SR_EOQ, + MX25_ADCQ_SR_FRR | + MX25_ADCQ_SR_FUR | MX25_ADCQ_SR_FOR | MX25_ADCQ_SR_PD | + MX25_ADCQ_SR_EOQ); + + return ret; +} + +/* configure the statemachine for a 4-wire touchscreen */ +static int mx25_tcq_init(struct mx25_tcq_priv *priv) +{ + u32 tgcr; + unsigned int ipg_div; + unsigned int adc_period; + unsigned int debounce_cnt; + unsigned int settling_time; + int itemct; + int ret; + + regmap_read(priv->core_regs, MX25_TSC_TGCR, &tgcr); + ipg_div = max_t(unsigned int, 4, MX25_TGCR_GET_ADCCLK(tgcr)); + adc_period = clk_get_rate(priv->clk) / (ipg_div * 2 + 2); + debounce_cnt = DIV_ROUND_UP(priv->pen_debounce, adc_period * 8) - 1; + settling_time = DIV_ROUND_UP(priv->settling_time, adc_period); + + + /* Reset */ + regmap_write(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_QRST | + MX25_ADCQ_CR_FRST); + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_QRST | + MX25_ADCQ_CR_FRST, 0); + + /* up to 128 * 8 ADC clocks are possible */ + if (debounce_cnt > 127) + debounce_cnt = 127; + + ret = imx25_setup_queue_4wire(priv, 0x0, &itemct); + if (ret) + return ret; + + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_LITEMID_MASK | + MX25_ADCQ_CR_WMRK_MASK, + MX25_ADCQ_CR_LITEMID(itemct - 1) | + MX25_ADCQ_CR_WMRK(priv->expected_samples - 1)); + + /* setup debounce count */ + regmap_update_bits(priv->core_regs, MX25_TSC_TGCR, + MX25_TGCR_PDBTIME_MASK, + MX25_TGCR_PDBTIME(debounce_cnt)); + + /* enable debounce */ + regmap_update_bits(priv->core_regs, MX25_TSC_TGCR, MX25_TGCR_PDBEN, + MX25_TGCR_PDBEN); + regmap_update_bits(priv->core_regs, MX25_TSC_TGCR, MX25_TGCR_PDEN, + MX25_TGCR_PDEN); + + /* enable the engine on demand */ + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_QSM_FQS, + MX25_ADCQ_CR_QSM_FQS); + + mx25_tcq_re_enable_touch_detection(priv); + + return 0; +} + +static int mx25_tcq_parse_dt(struct platform_device *pdev, + struct mx25_tcq_priv *priv) +{ + struct device_node *np = pdev->dev.of_node; + u32 wires; + int ret; + + /* Setup defaults */ + priv->pen_threshold = 500; + priv->sample_count = 3; + priv->pen_debounce = 1000000; + priv->settling_time = 250000; + + ret = of_property_read_u32(np, "fsl,wires", &wires); + if (ret) { + dev_err(&pdev->dev, "Failed to find fsl,wires properties\n"); + return ret; + } + + if (wires == 4) { + priv->mode = MX25_TS_4WIRE; + } else { + dev_err(&pdev->dev, "%u-wire mode not supported\n", wires); + return -EINVAL; + } + + /* These are optional, we don't care about the return values */ + of_property_read_u32(np, "fsl,pen-threshold", &priv->pen_threshold); + of_property_read_u32(np, "fsl,settling-time", &priv->settling_time); + of_property_read_u32(np, "fsl,pen-debounce", &priv->pen_debounce); + + return 0; +} + +static int mx25_tcq_probe(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + struct input_dev *idev; + struct mx25_tcq_priv *priv; + struct resource *res; + void __iomem *mem; + int ret; + int irq; + + priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); + if (!priv) + return -ENOMEM; + + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + mem = devm_ioremap_resource(dev, res); + if (!mem) + return -ENOMEM; + + ret = mx25_tcq_parse_dt(pdev, priv); + if (ret) + return ret; + + priv->regs = devm_regmap_init_mmio(dev, mem, &mx25_tcq_regconfig); + if (IS_ERR(priv->regs)) { + dev_err(dev, "Failed to initialize regmap\n"); + return PTR_ERR(priv->regs); + } + + irq = platform_get_irq(pdev, 0); + if (irq <= 0) { + dev_err(dev, "Failed to get IRQ\n"); + return irq; + } + + idev = devm_input_allocate_device(dev); + if (!idev) { + dev_err(dev, "Failed to allocate input device\n"); + return -ENOMEM; + } + + idev->name = mx25_tcq_name; + idev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS); + idev->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH); + input_set_abs_params(idev, ABS_X, 0, 0xfff, 0, 0); + input_set_abs_params(idev, ABS_Y, 0, 0xfff, 0, 0); + + idev->id.bustype = BUS_HOST; + + ret = input_register_device(idev); + if (ret) { + dev_err(dev, "Failed to register input device\n"); + return ret; + } + + priv->idev = idev; + + priv->core_regs = mx25_tsadc_get_regmap(pdev->dev.parent); + priv->clk = mx25_tsadc_get_ipg(pdev->dev.parent); + + ret = clk_prepare_enable(priv->clk); + if (ret) { + dev_err(dev, "Failed to enable ipg clock\n"); + return ret; + } + + ret = devm_request_threaded_irq(dev, irq, mx25_tcq_irq, + mx25_tcq_irq_thread, IRQF_ONESHOT, pdev->name, priv); + if (ret) { + dev_err(dev, "Failed requesting IRQ\n"); + return ret; + } + + ret = mx25_tcq_init(priv); + if (ret) { + dev_err(dev, "Failed to init tcq\n"); + goto error_tcq_init; + } + + platform_set_drvdata(pdev, priv); + + return 0; + +error_tcq_init: + clk_disable_unprepare(priv->clk); + return ret; +} + +static int mx25_tcq_remove(struct platform_device *pdev) +{ + struct mx25_tcq_priv *priv = platform_get_drvdata(pdev); + + clk_disable_unprepare(priv->clk); + + return 0; +} + +static struct platform_driver mx25_tcq_driver = { + .driver = { + .name = "mx25-tcq", + .owner = THIS_MODULE, + .of_match_table = mx25_tcq_ids, + }, + .probe = mx25_tcq_probe, + .remove = mx25_tcq_remove, +}; +module_platform_driver(mx25_tcq_driver); + +MODULE_DESCRIPTION("TS input driver for Freescale mx25"); +MODULE_AUTHOR("Markus Pargmann <mpa@pengutronix.de>"); +MODULE_LICENSE("GPL v2"); -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 76+ messages in thread
[parent not found: <1402672899-6995-3-git-send-email-denis-fO0SIAKYzcbQT0dZR+AlfA@public.gmane.org>]
* Re: [PATCH v2 2/6] input: touchscreen: imx25 tcq driver 2014-06-13 15:21 ` Denis Carikli (?) @ 2014-06-15 7:27 ` Dmitry Torokhov -1 siblings, 0 replies; 76+ messages in thread From: Dmitry Torokhov @ 2014-06-15 7:27 UTC (permalink / raw) To: Denis Carikli Cc: Shawn Guo, Samuel Ortiz, Jonathan Cameron, Eric Bénard, Sascha Hauer, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, Lee Jones, linux-input-u79uwXL29TY76Z2rM5mHXA, linux-iio-u79uwXL29TY76Z2rM5mHXA, Fabio Estevam, Lars-Peter Clausen, Markus Pargmann Hi Denis, On Fri, Jun 13, 2014 at 05:21:35PM +0200, Denis Carikli wrote: > + > + if (ret == 0 && samples != 0) { > + /* > + * only if both touch measures are below a treshold, > + * the position is valid > + */ > + if (touch_pre < priv->pen_threshold && > + touch_post < priv->pen_threshold) { > + /* valid samples, generate a report */ > + x_pos /= priv->sample_count; > + y_pos /= priv->sample_count; > + input_report_abs(priv->idev, ABS_X, x_pos); > + input_report_abs(priv->idev, ABS_Y, y_pos); > + input_report_key(priv->idev, BTN_TOUCH, > + 0xfff - ((touch_pre + touch_post) / 2)); I still do not understand this calculation. input_report_key() converts the last argument to a boolean, so the only time it would report BTN_TOUCH UP here if (touch_pre + touch_post) / 2 is exactly 0xfff. Given that default threshold is 500 this won't ever happen. Why isn't it simply: input_report_key(priv->idev, BTN_TOUCH, 1); ? ... > + > +static irqreturn_t mx25_tcq_irq_thread(int irq, void *dev_id) > +{ > + struct mx25_tcq_priv *priv = (struct mx25_tcq_priv *) dev_id; No need to cast. > + u32 sample_buf[TSC_MAX_SAMPLES]; > + int samples = 0; > + > + /* read all samples */ > + while (1) { > + u32 stats; > + > + regmap_read(priv->regs, MX25_ADCQ_SR, &stats); > + if (stats & MX25_ADCQ_SR_EMPT) > + break; > + > + if (samples < TSC_MAX_SAMPLES) { > + regmap_read(priv->regs, MX25_ADCQ_FIFO, > + &sample_buf[samples]); > + ++samples; > + } else { > + u32 discarded; > + /* discard samples */ > + regmap_read(priv->regs, MX25_ADCQ_FIFO, &discarded); > + } > + } > + > + mx25_tcq_create_event_for_4wire(priv, sample_buf, samples); > + > + return IRQ_HANDLED; > +} > + > +static irqreturn_t mx25_tcq_irq(int irq, void *dev_id) > +{ > + struct mx25_tcq_priv *priv = (struct mx25_tcq_priv *)dev_id; Same here. > + u32 stat; > + int ret = IRQ_HANDLED; > + > + regmap_read(priv->regs, MX25_ADCQ_SR, &stat); > + > + if (stat & (MX25_ADCQ_SR_FRR | MX25_ADCQ_SR_FUR | MX25_ADCQ_SR_FOR)) > + mx25_tcq_fifo_reset(priv); > + > + if (stat & MX25_ADCQ_SR_PD) { > + mx25_tcq_disable_touch_irq(priv); > + mx25_tcq_force_queue_start(priv); > + mx25_tcq_enable_fifo_irq(priv); > + } > + > + if (stat & MX25_ADCQ_SR_FDRY) { > + mx25_tcq_disable_fifo_irq(priv); > + ret = IRQ_WAKE_THREAD; > + } > + > + regmap_update_bits(priv->regs, MX25_ADCQ_SR, MX25_ADCQ_SR_FRR | > + MX25_ADCQ_SR_FUR | MX25_ADCQ_SR_FOR | MX25_ADCQ_SR_PD | > + MX25_ADCQ_SR_EOQ, > + MX25_ADCQ_SR_FRR | > + MX25_ADCQ_SR_FUR | MX25_ADCQ_SR_FOR | MX25_ADCQ_SR_PD | > + MX25_ADCQ_SR_EOQ); > + > + return ret; > +} > + > +/* configure the statemachine for a 4-wire touchscreen */ > +static int mx25_tcq_init(struct mx25_tcq_priv *priv) > +{ > + u32 tgcr; > + unsigned int ipg_div; > + unsigned int adc_period; > + unsigned int debounce_cnt; > + unsigned int settling_time; > + int itemct; > + int ret; > + > + regmap_read(priv->core_regs, MX25_TSC_TGCR, &tgcr); > + ipg_div = max_t(unsigned int, 4, MX25_TGCR_GET_ADCCLK(tgcr)); > + adc_period = clk_get_rate(priv->clk) / (ipg_div * 2 + 2); > + debounce_cnt = DIV_ROUND_UP(priv->pen_debounce, adc_period * 8) - 1; > + settling_time = DIV_ROUND_UP(priv->settling_time, adc_period); > + > + > + /* Reset */ > + regmap_write(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_QRST | > + MX25_ADCQ_CR_FRST); > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_QRST | > + MX25_ADCQ_CR_FRST, 0); > + > + /* up to 128 * 8 ADC clocks are possible */ > + if (debounce_cnt > 127) > + debounce_cnt = 127; > + > + ret = imx25_setup_queue_4wire(priv, 0x0, &itemct); > + if (ret) > + return ret; > + > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_LITEMID_MASK | > + MX25_ADCQ_CR_WMRK_MASK, > + MX25_ADCQ_CR_LITEMID(itemct - 1) | > + MX25_ADCQ_CR_WMRK(priv->expected_samples - 1)); > + > + /* setup debounce count */ > + regmap_update_bits(priv->core_regs, MX25_TSC_TGCR, > + MX25_TGCR_PDBTIME_MASK, > + MX25_TGCR_PDBTIME(debounce_cnt)); > + > + /* enable debounce */ > + regmap_update_bits(priv->core_regs, MX25_TSC_TGCR, MX25_TGCR_PDBEN, > + MX25_TGCR_PDBEN); > + regmap_update_bits(priv->core_regs, MX25_TSC_TGCR, MX25_TGCR_PDEN, > + MX25_TGCR_PDEN); > + > + /* enable the engine on demand */ > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_QSM_FQS, > + MX25_ADCQ_CR_QSM_FQS); > + > + mx25_tcq_re_enable_touch_detection(priv); > + > + return 0; > +} > + > +static int mx25_tcq_parse_dt(struct platform_device *pdev, > + struct mx25_tcq_priv *priv) > +{ > + struct device_node *np = pdev->dev.of_node; > + u32 wires; > + int ret; > + > + /* Setup defaults */ > + priv->pen_threshold = 500; > + priv->sample_count = 3; > + priv->pen_debounce = 1000000; > + priv->settling_time = 250000; > + > + ret = of_property_read_u32(np, "fsl,wires", &wires); > + if (ret) { > + dev_err(&pdev->dev, "Failed to find fsl,wires properties\n"); > + return ret; > + } > + > + if (wires == 4) { > + priv->mode = MX25_TS_4WIRE; > + } else { > + dev_err(&pdev->dev, "%u-wire mode not supported\n", wires); > + return -EINVAL; > + } > + > + /* These are optional, we don't care about the return values */ > + of_property_read_u32(np, "fsl,pen-threshold", &priv->pen_threshold); > + of_property_read_u32(np, "fsl,settling-time", &priv->settling_time); > + of_property_read_u32(np, "fsl,pen-debounce", &priv->pen_debounce); > + > + return 0; > +} > + > +static int mx25_tcq_probe(struct platform_device *pdev) > +{ > + struct device *dev = &pdev->dev; > + struct input_dev *idev; > + struct mx25_tcq_priv *priv; > + struct resource *res; > + void __iomem *mem; > + int ret; > + int irq; > + > + priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); > + if (!priv) > + return -ENOMEM; > + > + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > + mem = devm_ioremap_resource(dev, res); > + if (!mem) > + return -ENOMEM; > + > + ret = mx25_tcq_parse_dt(pdev, priv); > + if (ret) > + return ret; > + > + priv->regs = devm_regmap_init_mmio(dev, mem, &mx25_tcq_regconfig); > + if (IS_ERR(priv->regs)) { > + dev_err(dev, "Failed to initialize regmap\n"); > + return PTR_ERR(priv->regs); > + } > + > + irq = platform_get_irq(pdev, 0); > + if (irq <= 0) { > + dev_err(dev, "Failed to get IRQ\n"); > + return irq; > + } > + > + idev = devm_input_allocate_device(dev); > + if (!idev) { > + dev_err(dev, "Failed to allocate input device\n"); > + return -ENOMEM; > + } > + > + idev->name = mx25_tcq_name; > + idev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS); > + idev->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH); > + input_set_abs_params(idev, ABS_X, 0, 0xfff, 0, 0); > + input_set_abs_params(idev, ABS_Y, 0, 0xfff, 0, 0); > + > + idev->id.bustype = BUS_HOST; > + > + ret = input_register_device(idev); > + if (ret) { > + dev_err(dev, "Failed to register input device\n"); > + return ret; > + } > + > + priv->idev = idev; > + > + priv->core_regs = mx25_tsadc_get_regmap(pdev->dev.parent); > + priv->clk = mx25_tsadc_get_ipg(pdev->dev.parent); > + > + ret = clk_prepare_enable(priv->clk); > + if (ret) { > + dev_err(dev, "Failed to enable ipg clock\n"); > + return ret; > + } > + > + ret = devm_request_threaded_irq(dev, irq, mx25_tcq_irq, > + mx25_tcq_irq_thread, IRQF_ONESHOT, pdev->name, priv); > + if (ret) { > + dev_err(dev, "Failed requesting IRQ\n"); You are leaving clock enabled here. > + return ret; > + } > + > + ret = mx25_tcq_init(priv); > + if (ret) { > + dev_err(dev, "Failed to init tcq\n"); > + goto error_tcq_init; > + } > + > + platform_set_drvdata(pdev, priv); > + > + return 0; > + > +error_tcq_init: > + clk_disable_unprepare(priv->clk); > + return ret; > +} > + > +static int mx25_tcq_remove(struct platform_device *pdev) > +{ > + struct mx25_tcq_priv *priv = platform_get_drvdata(pdev); > + > + clk_disable_unprepare(priv->clk); > + > + return 0; > +} > + > +static struct platform_driver mx25_tcq_driver = { > + .driver = { > + .name = "mx25-tcq", > + .owner = THIS_MODULE, > + .of_match_table = mx25_tcq_ids, > + }, > + .probe = mx25_tcq_probe, > + .remove = mx25_tcq_remove, > +}; > +module_platform_driver(mx25_tcq_driver); > + > +MODULE_DESCRIPTION("TS input driver for Freescale mx25"); > +MODULE_AUTHOR("Markus Pargmann <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>"); > +MODULE_LICENSE("GPL v2"); > -- > 1.7.9.5 > Thanks. -- Dmitry ^ permalink raw reply [flat|nested] 76+ messages in thread
* [PATCH v2 2/6] input: touchscreen: imx25 tcq driver @ 2014-06-15 7:27 ` Dmitry Torokhov 0 siblings, 0 replies; 76+ messages in thread From: Dmitry Torokhov @ 2014-06-15 7:27 UTC (permalink / raw) To: linux-arm-kernel Hi Denis, On Fri, Jun 13, 2014 at 05:21:35PM +0200, Denis Carikli wrote: > + > + if (ret == 0 && samples != 0) { > + /* > + * only if both touch measures are below a treshold, > + * the position is valid > + */ > + if (touch_pre < priv->pen_threshold && > + touch_post < priv->pen_threshold) { > + /* valid samples, generate a report */ > + x_pos /= priv->sample_count; > + y_pos /= priv->sample_count; > + input_report_abs(priv->idev, ABS_X, x_pos); > + input_report_abs(priv->idev, ABS_Y, y_pos); > + input_report_key(priv->idev, BTN_TOUCH, > + 0xfff - ((touch_pre + touch_post) / 2)); I still do not understand this calculation. input_report_key() converts the last argument to a boolean, so the only time it would report BTN_TOUCH UP here if (touch_pre + touch_post) / 2 is exactly 0xfff. Given that default threshold is 500 this won't ever happen. Why isn't it simply: input_report_key(priv->idev, BTN_TOUCH, 1); ? ... > + > +static irqreturn_t mx25_tcq_irq_thread(int irq, void *dev_id) > +{ > + struct mx25_tcq_priv *priv = (struct mx25_tcq_priv *) dev_id; No need to cast. > + u32 sample_buf[TSC_MAX_SAMPLES]; > + int samples = 0; > + > + /* read all samples */ > + while (1) { > + u32 stats; > + > + regmap_read(priv->regs, MX25_ADCQ_SR, &stats); > + if (stats & MX25_ADCQ_SR_EMPT) > + break; > + > + if (samples < TSC_MAX_SAMPLES) { > + regmap_read(priv->regs, MX25_ADCQ_FIFO, > + &sample_buf[samples]); > + ++samples; > + } else { > + u32 discarded; > + /* discard samples */ > + regmap_read(priv->regs, MX25_ADCQ_FIFO, &discarded); > + } > + } > + > + mx25_tcq_create_event_for_4wire(priv, sample_buf, samples); > + > + return IRQ_HANDLED; > +} > + > +static irqreturn_t mx25_tcq_irq(int irq, void *dev_id) > +{ > + struct mx25_tcq_priv *priv = (struct mx25_tcq_priv *)dev_id; Same here. > + u32 stat; > + int ret = IRQ_HANDLED; > + > + regmap_read(priv->regs, MX25_ADCQ_SR, &stat); > + > + if (stat & (MX25_ADCQ_SR_FRR | MX25_ADCQ_SR_FUR | MX25_ADCQ_SR_FOR)) > + mx25_tcq_fifo_reset(priv); > + > + if (stat & MX25_ADCQ_SR_PD) { > + mx25_tcq_disable_touch_irq(priv); > + mx25_tcq_force_queue_start(priv); > + mx25_tcq_enable_fifo_irq(priv); > + } > + > + if (stat & MX25_ADCQ_SR_FDRY) { > + mx25_tcq_disable_fifo_irq(priv); > + ret = IRQ_WAKE_THREAD; > + } > + > + regmap_update_bits(priv->regs, MX25_ADCQ_SR, MX25_ADCQ_SR_FRR | > + MX25_ADCQ_SR_FUR | MX25_ADCQ_SR_FOR | MX25_ADCQ_SR_PD | > + MX25_ADCQ_SR_EOQ, > + MX25_ADCQ_SR_FRR | > + MX25_ADCQ_SR_FUR | MX25_ADCQ_SR_FOR | MX25_ADCQ_SR_PD | > + MX25_ADCQ_SR_EOQ); > + > + return ret; > +} > + > +/* configure the statemachine for a 4-wire touchscreen */ > +static int mx25_tcq_init(struct mx25_tcq_priv *priv) > +{ > + u32 tgcr; > + unsigned int ipg_div; > + unsigned int adc_period; > + unsigned int debounce_cnt; > + unsigned int settling_time; > + int itemct; > + int ret; > + > + regmap_read(priv->core_regs, MX25_TSC_TGCR, &tgcr); > + ipg_div = max_t(unsigned int, 4, MX25_TGCR_GET_ADCCLK(tgcr)); > + adc_period = clk_get_rate(priv->clk) / (ipg_div * 2 + 2); > + debounce_cnt = DIV_ROUND_UP(priv->pen_debounce, adc_period * 8) - 1; > + settling_time = DIV_ROUND_UP(priv->settling_time, adc_period); > + > + > + /* Reset */ > + regmap_write(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_QRST | > + MX25_ADCQ_CR_FRST); > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_QRST | > + MX25_ADCQ_CR_FRST, 0); > + > + /* up to 128 * 8 ADC clocks are possible */ > + if (debounce_cnt > 127) > + debounce_cnt = 127; > + > + ret = imx25_setup_queue_4wire(priv, 0x0, &itemct); > + if (ret) > + return ret; > + > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_LITEMID_MASK | > + MX25_ADCQ_CR_WMRK_MASK, > + MX25_ADCQ_CR_LITEMID(itemct - 1) | > + MX25_ADCQ_CR_WMRK(priv->expected_samples - 1)); > + > + /* setup debounce count */ > + regmap_update_bits(priv->core_regs, MX25_TSC_TGCR, > + MX25_TGCR_PDBTIME_MASK, > + MX25_TGCR_PDBTIME(debounce_cnt)); > + > + /* enable debounce */ > + regmap_update_bits(priv->core_regs, MX25_TSC_TGCR, MX25_TGCR_PDBEN, > + MX25_TGCR_PDBEN); > + regmap_update_bits(priv->core_regs, MX25_TSC_TGCR, MX25_TGCR_PDEN, > + MX25_TGCR_PDEN); > + > + /* enable the engine on demand */ > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_QSM_FQS, > + MX25_ADCQ_CR_QSM_FQS); > + > + mx25_tcq_re_enable_touch_detection(priv); > + > + return 0; > +} > + > +static int mx25_tcq_parse_dt(struct platform_device *pdev, > + struct mx25_tcq_priv *priv) > +{ > + struct device_node *np = pdev->dev.of_node; > + u32 wires; > + int ret; > + > + /* Setup defaults */ > + priv->pen_threshold = 500; > + priv->sample_count = 3; > + priv->pen_debounce = 1000000; > + priv->settling_time = 250000; > + > + ret = of_property_read_u32(np, "fsl,wires", &wires); > + if (ret) { > + dev_err(&pdev->dev, "Failed to find fsl,wires properties\n"); > + return ret; > + } > + > + if (wires == 4) { > + priv->mode = MX25_TS_4WIRE; > + } else { > + dev_err(&pdev->dev, "%u-wire mode not supported\n", wires); > + return -EINVAL; > + } > + > + /* These are optional, we don't care about the return values */ > + of_property_read_u32(np, "fsl,pen-threshold", &priv->pen_threshold); > + of_property_read_u32(np, "fsl,settling-time", &priv->settling_time); > + of_property_read_u32(np, "fsl,pen-debounce", &priv->pen_debounce); > + > + return 0; > +} > + > +static int mx25_tcq_probe(struct platform_device *pdev) > +{ > + struct device *dev = &pdev->dev; > + struct input_dev *idev; > + struct mx25_tcq_priv *priv; > + struct resource *res; > + void __iomem *mem; > + int ret; > + int irq; > + > + priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); > + if (!priv) > + return -ENOMEM; > + > + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > + mem = devm_ioremap_resource(dev, res); > + if (!mem) > + return -ENOMEM; > + > + ret = mx25_tcq_parse_dt(pdev, priv); > + if (ret) > + return ret; > + > + priv->regs = devm_regmap_init_mmio(dev, mem, &mx25_tcq_regconfig); > + if (IS_ERR(priv->regs)) { > + dev_err(dev, "Failed to initialize regmap\n"); > + return PTR_ERR(priv->regs); > + } > + > + irq = platform_get_irq(pdev, 0); > + if (irq <= 0) { > + dev_err(dev, "Failed to get IRQ\n"); > + return irq; > + } > + > + idev = devm_input_allocate_device(dev); > + if (!idev) { > + dev_err(dev, "Failed to allocate input device\n"); > + return -ENOMEM; > + } > + > + idev->name = mx25_tcq_name; > + idev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS); > + idev->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH); > + input_set_abs_params(idev, ABS_X, 0, 0xfff, 0, 0); > + input_set_abs_params(idev, ABS_Y, 0, 0xfff, 0, 0); > + > + idev->id.bustype = BUS_HOST; > + > + ret = input_register_device(idev); > + if (ret) { > + dev_err(dev, "Failed to register input device\n"); > + return ret; > + } > + > + priv->idev = idev; > + > + priv->core_regs = mx25_tsadc_get_regmap(pdev->dev.parent); > + priv->clk = mx25_tsadc_get_ipg(pdev->dev.parent); > + > + ret = clk_prepare_enable(priv->clk); > + if (ret) { > + dev_err(dev, "Failed to enable ipg clock\n"); > + return ret; > + } > + > + ret = devm_request_threaded_irq(dev, irq, mx25_tcq_irq, > + mx25_tcq_irq_thread, IRQF_ONESHOT, pdev->name, priv); > + if (ret) { > + dev_err(dev, "Failed requesting IRQ\n"); You are leaving clock enabled here. > + return ret; > + } > + > + ret = mx25_tcq_init(priv); > + if (ret) { > + dev_err(dev, "Failed to init tcq\n"); > + goto error_tcq_init; > + } > + > + platform_set_drvdata(pdev, priv); > + > + return 0; > + > +error_tcq_init: > + clk_disable_unprepare(priv->clk); > + return ret; > +} > + > +static int mx25_tcq_remove(struct platform_device *pdev) > +{ > + struct mx25_tcq_priv *priv = platform_get_drvdata(pdev); > + > + clk_disable_unprepare(priv->clk); > + > + return 0; > +} > + > +static struct platform_driver mx25_tcq_driver = { > + .driver = { > + .name = "mx25-tcq", > + .owner = THIS_MODULE, > + .of_match_table = mx25_tcq_ids, > + }, > + .probe = mx25_tcq_probe, > + .remove = mx25_tcq_remove, > +}; > +module_platform_driver(mx25_tcq_driver); > + > +MODULE_DESCRIPTION("TS input driver for Freescale mx25"); > +MODULE_AUTHOR("Markus Pargmann <mpa@pengutronix.de>"); > +MODULE_LICENSE("GPL v2"); > -- > 1.7.9.5 > Thanks. -- Dmitry ^ permalink raw reply [flat|nested] 76+ messages in thread
* Re: [PATCH v2 2/6] input: touchscreen: imx25 tcq driver @ 2014-06-15 7:27 ` Dmitry Torokhov 0 siblings, 0 replies; 76+ messages in thread From: Dmitry Torokhov @ 2014-06-15 7:27 UTC (permalink / raw) To: Denis Carikli Cc: Shawn Guo, Samuel Ortiz, Jonathan Cameron, Eric Bénard, Sascha Hauer, linux-arm-kernel, Lee Jones, linux-input, linux-iio, Fabio Estevam, Lars-Peter Clausen, Markus Pargmann Hi Denis, On Fri, Jun 13, 2014 at 05:21:35PM +0200, Denis Carikli wrote: > + > + if (ret == 0 && samples != 0) { > + /* > + * only if both touch measures are below a treshold, > + * the position is valid > + */ > + if (touch_pre < priv->pen_threshold && > + touch_post < priv->pen_threshold) { > + /* valid samples, generate a report */ > + x_pos /= priv->sample_count; > + y_pos /= priv->sample_count; > + input_report_abs(priv->idev, ABS_X, x_pos); > + input_report_abs(priv->idev, ABS_Y, y_pos); > + input_report_key(priv->idev, BTN_TOUCH, > + 0xfff - ((touch_pre + touch_post) / 2)); I still do not understand this calculation. input_report_key() converts the last argument to a boolean, so the only time it would report BTN_TOUCH UP here if (touch_pre + touch_post) / 2 is exactly 0xfff. Given that default threshold is 500 this won't ever happen. Why isn't it simply: input_report_key(priv->idev, BTN_TOUCH, 1); ? ... > + > +static irqreturn_t mx25_tcq_irq_thread(int irq, void *dev_id) > +{ > + struct mx25_tcq_priv *priv = (struct mx25_tcq_priv *) dev_id; No need to cast. > + u32 sample_buf[TSC_MAX_SAMPLES]; > + int samples = 0; > + > + /* read all samples */ > + while (1) { > + u32 stats; > + > + regmap_read(priv->regs, MX25_ADCQ_SR, &stats); > + if (stats & MX25_ADCQ_SR_EMPT) > + break; > + > + if (samples < TSC_MAX_SAMPLES) { > + regmap_read(priv->regs, MX25_ADCQ_FIFO, > + &sample_buf[samples]); > + ++samples; > + } else { > + u32 discarded; > + /* discard samples */ > + regmap_read(priv->regs, MX25_ADCQ_FIFO, &discarded); > + } > + } > + > + mx25_tcq_create_event_for_4wire(priv, sample_buf, samples); > + > + return IRQ_HANDLED; > +} > + > +static irqreturn_t mx25_tcq_irq(int irq, void *dev_id) > +{ > + struct mx25_tcq_priv *priv = (struct mx25_tcq_priv *)dev_id; Same here. > + u32 stat; > + int ret = IRQ_HANDLED; > + > + regmap_read(priv->regs, MX25_ADCQ_SR, &stat); > + > + if (stat & (MX25_ADCQ_SR_FRR | MX25_ADCQ_SR_FUR | MX25_ADCQ_SR_FOR)) > + mx25_tcq_fifo_reset(priv); > + > + if (stat & MX25_ADCQ_SR_PD) { > + mx25_tcq_disable_touch_irq(priv); > + mx25_tcq_force_queue_start(priv); > + mx25_tcq_enable_fifo_irq(priv); > + } > + > + if (stat & MX25_ADCQ_SR_FDRY) { > + mx25_tcq_disable_fifo_irq(priv); > + ret = IRQ_WAKE_THREAD; > + } > + > + regmap_update_bits(priv->regs, MX25_ADCQ_SR, MX25_ADCQ_SR_FRR | > + MX25_ADCQ_SR_FUR | MX25_ADCQ_SR_FOR | MX25_ADCQ_SR_PD | > + MX25_ADCQ_SR_EOQ, > + MX25_ADCQ_SR_FRR | > + MX25_ADCQ_SR_FUR | MX25_ADCQ_SR_FOR | MX25_ADCQ_SR_PD | > + MX25_ADCQ_SR_EOQ); > + > + return ret; > +} > + > +/* configure the statemachine for a 4-wire touchscreen */ > +static int mx25_tcq_init(struct mx25_tcq_priv *priv) > +{ > + u32 tgcr; > + unsigned int ipg_div; > + unsigned int adc_period; > + unsigned int debounce_cnt; > + unsigned int settling_time; > + int itemct; > + int ret; > + > + regmap_read(priv->core_regs, MX25_TSC_TGCR, &tgcr); > + ipg_div = max_t(unsigned int, 4, MX25_TGCR_GET_ADCCLK(tgcr)); > + adc_period = clk_get_rate(priv->clk) / (ipg_div * 2 + 2); > + debounce_cnt = DIV_ROUND_UP(priv->pen_debounce, adc_period * 8) - 1; > + settling_time = DIV_ROUND_UP(priv->settling_time, adc_period); > + > + > + /* Reset */ > + regmap_write(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_QRST | > + MX25_ADCQ_CR_FRST); > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_QRST | > + MX25_ADCQ_CR_FRST, 0); > + > + /* up to 128 * 8 ADC clocks are possible */ > + if (debounce_cnt > 127) > + debounce_cnt = 127; > + > + ret = imx25_setup_queue_4wire(priv, 0x0, &itemct); > + if (ret) > + return ret; > + > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_LITEMID_MASK | > + MX25_ADCQ_CR_WMRK_MASK, > + MX25_ADCQ_CR_LITEMID(itemct - 1) | > + MX25_ADCQ_CR_WMRK(priv->expected_samples - 1)); > + > + /* setup debounce count */ > + regmap_update_bits(priv->core_regs, MX25_TSC_TGCR, > + MX25_TGCR_PDBTIME_MASK, > + MX25_TGCR_PDBTIME(debounce_cnt)); > + > + /* enable debounce */ > + regmap_update_bits(priv->core_regs, MX25_TSC_TGCR, MX25_TGCR_PDBEN, > + MX25_TGCR_PDBEN); > + regmap_update_bits(priv->core_regs, MX25_TSC_TGCR, MX25_TGCR_PDEN, > + MX25_TGCR_PDEN); > + > + /* enable the engine on demand */ > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_QSM_FQS, > + MX25_ADCQ_CR_QSM_FQS); > + > + mx25_tcq_re_enable_touch_detection(priv); > + > + return 0; > +} > + > +static int mx25_tcq_parse_dt(struct platform_device *pdev, > + struct mx25_tcq_priv *priv) > +{ > + struct device_node *np = pdev->dev.of_node; > + u32 wires; > + int ret; > + > + /* Setup defaults */ > + priv->pen_threshold = 500; > + priv->sample_count = 3; > + priv->pen_debounce = 1000000; > + priv->settling_time = 250000; > + > + ret = of_property_read_u32(np, "fsl,wires", &wires); > + if (ret) { > + dev_err(&pdev->dev, "Failed to find fsl,wires properties\n"); > + return ret; > + } > + > + if (wires == 4) { > + priv->mode = MX25_TS_4WIRE; > + } else { > + dev_err(&pdev->dev, "%u-wire mode not supported\n", wires); > + return -EINVAL; > + } > + > + /* These are optional, we don't care about the return values */ > + of_property_read_u32(np, "fsl,pen-threshold", &priv->pen_threshold); > + of_property_read_u32(np, "fsl,settling-time", &priv->settling_time); > + of_property_read_u32(np, "fsl,pen-debounce", &priv->pen_debounce); > + > + return 0; > +} > + > +static int mx25_tcq_probe(struct platform_device *pdev) > +{ > + struct device *dev = &pdev->dev; > + struct input_dev *idev; > + struct mx25_tcq_priv *priv; > + struct resource *res; > + void __iomem *mem; > + int ret; > + int irq; > + > + priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); > + if (!priv) > + return -ENOMEM; > + > + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > + mem = devm_ioremap_resource(dev, res); > + if (!mem) > + return -ENOMEM; > + > + ret = mx25_tcq_parse_dt(pdev, priv); > + if (ret) > + return ret; > + > + priv->regs = devm_regmap_init_mmio(dev, mem, &mx25_tcq_regconfig); > + if (IS_ERR(priv->regs)) { > + dev_err(dev, "Failed to initialize regmap\n"); > + return PTR_ERR(priv->regs); > + } > + > + irq = platform_get_irq(pdev, 0); > + if (irq <= 0) { > + dev_err(dev, "Failed to get IRQ\n"); > + return irq; > + } > + > + idev = devm_input_allocate_device(dev); > + if (!idev) { > + dev_err(dev, "Failed to allocate input device\n"); > + return -ENOMEM; > + } > + > + idev->name = mx25_tcq_name; > + idev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS); > + idev->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH); > + input_set_abs_params(idev, ABS_X, 0, 0xfff, 0, 0); > + input_set_abs_params(idev, ABS_Y, 0, 0xfff, 0, 0); > + > + idev->id.bustype = BUS_HOST; > + > + ret = input_register_device(idev); > + if (ret) { > + dev_err(dev, "Failed to register input device\n"); > + return ret; > + } > + > + priv->idev = idev; > + > + priv->core_regs = mx25_tsadc_get_regmap(pdev->dev.parent); > + priv->clk = mx25_tsadc_get_ipg(pdev->dev.parent); > + > + ret = clk_prepare_enable(priv->clk); > + if (ret) { > + dev_err(dev, "Failed to enable ipg clock\n"); > + return ret; > + } > + > + ret = devm_request_threaded_irq(dev, irq, mx25_tcq_irq, > + mx25_tcq_irq_thread, IRQF_ONESHOT, pdev->name, priv); > + if (ret) { > + dev_err(dev, "Failed requesting IRQ\n"); You are leaving clock enabled here. > + return ret; > + } > + > + ret = mx25_tcq_init(priv); > + if (ret) { > + dev_err(dev, "Failed to init tcq\n"); > + goto error_tcq_init; > + } > + > + platform_set_drvdata(pdev, priv); > + > + return 0; > + > +error_tcq_init: > + clk_disable_unprepare(priv->clk); > + return ret; > +} > + > +static int mx25_tcq_remove(struct platform_device *pdev) > +{ > + struct mx25_tcq_priv *priv = platform_get_drvdata(pdev); > + > + clk_disable_unprepare(priv->clk); > + > + return 0; > +} > + > +static struct platform_driver mx25_tcq_driver = { > + .driver = { > + .name = "mx25-tcq", > + .owner = THIS_MODULE, > + .of_match_table = mx25_tcq_ids, > + }, > + .probe = mx25_tcq_probe, > + .remove = mx25_tcq_remove, > +}; > +module_platform_driver(mx25_tcq_driver); > + > +MODULE_DESCRIPTION("TS input driver for Freescale mx25"); > +MODULE_AUTHOR("Markus Pargmann <mpa@pengutronix.de>"); > +MODULE_LICENSE("GPL v2"); > -- > 1.7.9.5 > Thanks. -- Dmitry ^ permalink raw reply [flat|nested] 76+ messages in thread
* Re: [PATCH v2 2/6] input: touchscreen: imx25 tcq driver 2014-06-13 15:21 ` Denis Carikli @ 2014-06-21 10:18 ` Jonathan Cameron -1 siblings, 0 replies; 76+ messages in thread From: Jonathan Cameron @ 2014-06-21 10:18 UTC (permalink / raw) To: Denis Carikli, Shawn Guo, Samuel Ortiz, Dmitry Torokhov Cc: Eric Bénard, Sascha Hauer, linux-arm-kernel, Lee Jones, linux-input, linux-iio, Fabio Estevam, Lars-Peter Clausen, Markus Pargmann On 13/06/14 16:21, Denis Carikli wrote: > From: Markus Pargmann <mpa@pengutronix.de> > > This is a driver for the imx25 ADC/TSC module. It controls the > touchscreen conversion queue and creates a touchscreen input device. > The driver currently only supports 4 wire touchscreens. The driver uses > a simple conversion queue of precharge, touch detection, X measurement, > Y measurement, precharge and another touch detection. > > This driver uses the regmap from the parent to setup some touch specific > settings in the core driver and setup a idle configuration with touch > detection. > > Signed-off-by: Markus Pargmann <mpa@pengutronix.de> > Signed-off-by: Denis Carikli <denis@eukrea.com> A couple of little bits inline. I haven't looked in detail by the devm irq handling looks dangerous as the clock is set to running before this is enabled, but disabled before it is disabled. Jonathan > --- > .../bindings/input/touchscreen/fsl-mx25-tcq.txt | 29 + > drivers/input/touchscreen/Kconfig | 6 + > drivers/input/touchscreen/Makefile | 1 + > drivers/input/touchscreen/fsl-imx25-tcq.c | 576 ++++++++++++++++++++ > 4 files changed, 612 insertions(+) > create mode 100644 Documentation/devicetree/bindings/input/touchscreen/fsl-mx25-tcq.txt > create mode 100644 drivers/input/touchscreen/fsl-imx25-tcq.c > > diff --git a/Documentation/devicetree/bindings/input/touchscreen/fsl-mx25-tcq.txt b/Documentation/devicetree/bindings/input/touchscreen/fsl-mx25-tcq.txt > new file mode 100644 > index 0000000..4214a99 > --- /dev/null > +++ b/Documentation/devicetree/bindings/input/touchscreen/fsl-mx25-tcq.txt > @@ -0,0 +1,29 @@ > +Freescale mx25 TS conversion queue module > + > +mx25 touchscreen conversion queue module which controls the ADC unit of the > +mx25 for attached touchscreens. > + > +Required properties: > + - compatible: Should be "fsl,imx25-tcq". > + - reg: Memory range of the device. > + - interrupts: Should be the interrupt number associated with this module within > + the tscadc unit (<0>). > + - interrupt-parent: Should be a phandle to the tscadc unit. > + - fsl,wires: Should be '<4>' or '<5>' > + > +Optional properties: > + - fsl,pen-debounce: Pen debounce time. > + - fsl,pen-threshold: Pen-down threshold for the touchscreen. > + - fsl,settling-time: Settling time in nanoseconds. > + > +This device includes two conversion queues which can be added as subnodes. > +The first queue is for the touchscreen, the second for general purpose ADC. > + > +Example: > + tsc: tcq@50030400 { > + compatible = "fsl,imx25-tcq"; > + reg = <0x50030400 0x60>; > + interrupt-parent = <&tscadc>; > + interrupts = <0>; > + fsl,wires = <4>; > + }; > diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig > index a23a94b..a2290b9 100644 > --- a/drivers/input/touchscreen/Kconfig > +++ b/drivers/input/touchscreen/Kconfig > @@ -699,6 +699,12 @@ config TOUCHSCREEN_USB_COMPOSITE > To compile this driver as a module, choose M here: the > module will be called usbtouchscreen. > > +config TOUCHSCREEN_MX25 > + tristate "Freescale i.MX25 touchscreen input driver" > + depends on MFD_MX25_TSADC > + help > + Enable support for touchscreen connected to your i.MX25. > + > config TOUCHSCREEN_MC13783 > tristate "Freescale MC13783 touchscreen input driver" > depends on MFD_MC13XXX > diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile > index 126479d..537d591 100644 > --- a/drivers/input/touchscreen/Makefile > +++ b/drivers/input/touchscreen/Makefile > @@ -38,6 +38,7 @@ obj-$(CONFIG_TOUCHSCREEN_INEXIO) += inexio.o > obj-$(CONFIG_TOUCHSCREEN_INTEL_MID) += intel-mid-touch.o > obj-$(CONFIG_TOUCHSCREEN_LPC32XX) += lpc32xx_ts.o > obj-$(CONFIG_TOUCHSCREEN_MAX11801) += max11801_ts.o > +obj-$(CONFIG_TOUCHSCREEN_MX25) += fsl-imx25-tcq.o > obj-$(CONFIG_TOUCHSCREEN_MC13783) += mc13783_ts.o > obj-$(CONFIG_TOUCHSCREEN_MCS5000) += mcs5000_ts.o > obj-$(CONFIG_TOUCHSCREEN_MIGOR) += migor_ts.o > diff --git a/drivers/input/touchscreen/fsl-imx25-tcq.c b/drivers/input/touchscreen/fsl-imx25-tcq.c > new file mode 100644 > index 0000000..4ce576e > --- /dev/null > +++ b/drivers/input/touchscreen/fsl-imx25-tcq.c > @@ -0,0 +1,576 @@ > +/* > + * Copyright 2014 Markus Pargmann, Pengutronix <mpa@pengutronix.de> > + * Based on driver from 2011: > + * Juergen Beisert, Pengutronix <kernel@pengutronix.de> > + * > + * The code contained herein is licensed under the GNU General Public > + * License. You may obtain a copy of the GNU General Public License > + * Version 2 or later at the following locations: > + * > + * http://www.opensource.org/licenses/gpl-license.html > + * http://www.gnu.org/copyleft/gpl.html > + * > + * This is the driver for the imx25 TCQ (Touchscreen Conversion Queue) > + * connected to the imx25 ADC. > + */ > + > +#include <linux/clk.h> > +#include <linux/interrupt.h> > +#include <linux/input.h> > +#include <linux/mfd/imx25-tsadc.h> > +#include <linux/module.h> > +#include <linux/of.h> > +#include <linux/platform_device.h> > +#include <linux/regmap.h> > + > +static const char mx25_tcq_name[] = "mx25-tcq"; > + > +enum mx25_tcq_mode { > + MX25_TS_4WIRE, > +}; > + > +struct mx25_tcq_priv { > + struct regmap *regs; > + struct regmap *core_regs; > + struct input_dev *idev; > + enum mx25_tcq_mode mode; > + unsigned int pen_threshold; > + unsigned int sample_count; > + unsigned int expected_samples; > + unsigned int pen_debounce; > + unsigned int settling_time; > + struct clk *clk; > +}; > + > +static struct regmap_config mx25_tcq_regconfig = { > + .fast_io = true, > + .max_register = 0x5c, > + .reg_bits = 32, > + .val_bits = 32, > + .reg_stride = 4, > +}; > + > +static struct of_device_id mx25_tcq_ids[] = { > + { .compatible = "fsl,imx25-tcq", }, > + { /* Senitel */ } > +}; > + > +#define TSC_4WIRE_PRE_INDEX 0 > +#define TSC_4WIRE_X_INDEX 1 > +#define TSC_4WIRE_Y_INDEX 2 > +#define TSC_4WIRE_POST_INDEX 3 > +#define TSC_4WIRE_LEAVE 4 > + > +#define MX25_TSC_DEF_THRESHOLD 80 > +#define TSC_MAX_SAMPLES 16 > + > + > +enum mx25_adc_configurations { > + MX25_CFG_PRECHARGE = 0, > + MX25_CFG_TOUCH_DETECT, > + MX25_CFG_X_MEASUREMENT, > + MX25_CFG_Y_MEASUREMENT, > +}; > + > +#define MX25_PRECHARGE_VALUE (\ > + MX25_ADCQ_CFG_YPLL_OFF | \ > + MX25_ADCQ_CFG_XNUR_OFF | \ > + MX25_ADCQ_CFG_XPUL_HIGH | \ > + MX25_ADCQ_CFG_REFP_INT | \ > + MX25_ADCQ_CFG_IN_XP | \ > + MX25_ADCQ_CFG_REFN_NGND2 | \ > + MX25_ADCQ_CFG_IGS) > + > +#define MX25_TOUCH_DETECT_VALUE (\ > + MX25_ADCQ_CFG_YNLR | \ > + MX25_ADCQ_CFG_YPLL_OFF | \ > + MX25_ADCQ_CFG_XNUR_OFF | \ > + MX25_ADCQ_CFG_XPUL_OFF | \ > + MX25_ADCQ_CFG_REFP_INT | \ > + MX25_ADCQ_CFG_IN_XP | \ > + MX25_ADCQ_CFG_REFN_NGND2 | \ > + MX25_ADCQ_CFG_PENIACK) > + > +static void imx25_setup_queue_cfgs(struct mx25_tcq_priv *priv, > + unsigned int settling_time) > +{ > + u32 precharge_cfg = > + MX25_PRECHARGE_VALUE | > + MX25_ADCQ_CFG_SETTLING_TIME(settling_time); > + u32 touch_detect_cfg = > + MX25_TOUCH_DETECT_VALUE | > + MX25_ADCQ_CFG_NOS(1) | > + MX25_ADCQ_CFG_SETTLING_TIME(settling_time); > + > + regmap_write(priv->core_regs, MX25_TSC_TICR, precharge_cfg); > + > + /* PRECHARGE */ > + regmap_write(priv->regs, MX25_ADCQ_CFG(MX25_CFG_PRECHARGE), > + precharge_cfg); > + > + /* TOUCH_DETECT */ > + regmap_write(priv->regs, MX25_ADCQ_CFG(MX25_CFG_TOUCH_DETECT), > + touch_detect_cfg); > + > + /* X Measurement */ > + regmap_write(priv->regs, MX25_ADCQ_CFG(MX25_CFG_X_MEASUREMENT), > + MX25_ADCQ_CFG_YPLL_OFF | > + MX25_ADCQ_CFG_XNUR_LOW | > + MX25_ADCQ_CFG_XPUL_HIGH | > + MX25_ADCQ_CFG_REFP_XP | > + MX25_ADCQ_CFG_IN_YP | > + MX25_ADCQ_CFG_REFN_XN | > + MX25_ADCQ_CFG_NOS(priv->sample_count) | > + MX25_ADCQ_CFG_SETTLING_TIME(settling_time)); > + > + /* Y Measurement */ > + regmap_write(priv->regs, MX25_ADCQ_CFG(MX25_CFG_Y_MEASUREMENT), > + MX25_ADCQ_CFG_YNLR | > + MX25_ADCQ_CFG_YPLL_HIGH | > + MX25_ADCQ_CFG_XNUR_OFF | > + MX25_ADCQ_CFG_XPUL_OFF | > + MX25_ADCQ_CFG_REFP_YP | > + MX25_ADCQ_CFG_IN_XP | > + MX25_ADCQ_CFG_REFN_YN | > + MX25_ADCQ_CFG_NOS(priv->sample_count) | > + MX25_ADCQ_CFG_SETTLING_TIME(settling_time)); > + > + /* Enable the touch detection right now */ > + regmap_write(priv->core_regs, MX25_TSC_TICR, touch_detect_cfg | > + MX25_ADCQ_CFG_IGS); > +} > + > +static int imx25_setup_queue_4wire(struct mx25_tcq_priv *priv, > + unsigned settling_time, int *items) > +{ > + imx25_setup_queue_cfgs(priv, settling_time); > + > + /* Setup the conversion queue */ > + regmap_write(priv->regs, MX25_ADCQ_ITEM_7_0, > + MX25_ADCQ_ITEM(0, MX25_CFG_PRECHARGE) | > + MX25_ADCQ_ITEM(1, MX25_CFG_TOUCH_DETECT) | > + MX25_ADCQ_ITEM(2, MX25_CFG_X_MEASUREMENT) | > + MX25_ADCQ_ITEM(3, MX25_CFG_Y_MEASUREMENT) | > + MX25_ADCQ_ITEM(4, MX25_CFG_PRECHARGE) | > + MX25_ADCQ_ITEM(5, MX25_CFG_TOUCH_DETECT)); > + > + /* We measure X/Y with 'sample_count' number of samples and execute a > + * touch detection twice, with 1 sample each */ > + priv->expected_samples = priv->sample_count * 2 + 2; > + *items = 6; > + > + return 0; > +} > + > +static void mx25_tcq_disable_touch_irq(struct mx25_tcq_priv *priv) > +{ > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_PDMSK, > + MX25_ADCQ_CR_PDMSK); > +} > + > +static void mx25_tcq_enable_touch_irq(struct mx25_tcq_priv *priv) > +{ > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_PDMSK, 0); > +} > + > +static void mx25_tcq_disable_fifo_irq(struct mx25_tcq_priv *priv) > +{ > + regmap_update_bits(priv->regs, MX25_ADCQ_MR, MX25_ADCQ_MR_FDRY_IRQ, > + MX25_ADCQ_MR_FDRY_IRQ); > +} > + > +static void mx25_tcq_enable_fifo_irq(struct mx25_tcq_priv *priv) > +{ > + regmap_update_bits(priv->regs, MX25_ADCQ_MR, MX25_ADCQ_MR_FDRY_IRQ, 0); > +} > + > +static void mx25_tcq_force_queue_start(struct mx25_tcq_priv *priv) > +{ > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FQS, > + MX25_ADCQ_CR_FQS); > + > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FQS, 0); > +} > + > +static void mx25_tcq_force_queue_stop(struct mx25_tcq_priv *priv) > +{ > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FQS, 0); > +} > + > +static void mx25_tcq_fifo_reset(struct mx25_tcq_priv *priv) > +{ > + u32 tcqcr; > + > + regmap_read(priv->regs, MX25_ADCQ_CR, &tcqcr); > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FRST, > + MX25_ADCQ_CR_FRST); > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FRST, > + 0); > + regmap_write(priv->regs, MX25_ADCQ_CR, tcqcr); > +} > + > +static void mx25_tcq_re_enable_touch_detection(struct mx25_tcq_priv *priv) > +{ > + /* stop the queue from looping */ > + mx25_tcq_force_queue_stop(priv); > + > + /* for a clean touch detection, preload the X plane */ > + regmap_write(priv->core_regs, MX25_TSC_TICR, MX25_PRECHARGE_VALUE); > + > + /* waste some time now to pre-load the X plate to high voltage */ > + mx25_tcq_fifo_reset(priv); > + > + /* re-enable the detection right now */ > + regmap_write(priv->core_regs, MX25_TSC_TICR, MX25_TOUCH_DETECT_VALUE | > + MX25_ADCQ_CFG_IGS); > + > + regmap_update_bits(priv->regs, MX25_ADCQ_SR, MX25_ADCQ_SR_PD, > + MX25_ADCQ_SR_PD); > + > + /* enable the pen down event to be a source for the interrupt */ > + regmap_update_bits(priv->regs, MX25_ADCQ_MR, MX25_ADCQ_MR_PD_IRQ, 0); > + > + /* lets fire the next IRQ if someone touches the touchscreen */ > + mx25_tcq_enable_touch_irq(priv); > +} > + > +static int mx25_tcq_create_event_for_4wire(struct mx25_tcq_priv *priv, > + u32 *sample_buf, int samples) > +{ > + unsigned int x_pos = 0; > + unsigned int y_pos = 0; > + unsigned int touch_pre = 0; > + unsigned int touch_post = 0; > + unsigned i; > + int ret = 0; > + > + for (i = 0; i < samples; i++) { > + unsigned int index = MX25_ADCQ_FIFO_ID(sample_buf[i]); > + unsigned int val = MX25_ADCQ_FIFO_DATA(sample_buf[i]); > + > + switch (index) { > + case 1: > + touch_pre = val; > + break; > + case 2: > + x_pos = val; > + break; > + case 3: > + y_pos = val; > + break; > + case 5: > + touch_post = val; > + break; > + default: > + ret = -EINVAL; > + break; > + } > + } > + > + if (ret == 0 && samples != 0) { > + /* > + * only if both touch measures are below a treshold, > + * the position is valid > + */ > + if (touch_pre < priv->pen_threshold && > + touch_post < priv->pen_threshold) { > + /* valid samples, generate a report */ > + x_pos /= priv->sample_count; > + y_pos /= priv->sample_count; > + input_report_abs(priv->idev, ABS_X, x_pos); > + input_report_abs(priv->idev, ABS_Y, y_pos); > + input_report_key(priv->idev, BTN_TOUCH, > + 0xfff - ((touch_pre + touch_post) / 2)); > + input_sync(priv->idev); > + > + /* get next sample */ > + mx25_tcq_force_queue_start(priv); > + mx25_tcq_enable_fifo_irq(priv); > + } else if (touch_pre >= priv->pen_threshold && > + touch_post >= priv->pen_threshold) { > + /* > + * if both samples are invalid, > + * generate a release report > + */ > + input_report_key(priv->idev, BTN_TOUCH, 0); > + input_sync(priv->idev); > + mx25_tcq_re_enable_touch_detection(priv); > + } else { > + /* > + * if only one of both touch measurements are > + * below the threshold, still some bouncing > + * happens. Take additional samples in this > + * case to be sure > + */ > + mx25_tcq_force_queue_start(priv); > + mx25_tcq_enable_fifo_irq(priv); > + } > + } > + > + return ret; > +} > + > +static irqreturn_t mx25_tcq_irq_thread(int irq, void *dev_id) > +{ > + struct mx25_tcq_priv *priv = (struct mx25_tcq_priv *) dev_id; > + u32 sample_buf[TSC_MAX_SAMPLES]; > + int samples = 0; > + > + /* read all samples */ > + while (1) { > + u32 stats; > + > + regmap_read(priv->regs, MX25_ADCQ_SR, &stats); > + if (stats & MX25_ADCQ_SR_EMPT) > + break; > + > + if (samples < TSC_MAX_SAMPLES) { > + regmap_read(priv->regs, MX25_ADCQ_FIFO, > + &sample_buf[samples]); > + ++samples; > + } else { > + u32 discarded; > + /* discard samples */ > + regmap_read(priv->regs, MX25_ADCQ_FIFO, &discarded); > + } > + } > + > + mx25_tcq_create_event_for_4wire(priv, sample_buf, samples); > + > + return IRQ_HANDLED; > +} > + > +static irqreturn_t mx25_tcq_irq(int irq, void *dev_id) > +{ > + struct mx25_tcq_priv *priv = (struct mx25_tcq_priv *)dev_id; > + u32 stat; > + int ret = IRQ_HANDLED; > + > + regmap_read(priv->regs, MX25_ADCQ_SR, &stat); > + > + if (stat & (MX25_ADCQ_SR_FRR | MX25_ADCQ_SR_FUR | MX25_ADCQ_SR_FOR)) > + mx25_tcq_fifo_reset(priv); > + > + if (stat & MX25_ADCQ_SR_PD) { > + mx25_tcq_disable_touch_irq(priv); > + mx25_tcq_force_queue_start(priv); > + mx25_tcq_enable_fifo_irq(priv); > + } > + > + if (stat & MX25_ADCQ_SR_FDRY) { > + mx25_tcq_disable_fifo_irq(priv); > + ret = IRQ_WAKE_THREAD; > + } > + > + regmap_update_bits(priv->regs, MX25_ADCQ_SR, MX25_ADCQ_SR_FRR | > + MX25_ADCQ_SR_FUR | MX25_ADCQ_SR_FOR | MX25_ADCQ_SR_PD | > + MX25_ADCQ_SR_EOQ, > + MX25_ADCQ_SR_FRR | > + MX25_ADCQ_SR_FUR | MX25_ADCQ_SR_FOR | MX25_ADCQ_SR_PD | > + MX25_ADCQ_SR_EOQ); > + > + return ret; > +} > + > +/* configure the statemachine for a 4-wire touchscreen */ > +static int mx25_tcq_init(struct mx25_tcq_priv *priv) > +{ > + u32 tgcr; > + unsigned int ipg_div; > + unsigned int adc_period; > + unsigned int debounce_cnt; > + unsigned int settling_time; > + int itemct; > + int ret; > + > + regmap_read(priv->core_regs, MX25_TSC_TGCR, &tgcr); > + ipg_div = max_t(unsigned int, 4, MX25_TGCR_GET_ADCCLK(tgcr)); > + adc_period = clk_get_rate(priv->clk) / (ipg_div * 2 + 2); > + debounce_cnt = DIV_ROUND_UP(priv->pen_debounce, adc_period * 8) - 1; > + settling_time = DIV_ROUND_UP(priv->settling_time, adc_period); > + > + > + /* Reset */ > + regmap_write(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_QRST | > + MX25_ADCQ_CR_FRST); > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_QRST | > + MX25_ADCQ_CR_FRST, 0); > + > + /* up to 128 * 8 ADC clocks are possible */ > + if (debounce_cnt > 127) > + debounce_cnt = 127; > + > + ret = imx25_setup_queue_4wire(priv, 0x0, &itemct); > + if (ret) > + return ret; > + > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_LITEMID_MASK | > + MX25_ADCQ_CR_WMRK_MASK, > + MX25_ADCQ_CR_LITEMID(itemct - 1) | > + MX25_ADCQ_CR_WMRK(priv->expected_samples - 1)); > + > + /* setup debounce count */ > + regmap_update_bits(priv->core_regs, MX25_TSC_TGCR, > + MX25_TGCR_PDBTIME_MASK, > + MX25_TGCR_PDBTIME(debounce_cnt)); > + > + /* enable debounce */ > + regmap_update_bits(priv->core_regs, MX25_TSC_TGCR, MX25_TGCR_PDBEN, > + MX25_TGCR_PDBEN); > + regmap_update_bits(priv->core_regs, MX25_TSC_TGCR, MX25_TGCR_PDEN, > + MX25_TGCR_PDEN); > + > + /* enable the engine on demand */ > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_QSM_FQS, > + MX25_ADCQ_CR_QSM_FQS); > + > + mx25_tcq_re_enable_touch_detection(priv); > + > + return 0; > +} > + > +static int mx25_tcq_parse_dt(struct platform_device *pdev, > + struct mx25_tcq_priv *priv) > +{ > + struct device_node *np = pdev->dev.of_node; > + u32 wires; > + int ret; > + > + /* Setup defaults */ > + priv->pen_threshold = 500; > + priv->sample_count = 3; > + priv->pen_debounce = 1000000; > + priv->settling_time = 250000; > + > + ret = of_property_read_u32(np, "fsl,wires", &wires); > + if (ret) { > + dev_err(&pdev->dev, "Failed to find fsl,wires properties\n"); > + return ret; > + } > + > + if (wires == 4) { > + priv->mode = MX25_TS_4WIRE; > + } else { > + dev_err(&pdev->dev, "%u-wire mode not supported\n", wires); > + return -EINVAL; > + } > + > + /* These are optional, we don't care about the return values */ > + of_property_read_u32(np, "fsl,pen-threshold", &priv->pen_threshold); > + of_property_read_u32(np, "fsl,settling-time", &priv->settling_time); > + of_property_read_u32(np, "fsl,pen-debounce", &priv->pen_debounce); > + > + return 0; > +} > + > +static int mx25_tcq_probe(struct platform_device *pdev) > +{ > + struct device *dev = &pdev->dev; > + struct input_dev *idev; > + struct mx25_tcq_priv *priv; > + struct resource *res; > + void __iomem *mem; > + int ret; > + int irq; > + > + priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); > + if (!priv) > + return -ENOMEM; > + > + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); Could this not in theory fail? > + mem = devm_ioremap_resource(dev, res); > + if (!mem) > + return -ENOMEM; > + > + ret = mx25_tcq_parse_dt(pdev, priv); > + if (ret) > + return ret; > + > + priv->regs = devm_regmap_init_mmio(dev, mem, &mx25_tcq_regconfig); > + if (IS_ERR(priv->regs)) { > + dev_err(dev, "Failed to initialize regmap\n"); > + return PTR_ERR(priv->regs); > + } > + > + irq = platform_get_irq(pdev, 0); > + if (irq <= 0) { > + dev_err(dev, "Failed to get IRQ\n"); > + return irq; > + } > + > + idev = devm_input_allocate_device(dev); > + if (!idev) { > + dev_err(dev, "Failed to allocate input device\n"); > + return -ENOMEM; > + } > + > + idev->name = mx25_tcq_name; > + idev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS); > + idev->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH); > + input_set_abs_params(idev, ABS_X, 0, 0xfff, 0, 0); > + input_set_abs_params(idev, ABS_Y, 0, 0xfff, 0, 0); > + > + idev->id.bustype = BUS_HOST; > + > + ret = input_register_device(idev); > + if (ret) { > + dev_err(dev, "Failed to register input device\n"); > + return ret; > + } > + > + priv->idev = idev; > + > + priv->core_regs = mx25_tsadc_get_regmap(pdev->dev.parent); > + priv->clk = mx25_tsadc_get_ipg(pdev->dev.parent); > + > + ret = clk_prepare_enable(priv->clk); > + if (ret) { > + dev_err(dev, "Failed to enable ipg clock\n"); > + return ret; > + } > + > + ret = devm_request_threaded_irq(dev, irq, mx25_tcq_irq, > + mx25_tcq_irq_thread, IRQF_ONESHOT, pdev->name, priv); > + if (ret) { > + dev_err(dev, "Failed requesting IRQ\n"); > + return ret; > + } This use of devm_request_threaded_irq strikes me as potentially dangerous as the order in removing the device has the clock being disabled before the interrupt is removed whereas for a simple unwinding they would be in the other order. > + > + ret = mx25_tcq_init(priv); > + if (ret) { > + dev_err(dev, "Failed to init tcq\n"); > + goto error_tcq_init; > + } > + > + platform_set_drvdata(pdev, priv); > + > + return 0; > + > +error_tcq_init: > + clk_disable_unprepare(priv->clk); > + return ret; > +} > + > +static int mx25_tcq_remove(struct platform_device *pdev) > +{ > + struct mx25_tcq_priv *priv = platform_get_drvdata(pdev); > + > + clk_disable_unprepare(priv->clk); > + > + return 0; > +} > + > +static struct platform_driver mx25_tcq_driver = { > + .driver = { > + .name = "mx25-tcq", > + .owner = THIS_MODULE, > + .of_match_table = mx25_tcq_ids, > + }, > + .probe = mx25_tcq_probe, > + .remove = mx25_tcq_remove, > +}; > +module_platform_driver(mx25_tcq_driver); > + > +MODULE_DESCRIPTION("TS input driver for Freescale mx25"); > +MODULE_AUTHOR("Markus Pargmann <mpa@pengutronix.de>"); > +MODULE_LICENSE("GPL v2"); > ^ permalink raw reply [flat|nested] 76+ messages in thread
* [PATCH v2 2/6] input: touchscreen: imx25 tcq driver @ 2014-06-21 10:18 ` Jonathan Cameron 0 siblings, 0 replies; 76+ messages in thread From: Jonathan Cameron @ 2014-06-21 10:18 UTC (permalink / raw) To: linux-arm-kernel On 13/06/14 16:21, Denis Carikli wrote: > From: Markus Pargmann <mpa@pengutronix.de> > > This is a driver for the imx25 ADC/TSC module. It controls the > touchscreen conversion queue and creates a touchscreen input device. > The driver currently only supports 4 wire touchscreens. The driver uses > a simple conversion queue of precharge, touch detection, X measurement, > Y measurement, precharge and another touch detection. > > This driver uses the regmap from the parent to setup some touch specific > settings in the core driver and setup a idle configuration with touch > detection. > > Signed-off-by: Markus Pargmann <mpa@pengutronix.de> > Signed-off-by: Denis Carikli <denis@eukrea.com> A couple of little bits inline. I haven't looked in detail by the devm irq handling looks dangerous as the clock is set to running before this is enabled, but disabled before it is disabled. Jonathan > --- > .../bindings/input/touchscreen/fsl-mx25-tcq.txt | 29 + > drivers/input/touchscreen/Kconfig | 6 + > drivers/input/touchscreen/Makefile | 1 + > drivers/input/touchscreen/fsl-imx25-tcq.c | 576 ++++++++++++++++++++ > 4 files changed, 612 insertions(+) > create mode 100644 Documentation/devicetree/bindings/input/touchscreen/fsl-mx25-tcq.txt > create mode 100644 drivers/input/touchscreen/fsl-imx25-tcq.c > > diff --git a/Documentation/devicetree/bindings/input/touchscreen/fsl-mx25-tcq.txt b/Documentation/devicetree/bindings/input/touchscreen/fsl-mx25-tcq.txt > new file mode 100644 > index 0000000..4214a99 > --- /dev/null > +++ b/Documentation/devicetree/bindings/input/touchscreen/fsl-mx25-tcq.txt > @@ -0,0 +1,29 @@ > +Freescale mx25 TS conversion queue module > + > +mx25 touchscreen conversion queue module which controls the ADC unit of the > +mx25 for attached touchscreens. > + > +Required properties: > + - compatible: Should be "fsl,imx25-tcq". > + - reg: Memory range of the device. > + - interrupts: Should be the interrupt number associated with this module within > + the tscadc unit (<0>). > + - interrupt-parent: Should be a phandle to the tscadc unit. > + - fsl,wires: Should be '<4>' or '<5>' > + > +Optional properties: > + - fsl,pen-debounce: Pen debounce time. > + - fsl,pen-threshold: Pen-down threshold for the touchscreen. > + - fsl,settling-time: Settling time in nanoseconds. > + > +This device includes two conversion queues which can be added as subnodes. > +The first queue is for the touchscreen, the second for general purpose ADC. > + > +Example: > + tsc: tcq at 50030400 { > + compatible = "fsl,imx25-tcq"; > + reg = <0x50030400 0x60>; > + interrupt-parent = <&tscadc>; > + interrupts = <0>; > + fsl,wires = <4>; > + }; > diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig > index a23a94b..a2290b9 100644 > --- a/drivers/input/touchscreen/Kconfig > +++ b/drivers/input/touchscreen/Kconfig > @@ -699,6 +699,12 @@ config TOUCHSCREEN_USB_COMPOSITE > To compile this driver as a module, choose M here: the > module will be called usbtouchscreen. > > +config TOUCHSCREEN_MX25 > + tristate "Freescale i.MX25 touchscreen input driver" > + depends on MFD_MX25_TSADC > + help > + Enable support for touchscreen connected to your i.MX25. > + > config TOUCHSCREEN_MC13783 > tristate "Freescale MC13783 touchscreen input driver" > depends on MFD_MC13XXX > diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile > index 126479d..537d591 100644 > --- a/drivers/input/touchscreen/Makefile > +++ b/drivers/input/touchscreen/Makefile > @@ -38,6 +38,7 @@ obj-$(CONFIG_TOUCHSCREEN_INEXIO) += inexio.o > obj-$(CONFIG_TOUCHSCREEN_INTEL_MID) += intel-mid-touch.o > obj-$(CONFIG_TOUCHSCREEN_LPC32XX) += lpc32xx_ts.o > obj-$(CONFIG_TOUCHSCREEN_MAX11801) += max11801_ts.o > +obj-$(CONFIG_TOUCHSCREEN_MX25) += fsl-imx25-tcq.o > obj-$(CONFIG_TOUCHSCREEN_MC13783) += mc13783_ts.o > obj-$(CONFIG_TOUCHSCREEN_MCS5000) += mcs5000_ts.o > obj-$(CONFIG_TOUCHSCREEN_MIGOR) += migor_ts.o > diff --git a/drivers/input/touchscreen/fsl-imx25-tcq.c b/drivers/input/touchscreen/fsl-imx25-tcq.c > new file mode 100644 > index 0000000..4ce576e > --- /dev/null > +++ b/drivers/input/touchscreen/fsl-imx25-tcq.c > @@ -0,0 +1,576 @@ > +/* > + * Copyright 2014 Markus Pargmann, Pengutronix <mpa@pengutronix.de> > + * Based on driver from 2011: > + * Juergen Beisert, Pengutronix <kernel@pengutronix.de> > + * > + * The code contained herein is licensed under the GNU General Public > + * License. You may obtain a copy of the GNU General Public License > + * Version 2 or later at the following locations: > + * > + * http://www.opensource.org/licenses/gpl-license.html > + * http://www.gnu.org/copyleft/gpl.html > + * > + * This is the driver for the imx25 TCQ (Touchscreen Conversion Queue) > + * connected to the imx25 ADC. > + */ > + > +#include <linux/clk.h> > +#include <linux/interrupt.h> > +#include <linux/input.h> > +#include <linux/mfd/imx25-tsadc.h> > +#include <linux/module.h> > +#include <linux/of.h> > +#include <linux/platform_device.h> > +#include <linux/regmap.h> > + > +static const char mx25_tcq_name[] = "mx25-tcq"; > + > +enum mx25_tcq_mode { > + MX25_TS_4WIRE, > +}; > + > +struct mx25_tcq_priv { > + struct regmap *regs; > + struct regmap *core_regs; > + struct input_dev *idev; > + enum mx25_tcq_mode mode; > + unsigned int pen_threshold; > + unsigned int sample_count; > + unsigned int expected_samples; > + unsigned int pen_debounce; > + unsigned int settling_time; > + struct clk *clk; > +}; > + > +static struct regmap_config mx25_tcq_regconfig = { > + .fast_io = true, > + .max_register = 0x5c, > + .reg_bits = 32, > + .val_bits = 32, > + .reg_stride = 4, > +}; > + > +static struct of_device_id mx25_tcq_ids[] = { > + { .compatible = "fsl,imx25-tcq", }, > + { /* Senitel */ } > +}; > + > +#define TSC_4WIRE_PRE_INDEX 0 > +#define TSC_4WIRE_X_INDEX 1 > +#define TSC_4WIRE_Y_INDEX 2 > +#define TSC_4WIRE_POST_INDEX 3 > +#define TSC_4WIRE_LEAVE 4 > + > +#define MX25_TSC_DEF_THRESHOLD 80 > +#define TSC_MAX_SAMPLES 16 > + > + > +enum mx25_adc_configurations { > + MX25_CFG_PRECHARGE = 0, > + MX25_CFG_TOUCH_DETECT, > + MX25_CFG_X_MEASUREMENT, > + MX25_CFG_Y_MEASUREMENT, > +}; > + > +#define MX25_PRECHARGE_VALUE (\ > + MX25_ADCQ_CFG_YPLL_OFF | \ > + MX25_ADCQ_CFG_XNUR_OFF | \ > + MX25_ADCQ_CFG_XPUL_HIGH | \ > + MX25_ADCQ_CFG_REFP_INT | \ > + MX25_ADCQ_CFG_IN_XP | \ > + MX25_ADCQ_CFG_REFN_NGND2 | \ > + MX25_ADCQ_CFG_IGS) > + > +#define MX25_TOUCH_DETECT_VALUE (\ > + MX25_ADCQ_CFG_YNLR | \ > + MX25_ADCQ_CFG_YPLL_OFF | \ > + MX25_ADCQ_CFG_XNUR_OFF | \ > + MX25_ADCQ_CFG_XPUL_OFF | \ > + MX25_ADCQ_CFG_REFP_INT | \ > + MX25_ADCQ_CFG_IN_XP | \ > + MX25_ADCQ_CFG_REFN_NGND2 | \ > + MX25_ADCQ_CFG_PENIACK) > + > +static void imx25_setup_queue_cfgs(struct mx25_tcq_priv *priv, > + unsigned int settling_time) > +{ > + u32 precharge_cfg = > + MX25_PRECHARGE_VALUE | > + MX25_ADCQ_CFG_SETTLING_TIME(settling_time); > + u32 touch_detect_cfg = > + MX25_TOUCH_DETECT_VALUE | > + MX25_ADCQ_CFG_NOS(1) | > + MX25_ADCQ_CFG_SETTLING_TIME(settling_time); > + > + regmap_write(priv->core_regs, MX25_TSC_TICR, precharge_cfg); > + > + /* PRECHARGE */ > + regmap_write(priv->regs, MX25_ADCQ_CFG(MX25_CFG_PRECHARGE), > + precharge_cfg); > + > + /* TOUCH_DETECT */ > + regmap_write(priv->regs, MX25_ADCQ_CFG(MX25_CFG_TOUCH_DETECT), > + touch_detect_cfg); > + > + /* X Measurement */ > + regmap_write(priv->regs, MX25_ADCQ_CFG(MX25_CFG_X_MEASUREMENT), > + MX25_ADCQ_CFG_YPLL_OFF | > + MX25_ADCQ_CFG_XNUR_LOW | > + MX25_ADCQ_CFG_XPUL_HIGH | > + MX25_ADCQ_CFG_REFP_XP | > + MX25_ADCQ_CFG_IN_YP | > + MX25_ADCQ_CFG_REFN_XN | > + MX25_ADCQ_CFG_NOS(priv->sample_count) | > + MX25_ADCQ_CFG_SETTLING_TIME(settling_time)); > + > + /* Y Measurement */ > + regmap_write(priv->regs, MX25_ADCQ_CFG(MX25_CFG_Y_MEASUREMENT), > + MX25_ADCQ_CFG_YNLR | > + MX25_ADCQ_CFG_YPLL_HIGH | > + MX25_ADCQ_CFG_XNUR_OFF | > + MX25_ADCQ_CFG_XPUL_OFF | > + MX25_ADCQ_CFG_REFP_YP | > + MX25_ADCQ_CFG_IN_XP | > + MX25_ADCQ_CFG_REFN_YN | > + MX25_ADCQ_CFG_NOS(priv->sample_count) | > + MX25_ADCQ_CFG_SETTLING_TIME(settling_time)); > + > + /* Enable the touch detection right now */ > + regmap_write(priv->core_regs, MX25_TSC_TICR, touch_detect_cfg | > + MX25_ADCQ_CFG_IGS); > +} > + > +static int imx25_setup_queue_4wire(struct mx25_tcq_priv *priv, > + unsigned settling_time, int *items) > +{ > + imx25_setup_queue_cfgs(priv, settling_time); > + > + /* Setup the conversion queue */ > + regmap_write(priv->regs, MX25_ADCQ_ITEM_7_0, > + MX25_ADCQ_ITEM(0, MX25_CFG_PRECHARGE) | > + MX25_ADCQ_ITEM(1, MX25_CFG_TOUCH_DETECT) | > + MX25_ADCQ_ITEM(2, MX25_CFG_X_MEASUREMENT) | > + MX25_ADCQ_ITEM(3, MX25_CFG_Y_MEASUREMENT) | > + MX25_ADCQ_ITEM(4, MX25_CFG_PRECHARGE) | > + MX25_ADCQ_ITEM(5, MX25_CFG_TOUCH_DETECT)); > + > + /* We measure X/Y with 'sample_count' number of samples and execute a > + * touch detection twice, with 1 sample each */ > + priv->expected_samples = priv->sample_count * 2 + 2; > + *items = 6; > + > + return 0; > +} > + > +static void mx25_tcq_disable_touch_irq(struct mx25_tcq_priv *priv) > +{ > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_PDMSK, > + MX25_ADCQ_CR_PDMSK); > +} > + > +static void mx25_tcq_enable_touch_irq(struct mx25_tcq_priv *priv) > +{ > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_PDMSK, 0); > +} > + > +static void mx25_tcq_disable_fifo_irq(struct mx25_tcq_priv *priv) > +{ > + regmap_update_bits(priv->regs, MX25_ADCQ_MR, MX25_ADCQ_MR_FDRY_IRQ, > + MX25_ADCQ_MR_FDRY_IRQ); > +} > + > +static void mx25_tcq_enable_fifo_irq(struct mx25_tcq_priv *priv) > +{ > + regmap_update_bits(priv->regs, MX25_ADCQ_MR, MX25_ADCQ_MR_FDRY_IRQ, 0); > +} > + > +static void mx25_tcq_force_queue_start(struct mx25_tcq_priv *priv) > +{ > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FQS, > + MX25_ADCQ_CR_FQS); > + > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FQS, 0); > +} > + > +static void mx25_tcq_force_queue_stop(struct mx25_tcq_priv *priv) > +{ > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FQS, 0); > +} > + > +static void mx25_tcq_fifo_reset(struct mx25_tcq_priv *priv) > +{ > + u32 tcqcr; > + > + regmap_read(priv->regs, MX25_ADCQ_CR, &tcqcr); > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FRST, > + MX25_ADCQ_CR_FRST); > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FRST, > + 0); > + regmap_write(priv->regs, MX25_ADCQ_CR, tcqcr); > +} > + > +static void mx25_tcq_re_enable_touch_detection(struct mx25_tcq_priv *priv) > +{ > + /* stop the queue from looping */ > + mx25_tcq_force_queue_stop(priv); > + > + /* for a clean touch detection, preload the X plane */ > + regmap_write(priv->core_regs, MX25_TSC_TICR, MX25_PRECHARGE_VALUE); > + > + /* waste some time now to pre-load the X plate to high voltage */ > + mx25_tcq_fifo_reset(priv); > + > + /* re-enable the detection right now */ > + regmap_write(priv->core_regs, MX25_TSC_TICR, MX25_TOUCH_DETECT_VALUE | > + MX25_ADCQ_CFG_IGS); > + > + regmap_update_bits(priv->regs, MX25_ADCQ_SR, MX25_ADCQ_SR_PD, > + MX25_ADCQ_SR_PD); > + > + /* enable the pen down event to be a source for the interrupt */ > + regmap_update_bits(priv->regs, MX25_ADCQ_MR, MX25_ADCQ_MR_PD_IRQ, 0); > + > + /* lets fire the next IRQ if someone touches the touchscreen */ > + mx25_tcq_enable_touch_irq(priv); > +} > + > +static int mx25_tcq_create_event_for_4wire(struct mx25_tcq_priv *priv, > + u32 *sample_buf, int samples) > +{ > + unsigned int x_pos = 0; > + unsigned int y_pos = 0; > + unsigned int touch_pre = 0; > + unsigned int touch_post = 0; > + unsigned i; > + int ret = 0; > + > + for (i = 0; i < samples; i++) { > + unsigned int index = MX25_ADCQ_FIFO_ID(sample_buf[i]); > + unsigned int val = MX25_ADCQ_FIFO_DATA(sample_buf[i]); > + > + switch (index) { > + case 1: > + touch_pre = val; > + break; > + case 2: > + x_pos = val; > + break; > + case 3: > + y_pos = val; > + break; > + case 5: > + touch_post = val; > + break; > + default: > + ret = -EINVAL; > + break; > + } > + } > + > + if (ret == 0 && samples != 0) { > + /* > + * only if both touch measures are below a treshold, > + * the position is valid > + */ > + if (touch_pre < priv->pen_threshold && > + touch_post < priv->pen_threshold) { > + /* valid samples, generate a report */ > + x_pos /= priv->sample_count; > + y_pos /= priv->sample_count; > + input_report_abs(priv->idev, ABS_X, x_pos); > + input_report_abs(priv->idev, ABS_Y, y_pos); > + input_report_key(priv->idev, BTN_TOUCH, > + 0xfff - ((touch_pre + touch_post) / 2)); > + input_sync(priv->idev); > + > + /* get next sample */ > + mx25_tcq_force_queue_start(priv); > + mx25_tcq_enable_fifo_irq(priv); > + } else if (touch_pre >= priv->pen_threshold && > + touch_post >= priv->pen_threshold) { > + /* > + * if both samples are invalid, > + * generate a release report > + */ > + input_report_key(priv->idev, BTN_TOUCH, 0); > + input_sync(priv->idev); > + mx25_tcq_re_enable_touch_detection(priv); > + } else { > + /* > + * if only one of both touch measurements are > + * below the threshold, still some bouncing > + * happens. Take additional samples in this > + * case to be sure > + */ > + mx25_tcq_force_queue_start(priv); > + mx25_tcq_enable_fifo_irq(priv); > + } > + } > + > + return ret; > +} > + > +static irqreturn_t mx25_tcq_irq_thread(int irq, void *dev_id) > +{ > + struct mx25_tcq_priv *priv = (struct mx25_tcq_priv *) dev_id; > + u32 sample_buf[TSC_MAX_SAMPLES]; > + int samples = 0; > + > + /* read all samples */ > + while (1) { > + u32 stats; > + > + regmap_read(priv->regs, MX25_ADCQ_SR, &stats); > + if (stats & MX25_ADCQ_SR_EMPT) > + break; > + > + if (samples < TSC_MAX_SAMPLES) { > + regmap_read(priv->regs, MX25_ADCQ_FIFO, > + &sample_buf[samples]); > + ++samples; > + } else { > + u32 discarded; > + /* discard samples */ > + regmap_read(priv->regs, MX25_ADCQ_FIFO, &discarded); > + } > + } > + > + mx25_tcq_create_event_for_4wire(priv, sample_buf, samples); > + > + return IRQ_HANDLED; > +} > + > +static irqreturn_t mx25_tcq_irq(int irq, void *dev_id) > +{ > + struct mx25_tcq_priv *priv = (struct mx25_tcq_priv *)dev_id; > + u32 stat; > + int ret = IRQ_HANDLED; > + > + regmap_read(priv->regs, MX25_ADCQ_SR, &stat); > + > + if (stat & (MX25_ADCQ_SR_FRR | MX25_ADCQ_SR_FUR | MX25_ADCQ_SR_FOR)) > + mx25_tcq_fifo_reset(priv); > + > + if (stat & MX25_ADCQ_SR_PD) { > + mx25_tcq_disable_touch_irq(priv); > + mx25_tcq_force_queue_start(priv); > + mx25_tcq_enable_fifo_irq(priv); > + } > + > + if (stat & MX25_ADCQ_SR_FDRY) { > + mx25_tcq_disable_fifo_irq(priv); > + ret = IRQ_WAKE_THREAD; > + } > + > + regmap_update_bits(priv->regs, MX25_ADCQ_SR, MX25_ADCQ_SR_FRR | > + MX25_ADCQ_SR_FUR | MX25_ADCQ_SR_FOR | MX25_ADCQ_SR_PD | > + MX25_ADCQ_SR_EOQ, > + MX25_ADCQ_SR_FRR | > + MX25_ADCQ_SR_FUR | MX25_ADCQ_SR_FOR | MX25_ADCQ_SR_PD | > + MX25_ADCQ_SR_EOQ); > + > + return ret; > +} > + > +/* configure the statemachine for a 4-wire touchscreen */ > +static int mx25_tcq_init(struct mx25_tcq_priv *priv) > +{ > + u32 tgcr; > + unsigned int ipg_div; > + unsigned int adc_period; > + unsigned int debounce_cnt; > + unsigned int settling_time; > + int itemct; > + int ret; > + > + regmap_read(priv->core_regs, MX25_TSC_TGCR, &tgcr); > + ipg_div = max_t(unsigned int, 4, MX25_TGCR_GET_ADCCLK(tgcr)); > + adc_period = clk_get_rate(priv->clk) / (ipg_div * 2 + 2); > + debounce_cnt = DIV_ROUND_UP(priv->pen_debounce, adc_period * 8) - 1; > + settling_time = DIV_ROUND_UP(priv->settling_time, adc_period); > + > + > + /* Reset */ > + regmap_write(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_QRST | > + MX25_ADCQ_CR_FRST); > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_QRST | > + MX25_ADCQ_CR_FRST, 0); > + > + /* up to 128 * 8 ADC clocks are possible */ > + if (debounce_cnt > 127) > + debounce_cnt = 127; > + > + ret = imx25_setup_queue_4wire(priv, 0x0, &itemct); > + if (ret) > + return ret; > + > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_LITEMID_MASK | > + MX25_ADCQ_CR_WMRK_MASK, > + MX25_ADCQ_CR_LITEMID(itemct - 1) | > + MX25_ADCQ_CR_WMRK(priv->expected_samples - 1)); > + > + /* setup debounce count */ > + regmap_update_bits(priv->core_regs, MX25_TSC_TGCR, > + MX25_TGCR_PDBTIME_MASK, > + MX25_TGCR_PDBTIME(debounce_cnt)); > + > + /* enable debounce */ > + regmap_update_bits(priv->core_regs, MX25_TSC_TGCR, MX25_TGCR_PDBEN, > + MX25_TGCR_PDBEN); > + regmap_update_bits(priv->core_regs, MX25_TSC_TGCR, MX25_TGCR_PDEN, > + MX25_TGCR_PDEN); > + > + /* enable the engine on demand */ > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_QSM_FQS, > + MX25_ADCQ_CR_QSM_FQS); > + > + mx25_tcq_re_enable_touch_detection(priv); > + > + return 0; > +} > + > +static int mx25_tcq_parse_dt(struct platform_device *pdev, > + struct mx25_tcq_priv *priv) > +{ > + struct device_node *np = pdev->dev.of_node; > + u32 wires; > + int ret; > + > + /* Setup defaults */ > + priv->pen_threshold = 500; > + priv->sample_count = 3; > + priv->pen_debounce = 1000000; > + priv->settling_time = 250000; > + > + ret = of_property_read_u32(np, "fsl,wires", &wires); > + if (ret) { > + dev_err(&pdev->dev, "Failed to find fsl,wires properties\n"); > + return ret; > + } > + > + if (wires == 4) { > + priv->mode = MX25_TS_4WIRE; > + } else { > + dev_err(&pdev->dev, "%u-wire mode not supported\n", wires); > + return -EINVAL; > + } > + > + /* These are optional, we don't care about the return values */ > + of_property_read_u32(np, "fsl,pen-threshold", &priv->pen_threshold); > + of_property_read_u32(np, "fsl,settling-time", &priv->settling_time); > + of_property_read_u32(np, "fsl,pen-debounce", &priv->pen_debounce); > + > + return 0; > +} > + > +static int mx25_tcq_probe(struct platform_device *pdev) > +{ > + struct device *dev = &pdev->dev; > + struct input_dev *idev; > + struct mx25_tcq_priv *priv; > + struct resource *res; > + void __iomem *mem; > + int ret; > + int irq; > + > + priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); > + if (!priv) > + return -ENOMEM; > + > + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); Could this not in theory fail? > + mem = devm_ioremap_resource(dev, res); > + if (!mem) > + return -ENOMEM; > + > + ret = mx25_tcq_parse_dt(pdev, priv); > + if (ret) > + return ret; > + > + priv->regs = devm_regmap_init_mmio(dev, mem, &mx25_tcq_regconfig); > + if (IS_ERR(priv->regs)) { > + dev_err(dev, "Failed to initialize regmap\n"); > + return PTR_ERR(priv->regs); > + } > + > + irq = platform_get_irq(pdev, 0); > + if (irq <= 0) { > + dev_err(dev, "Failed to get IRQ\n"); > + return irq; > + } > + > + idev = devm_input_allocate_device(dev); > + if (!idev) { > + dev_err(dev, "Failed to allocate input device\n"); > + return -ENOMEM; > + } > + > + idev->name = mx25_tcq_name; > + idev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS); > + idev->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH); > + input_set_abs_params(idev, ABS_X, 0, 0xfff, 0, 0); > + input_set_abs_params(idev, ABS_Y, 0, 0xfff, 0, 0); > + > + idev->id.bustype = BUS_HOST; > + > + ret = input_register_device(idev); > + if (ret) { > + dev_err(dev, "Failed to register input device\n"); > + return ret; > + } > + > + priv->idev = idev; > + > + priv->core_regs = mx25_tsadc_get_regmap(pdev->dev.parent); > + priv->clk = mx25_tsadc_get_ipg(pdev->dev.parent); > + > + ret = clk_prepare_enable(priv->clk); > + if (ret) { > + dev_err(dev, "Failed to enable ipg clock\n"); > + return ret; > + } > + > + ret = devm_request_threaded_irq(dev, irq, mx25_tcq_irq, > + mx25_tcq_irq_thread, IRQF_ONESHOT, pdev->name, priv); > + if (ret) { > + dev_err(dev, "Failed requesting IRQ\n"); > + return ret; > + } This use of devm_request_threaded_irq strikes me as potentially dangerous as the order in removing the device has the clock being disabled before the interrupt is removed whereas for a simple unwinding they would be in the other order. > + > + ret = mx25_tcq_init(priv); > + if (ret) { > + dev_err(dev, "Failed to init tcq\n"); > + goto error_tcq_init; > + } > + > + platform_set_drvdata(pdev, priv); > + > + return 0; > + > +error_tcq_init: > + clk_disable_unprepare(priv->clk); > + return ret; > +} > + > +static int mx25_tcq_remove(struct platform_device *pdev) > +{ > + struct mx25_tcq_priv *priv = platform_get_drvdata(pdev); > + > + clk_disable_unprepare(priv->clk); > + > + return 0; > +} > + > +static struct platform_driver mx25_tcq_driver = { > + .driver = { > + .name = "mx25-tcq", > + .owner = THIS_MODULE, > + .of_match_table = mx25_tcq_ids, > + }, > + .probe = mx25_tcq_probe, > + .remove = mx25_tcq_remove, > +}; > +module_platform_driver(mx25_tcq_driver); > + > +MODULE_DESCRIPTION("TS input driver for Freescale mx25"); > +MODULE_AUTHOR("Markus Pargmann <mpa@pengutronix.de>"); > +MODULE_LICENSE("GPL v2"); > ^ permalink raw reply [flat|nested] 76+ messages in thread
* Re: [PATCH v2 2/6] input: touchscreen: imx25 tcq driver 2014-06-21 10:18 ` Jonathan Cameron @ 2014-06-21 19:55 ` Fabio Estevam -1 siblings, 0 replies; 76+ messages in thread From: Fabio Estevam @ 2014-06-21 19:55 UTC (permalink / raw) To: Jonathan Cameron Cc: Denis Carikli, Shawn Guo, Samuel Ortiz, Dmitry Torokhov, Eric Bénard, Sascha Hauer, linux-arm-kernel, Lee Jones, linux-input, linux-iio, Lars-Peter Clausen, Markus Pargmann On Sat, Jun 21, 2014 at 7:18 AM, Jonathan Cameron <jic23@kernel.org> wrote: >> + >> + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > > Could this not in theory fail? Yes, but devm_ioremap_resource will take care of it, so we don't need to check for error here. > >> + mem = devm_ioremap_resource(dev, res); >> + if (!mem) >> + return -ENOMEM; ^ permalink raw reply [flat|nested] 76+ messages in thread
* [PATCH v2 2/6] input: touchscreen: imx25 tcq driver @ 2014-06-21 19:55 ` Fabio Estevam 0 siblings, 0 replies; 76+ messages in thread From: Fabio Estevam @ 2014-06-21 19:55 UTC (permalink / raw) To: linux-arm-kernel On Sat, Jun 21, 2014 at 7:18 AM, Jonathan Cameron <jic23@kernel.org> wrote: >> + >> + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > > Could this not in theory fail? Yes, but devm_ioremap_resource will take care of it, so we don't need to check for error here. > >> + mem = devm_ioremap_resource(dev, res); >> + if (!mem) >> + return -ENOMEM; ^ permalink raw reply [flat|nested] 76+ messages in thread
[parent not found: <CAOMZO5BxZDX5TDZdUCbpTw2LpVC=vr4cnn4eSpzd_023wcy+Fg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>]
* Re: [PATCH v2 2/6] input: touchscreen: imx25 tcq driver 2014-06-21 19:55 ` Fabio Estevam (?) @ 2014-06-29 11:00 ` Jonathan Cameron -1 siblings, 0 replies; 76+ messages in thread From: Jonathan Cameron @ 2014-06-29 11:00 UTC (permalink / raw) To: Fabio Estevam Cc: Denis Carikli, Shawn Guo, Samuel Ortiz, Dmitry Torokhov, Eric Bénard, Sascha Hauer, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, Lee Jones, linux-input-u79uwXL29TY76Z2rM5mHXA, linux-iio-u79uwXL29TY76Z2rM5mHXA, Lars-Peter Clausen, Markus Pargmann On 21/06/14 20:55, Fabio Estevam wrote: > On Sat, Jun 21, 2014 at 7:18 AM, Jonathan Cameron <jic23-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> wrote: >>> + >>> + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); >> >> Could this not in theory fail? > > Yes, but devm_ioremap_resource will take care of it, so we don't need > to check for error here. Nothing like counter intuitive behaviour. Ah well. Thanks for explaining this! > >> >>> + mem = devm_ioremap_resource(dev, res); >>> + if (!mem) >>> + return -ENOMEM; ^ permalink raw reply [flat|nested] 76+ messages in thread
* [PATCH v2 2/6] input: touchscreen: imx25 tcq driver @ 2014-06-29 11:00 ` Jonathan Cameron 0 siblings, 0 replies; 76+ messages in thread From: Jonathan Cameron @ 2014-06-29 11:00 UTC (permalink / raw) To: linux-arm-kernel On 21/06/14 20:55, Fabio Estevam wrote: > On Sat, Jun 21, 2014 at 7:18 AM, Jonathan Cameron <jic23@kernel.org> wrote: >>> + >>> + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); >> >> Could this not in theory fail? > > Yes, but devm_ioremap_resource will take care of it, so we don't need > to check for error here. Nothing like counter intuitive behaviour. Ah well. Thanks for explaining this! > >> >>> + mem = devm_ioremap_resource(dev, res); >>> + if (!mem) >>> + return -ENOMEM; ^ permalink raw reply [flat|nested] 76+ messages in thread
* Re: [PATCH v2 2/6] input: touchscreen: imx25 tcq driver @ 2014-06-29 11:00 ` Jonathan Cameron 0 siblings, 0 replies; 76+ messages in thread From: Jonathan Cameron @ 2014-06-29 11:00 UTC (permalink / raw) To: Fabio Estevam Cc: Denis Carikli, Shawn Guo, Samuel Ortiz, Dmitry Torokhov, Eric Bénard, Sascha Hauer, linux-arm-kernel, Lee Jones, linux-input, linux-iio, Lars-Peter Clausen, Markus Pargmann On 21/06/14 20:55, Fabio Estevam wrote: > On Sat, Jun 21, 2014 at 7:18 AM, Jonathan Cameron <jic23@kernel.org> wrote: >>> + >>> + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); >> >> Could this not in theory fail? > > Yes, but devm_ioremap_resource will take care of it, so we don't need > to check for error here. Nothing like counter intuitive behaviour. Ah well. Thanks for explaining this! > >> >>> + mem = devm_ioremap_resource(dev, res); >>> + if (!mem) >>> + return -ENOMEM; ^ permalink raw reply [flat|nested] 76+ messages in thread
[parent not found: <53AFF1C4.1010402-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>]
* Re: [PATCH v2 2/6] input: touchscreen: imx25 tcq driver 2014-06-29 11:00 ` Jonathan Cameron (?) @ 2014-06-29 11:49 ` Russell King - ARM Linux -1 siblings, 0 replies; 76+ messages in thread From: Russell King - ARM Linux @ 2014-06-29 11:49 UTC (permalink / raw) To: Jonathan Cameron Cc: Fabio Estevam, Lars-Peter Clausen, Samuel Ortiz, Eric Bénard, linux-iio-u79uwXL29TY76Z2rM5mHXA, Dmitry Torokhov, Denis Carikli, Sascha Hauer, linux-input-u79uwXL29TY76Z2rM5mHXA, Markus Pargmann, Shawn Guo, Lee Jones, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r On Sun, Jun 29, 2014 at 12:00:20PM +0100, Jonathan Cameron wrote: > On 21/06/14 20:55, Fabio Estevam wrote: >> On Sat, Jun 21, 2014 at 7:18 AM, Jonathan Cameron <jic23-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> wrote: >>>> + >>>> + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); >>> >>> Could this not in theory fail? >> >> Yes, but devm_ioremap_resource will take care of it, so we don't need >> to check for error here. > Nothing like counter intuitive behaviour. Ah well. > > Thanks for explaining this! Maybe it would be better to have: mem = platform_ioremap_resource(pdev, IORESOURCE_MEM, 0); which wraps up both the platform_get_resource() call with devm_ioremap_resource() so driver writers don't have to be concerned about this aspect? -- FTTC broadband for 0.8mile line: now at 9.7Mbps down 460kbps up... slowly improving, and getting towards what was expected from it. ^ permalink raw reply [flat|nested] 76+ messages in thread
* [PATCH v2 2/6] input: touchscreen: imx25 tcq driver @ 2014-06-29 11:49 ` Russell King - ARM Linux 0 siblings, 0 replies; 76+ messages in thread From: Russell King - ARM Linux @ 2014-06-29 11:49 UTC (permalink / raw) To: linux-arm-kernel On Sun, Jun 29, 2014 at 12:00:20PM +0100, Jonathan Cameron wrote: > On 21/06/14 20:55, Fabio Estevam wrote: >> On Sat, Jun 21, 2014 at 7:18 AM, Jonathan Cameron <jic23@kernel.org> wrote: >>>> + >>>> + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); >>> >>> Could this not in theory fail? >> >> Yes, but devm_ioremap_resource will take care of it, so we don't need >> to check for error here. > Nothing like counter intuitive behaviour. Ah well. > > Thanks for explaining this! Maybe it would be better to have: mem = platform_ioremap_resource(pdev, IORESOURCE_MEM, 0); which wraps up both the platform_get_resource() call with devm_ioremap_resource() so driver writers don't have to be concerned about this aspect? -- FTTC broadband for 0.8mile line: now at 9.7Mbps down 460kbps up... slowly improving, and getting towards what was expected from it. ^ permalink raw reply [flat|nested] 76+ messages in thread
* Re: [PATCH v2 2/6] input: touchscreen: imx25 tcq driver @ 2014-06-29 11:49 ` Russell King - ARM Linux 0 siblings, 0 replies; 76+ messages in thread From: Russell King - ARM Linux @ 2014-06-29 11:49 UTC (permalink / raw) To: Jonathan Cameron Cc: Fabio Estevam, Lars-Peter Clausen, Samuel Ortiz, Eric Bénard, linux-iio, Dmitry Torokhov, Denis Carikli, Sascha Hauer, linux-input, Markus Pargmann, Shawn Guo, Lee Jones, linux-arm-kernel On Sun, Jun 29, 2014 at 12:00:20PM +0100, Jonathan Cameron wrote: > On 21/06/14 20:55, Fabio Estevam wrote: >> On Sat, Jun 21, 2014 at 7:18 AM, Jonathan Cameron <jic23@kernel.org> wrote: >>>> + >>>> + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); >>> >>> Could this not in theory fail? >> >> Yes, but devm_ioremap_resource will take care of it, so we don't need >> to check for error here. > Nothing like counter intuitive behaviour. Ah well. > > Thanks for explaining this! Maybe it would be better to have: mem = platform_ioremap_resource(pdev, IORESOURCE_MEM, 0); which wraps up both the platform_get_resource() call with devm_ioremap_resource() so driver writers don't have to be concerned about this aspect? -- FTTC broadband for 0.8mile line: now at 9.7Mbps down 460kbps up... slowly improving, and getting towards what was expected from it. ^ permalink raw reply [flat|nested] 76+ messages in thread
[parent not found: <20140629114901.GO32514-l+eeeJia6m9vn6HldHNs0ANdhmdF6hFW@public.gmane.org>]
* Re: [PATCH v2 2/6] input: touchscreen: imx25 tcq driver 2014-06-29 11:49 ` Russell King - ARM Linux (?) @ 2014-07-03 17:57 ` Jonathan Cameron -1 siblings, 0 replies; 76+ messages in thread From: Jonathan Cameron @ 2014-07-03 17:57 UTC (permalink / raw) To: Russell King - ARM Linux Cc: Fabio Estevam, Lars-Peter Clausen, Samuel Ortiz, Eric Bénard, linux-iio-u79uwXL29TY76Z2rM5mHXA, Dmitry Torokhov, Denis Carikli, Sascha Hauer, linux-input-u79uwXL29TY76Z2rM5mHXA, Markus Pargmann, Shawn Guo, Lee Jones, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r On 29/06/14 12:49, Russell King - ARM Linux wrote: > On Sun, Jun 29, 2014 at 12:00:20PM +0100, Jonathan Cameron wrote: >> On 21/06/14 20:55, Fabio Estevam wrote: >>> On Sat, Jun 21, 2014 at 7:18 AM, Jonathan Cameron <jic23-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> wrote: >>>>> + >>>>> + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); >>>> >>>> Could this not in theory fail? >>> >>> Yes, but devm_ioremap_resource will take care of it, so we don't need >>> to check for error here. >> Nothing like counter intuitive behaviour. Ah well. >> >> Thanks for explaining this! > > Maybe it would be better to have: > > mem = platform_ioremap_resource(pdev, IORESOURCE_MEM, 0); > > which wraps up both the platform_get_resource() call with > devm_ioremap_resource() so driver writers don't have to be concerned > about this aspect? > Good idea. Something like that would certainly make more sense to me. ^ permalink raw reply [flat|nested] 76+ messages in thread
* [PATCH v2 2/6] input: touchscreen: imx25 tcq driver @ 2014-07-03 17:57 ` Jonathan Cameron 0 siblings, 0 replies; 76+ messages in thread From: Jonathan Cameron @ 2014-07-03 17:57 UTC (permalink / raw) To: linux-arm-kernel On 29/06/14 12:49, Russell King - ARM Linux wrote: > On Sun, Jun 29, 2014 at 12:00:20PM +0100, Jonathan Cameron wrote: >> On 21/06/14 20:55, Fabio Estevam wrote: >>> On Sat, Jun 21, 2014 at 7:18 AM, Jonathan Cameron <jic23@kernel.org> wrote: >>>>> + >>>>> + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); >>>> >>>> Could this not in theory fail? >>> >>> Yes, but devm_ioremap_resource will take care of it, so we don't need >>> to check for error here. >> Nothing like counter intuitive behaviour. Ah well. >> >> Thanks for explaining this! > > Maybe it would be better to have: > > mem = platform_ioremap_resource(pdev, IORESOURCE_MEM, 0); > > which wraps up both the platform_get_resource() call with > devm_ioremap_resource() so driver writers don't have to be concerned > about this aspect? > Good idea. Something like that would certainly make more sense to me. ^ permalink raw reply [flat|nested] 76+ messages in thread
* Re: [PATCH v2 2/6] input: touchscreen: imx25 tcq driver @ 2014-07-03 17:57 ` Jonathan Cameron 0 siblings, 0 replies; 76+ messages in thread From: Jonathan Cameron @ 2014-07-03 17:57 UTC (permalink / raw) To: Russell King - ARM Linux Cc: Fabio Estevam, Lars-Peter Clausen, Samuel Ortiz, Eric Bénard, linux-iio, Dmitry Torokhov, Denis Carikli, Sascha Hauer, linux-input, Markus Pargmann, Shawn Guo, Lee Jones, linux-arm-kernel On 29/06/14 12:49, Russell King - ARM Linux wrote: > On Sun, Jun 29, 2014 at 12:00:20PM +0100, Jonathan Cameron wrote: >> On 21/06/14 20:55, Fabio Estevam wrote: >>> On Sat, Jun 21, 2014 at 7:18 AM, Jonathan Cameron <jic23@kernel.org> wrote: >>>>> + >>>>> + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); >>>> >>>> Could this not in theory fail? >>> >>> Yes, but devm_ioremap_resource will take care of it, so we don't need >>> to check for error here. >> Nothing like counter intuitive behaviour. Ah well. >> >> Thanks for explaining this! > > Maybe it would be better to have: > > mem = platform_ioremap_resource(pdev, IORESOURCE_MEM, 0); > > which wraps up both the platform_get_resource() call with > devm_ioremap_resource() so driver writers don't have to be concerned > about this aspect? > Good idea. Something like that would certainly make more sense to me. ^ permalink raw reply [flat|nested] 76+ messages in thread
* [PATCH v2 3/6] iio: adc: fsl,imx25-gcq driver 2014-06-13 15:21 ` Denis Carikli @ 2014-06-13 15:21 ` Denis Carikli -1 siblings, 0 replies; 76+ messages in thread From: Denis Carikli @ 2014-06-13 15:21 UTC (permalink / raw) To: Shawn Guo, Samuel Ortiz, Dmitry Torokhov, Jonathan Cameron Cc: Eric Bénard, Sascha Hauer, linux-arm-kernel, Lee Jones, linux-input, linux-iio, Fabio Estevam, Lars-Peter Clausen, Markus Pargmann, Denis Carikli From: Markus Pargmann <mpa@pengutronix.de> This is a conversion queue driver for the mx25 SoC. It uses the central ADC which is used by two seperate independent queues. This driver prepares different conversion configurations for each possible input. For a conversion it creates a conversionqueue of one item with the correct configuration for the chosen channel. It then executes the queue once and disables the conversion queue afterwards. The reference voltages are configurable through devicetree subnodes, depending on the connections of the ADC inputs. Signed-off-by: Markus Pargmann <mpa@pengutronix.de> Signed-off-by: Denis Carikli <denis@eukrea.com> --- .../devicetree/bindings/iio/adc/fsl,imx25-gcq.txt | 54 ++++ drivers/iio/adc/Kconfig | 7 + drivers/iio/adc/Makefile | 1 + drivers/iio/adc/fsl-imx25-gcq.c | 338 ++++++++++++++++++++ 4 files changed, 400 insertions(+) create mode 100644 Documentation/devicetree/bindings/iio/adc/fsl,imx25-gcq.txt create mode 100644 drivers/iio/adc/fsl-imx25-gcq.c diff --git a/Documentation/devicetree/bindings/iio/adc/fsl,imx25-gcq.txt b/Documentation/devicetree/bindings/iio/adc/fsl,imx25-gcq.txt new file mode 100644 index 0000000..333fc55 --- /dev/null +++ b/Documentation/devicetree/bindings/iio/adc/fsl,imx25-gcq.txt @@ -0,0 +1,54 @@ +Freescale i.MX25 ADC GCQ device + +This is a generic conversion queue device that can convert any of the analog +inputs using the ADC unit of the i.MX25. + +Required properties: + - compatible: Should be "fsl,imx25-gcq". + - reg: Should be the register range of the module. + - interrupts: Should be the interrupt number of the module. Typically this is <1>. + - interrupt-parent: phandle to the tsadc module of the i.MX25. + - #address-cells: Should be <1> (setting for the subnodes) + - #size-cells: Should be <0> (setting for the subnodes) + +Optionally you can define subnodes which define the positive and negative +reference voltage for one of the analog inputs. + +Required properties for subnodes: + - reg: Should be the number of the analog input. + 0: xp + 1: yp + 2: xn + 3: yn + 4: wiper + 5: inaux0 + 6: inaux1 + 7: inaux2 + - fsl,adc-refp: Positive reference input + 0: yp + 1: xp + 2: External reference + 3: Internal reference + - fsl,adc-refn: Negative reference input + 0: xn + 1: yn + 2: ngnd_adc + 3: ngnd_adc + + +Example: + + adc: adc@50030800 { + compatible = "fsl,imx25-gcq"; + reg = <0x50030800 0x60>; + interrupt-parent = <&tscadc>; + interrupts = <1>; + #address-cells = <1>; + #size-cells = <0>; + + inaux@5 { + reg = <5>; + fsl,adc-refp = <3>; + fsl,adc-refn = <3>; + }; + }; diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig index a80d236..58efb8d 100644 --- a/drivers/iio/adc/Kconfig +++ b/drivers/iio/adc/Kconfig @@ -125,6 +125,13 @@ config EXYNOS_ADC of SoCs for drivers such as the touchscreen and hwmon to use to share this resource. +config FSL_MX25_ADC + tristate "Freescale MX25 ADC driver" + depends on MFD_MX25_TSADC + help + Generic Conversion Queue driver used for general purpose ADC in the + MX25. This driver supports single measurements using the MX25 ADC. + config LP8788_ADC tristate "LP8788 ADC driver" depends on MFD_LP8788 diff --git a/drivers/iio/adc/Makefile b/drivers/iio/adc/Makefile index 9d60f2d..2767fd6 100644 --- a/drivers/iio/adc/Makefile +++ b/drivers/iio/adc/Makefile @@ -14,6 +14,7 @@ obj-$(CONFIG_AD7887) += ad7887.o obj-$(CONFIG_AD799X) += ad799x.o obj-$(CONFIG_AT91_ADC) += at91_adc.o obj-$(CONFIG_EXYNOS_ADC) += exynos_adc.o +obj-$(CONFIG_FSL_MX25_ADC) += fsl-imx25-gcq.o obj-$(CONFIG_LP8788_ADC) += lp8788_adc.o obj-$(CONFIG_MAX1363) += max1363.o obj-$(CONFIG_MCP320X) += mcp320x.o diff --git a/drivers/iio/adc/fsl-imx25-gcq.c b/drivers/iio/adc/fsl-imx25-gcq.c new file mode 100644 index 0000000..1ae697c --- /dev/null +++ b/drivers/iio/adc/fsl-imx25-gcq.c @@ -0,0 +1,338 @@ +/* + * Copyright 2014 Markus Pargmann, Pengutronix <mpa@pengutronix.de> + * + * The code contained herein is licensed under the GNU General Public + * License. You may obtain a copy of the GNU General Public License + * Version 2 or later at the following locations: + * + * http://www.opensource.org/licenses/gpl-license.html + * http://www.gnu.org/copyleft/gpl.html + * + * This is the driver for the imx25 GCQ (Generic Conversion Queue) + * connected to the imx25 ADC. + */ + +#include <linux/clk.h> +#include <linux/interrupt.h> +#include <linux/iio/iio.h> +#include <linux/mfd/imx25-tsadc.h> +#include <linux/module.h> +#include <linux/of.h> +#include <linux/platform_device.h> +#include <linux/regmap.h> + +#define MX25_GCQ_TIMEOUT (msecs_to_jiffies(2000)) + +enum mx25_gcq_cfgs { + MX25_CFG_XP = 0, + MX25_CFG_YP, + MX25_CFG_XN, + MX25_CFG_YN, + MX25_CFG_WIPER, + MX25_CFG_INAUX0, + MX25_CFG_INAUX1, + MX25_CFG_INAUX2, + MX25_NUM_CFGS, +}; + +struct mx25_gcq_priv { + struct regmap *regs; + struct completion completed; + unsigned int settling_time; + struct clk *clk; + int irq; +}; + +#define MX25_IIO_CHAN(chan, id) {\ + .type = IIO_VOLTAGE,\ + .indexed = 1,\ + .channel = chan,\ + .address = chan,\ + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \ + .datasheet_name = id, \ + } + +static const struct iio_chan_spec mx25_gcq_channels[MX25_NUM_CFGS] = { + MX25_IIO_CHAN(0, "xp"), + MX25_IIO_CHAN(1, "yp"), + MX25_IIO_CHAN(2, "xn"), + MX25_IIO_CHAN(3, "yn"), + MX25_IIO_CHAN(4, "wiper"), + MX25_IIO_CHAN(5, "inaux0"), + MX25_IIO_CHAN(6, "inaux1"), + MX25_IIO_CHAN(7, "inaux2"), +}; + +static void mx25_gcq_disable_eoq(struct mx25_gcq_priv *priv) +{ + regmap_update_bits(priv->regs, MX25_ADCQ_MR, MX25_ADCQ_MR_EOQ_IRQ, + MX25_ADCQ_MR_EOQ_IRQ); +} + +static void mx25_gcq_enable_eoq(struct mx25_gcq_priv *priv) +{ + regmap_update_bits(priv->regs, MX25_ADCQ_MR, MX25_ADCQ_MR_EOQ_IRQ, 0); +} + +static irqreturn_t mx25_gcq_irq(int irq, void *data) +{ + struct mx25_gcq_priv *priv = data; + u32 stats; + + regmap_read(priv->regs, MX25_ADCQ_SR, &stats); + + if (stats & MX25_ADCQ_SR_EOQ) { + mx25_gcq_disable_eoq(priv); + complete(&priv->completed); + } + + /* Disable conversion queue run */ + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FQS, 0); + + /* Acknowledge all possible irqs */ + regmap_write(priv->regs, MX25_ADCQ_SR, MX25_ADCQ_SR_FRR | + MX25_ADCQ_SR_FUR | MX25_ADCQ_SR_FOR | MX25_ADCQ_SR_EOQ | + MX25_ADCQ_SR_PD); + + return IRQ_HANDLED; +} + +static int mx25_gcq_read_raw(struct iio_dev *idev, + struct iio_chan_spec const *chan, int *val, int *val2, + long mask) +{ + struct mx25_gcq_priv *priv = iio_priv(idev); + unsigned long timeout; + u32 data; + int ret; + + if (mask != IIO_CHAN_INFO_RAW) + return -EINVAL; + + mutex_lock(&idev->mlock); + + /* Setup the configuration we want to use */ + regmap_write(priv->regs, MX25_ADCQ_ITEM_7_0, + MX25_ADCQ_ITEM(0, chan->address)); + + mx25_gcq_enable_eoq(priv); + + /* Trigger queue for one run */ + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FQS, + MX25_ADCQ_CR_FQS); + + timeout = wait_for_completion_interruptible_timeout(&priv->completed, + MX25_GCQ_TIMEOUT); + if (timeout < 0) { + dev_err(&idev->dev, "ADC wait for measurement failed\n"); + ret = timeout; + goto out; + } else if (timeout == 0) { + dev_err(&idev->dev, "ADC timed out\n"); + ret = -ETIMEDOUT; + goto out; + } + + regmap_read(priv->regs, MX25_ADCQ_FIFO, &data); + *val = MX25_ADCQ_FIFO_DATA(data); + + ret = IIO_VAL_INT; + +out: + mutex_unlock(&idev->mlock); + + return ret; +} + +static const struct iio_info mx25_gcq_iio_info = { + .read_raw = mx25_gcq_read_raw, +}; + +static const struct regmap_config mx25_gcq_regconfig = { + .max_register = 0x5c, + .reg_bits = 32, + .val_bits = 32, + .reg_stride = 4, +}; + +static int mx25_gcq_setup_cfgs(struct platform_device *pdev, + struct mx25_gcq_priv *priv) +{ + struct device_node *np = pdev->dev.of_node; + struct device_node *child; + struct device *dev = &pdev->dev; + int ret; + int i; + + /* Setup all configurations registers with a default conversion + * configuration for each input */ + for (i = 0; i != MX25_NUM_CFGS; ++i) + regmap_write(priv->regs, MX25_ADCQ_CFG(i), + MX25_ADCQ_CFG_YPLL_OFF | + MX25_ADCQ_CFG_XNUR_OFF | + MX25_ADCQ_CFG_XPUL_OFF | + MX25_ADCQ_CFG_REFP_INT | + (i << 4) | + MX25_ADCQ_CFG_REFN_NGND2); + + for_each_child_of_node(np, child) { + u32 reg; + u32 refn; + u32 refp; + + ret = of_property_read_u32(child, "reg", ®); + if (ret) { + dev_err(dev, "Failed to get reg property\n"); + return ret; + } + if (reg > MX25_NUM_CFGS) { + dev_err(dev, "reg value is greater than the number of available configuration registers\n"); + return -EINVAL; + } + + ret = of_property_read_u32(child, "fsl,adc-refn", &refn); + if (ret) { + dev_err(dev, "Failed to get fsl,adc-refn property\n"); + return ret; + } + if (refn < 0 || refn > 3) { + dev_err(dev, "Invalid fsl,adc-refn property value %d\n", + refn); + return -EINVAL + } + + ret = of_property_read_u32(child, "fsl,adc-refp", &refp); + if (ret) { + dev_err(dev, "Failed to get fsl,adc-refp property\n"); + return ret; + } + if (refp < 0 || refp > 3) { + dev_err(dev, "Invalid fsl,adc-refp property value %d\n", + refp); + return -EINVAL; + } + + regmap_update_bits(priv->regs, MX25_ADCQ_CFG(reg), + MX25_ADCQ_CFG_REFP_MASK | + MX25_ADCQ_CFG_REFN_MASK, + (refp << 7) | (refn << 2)); + } + regmap_update_bits(priv->regs, MX25_ADCQ_CR, + MX25_ADCQ_CR_FRST | MX25_ADCQ_CR_QRST, + MX25_ADCQ_CR_FRST | MX25_ADCQ_CR_QRST); + + regmap_write(priv->regs, MX25_ADCQ_CR, + MX25_ADCQ_CR_PDMSK | + MX25_ADCQ_CR_QSM_FQS); + + return 0; +} + +static int mx25_gcq_probe(struct platform_device *pdev) +{ + struct iio_dev *idev; + struct mx25_gcq_priv *priv; + struct resource *res; + struct device *dev = &pdev->dev; + int ret; + void __iomem *mem; + + idev = devm_iio_device_alloc(&pdev->dev, sizeof(*priv)); + if (!idev) + return -ENOMEM; + + priv = iio_priv(idev); + + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + mem = devm_ioremap_resource(dev, res); + if (!mem) + return -ENOMEM; + + priv->regs = devm_regmap_init_mmio(dev, mem, &mx25_gcq_regconfig); + if (IS_ERR(priv->regs)) { + dev_err(dev, "Failed to initialize regmap\n"); + return PTR_ERR(priv->regs); + } + + init_completion(&priv->completed); + + ret = mx25_gcq_setup_cfgs(pdev, priv); + if (ret) + goto err_irq_free; + + priv->clk = mx25_tsadc_get_ipg(pdev->dev.parent); + ret = clk_prepare_enable(priv->clk); + if (ret) { + dev_err(dev, "Failed to enable clock\n"); + return ret; + } + + priv->irq = platform_get_irq(pdev, 0); + if (priv->irq <= 0) { + dev_err(dev, "Failed to get IRQ\n"); + err = priv->irq; + goto err_clk_unprepare; + } + + ret = request_irq(priv->irq, mx25_gcq_irq, NULL, pdev->name, + priv); + if (ret) { + dev_err(dev, "Failed requesting IRQ\n"); + goto err_clk_unprepare; + } + + idev->dev.parent = &pdev->dev; + idev->channels = mx25_gcq_channels; + idev->num_channels = ARRAY_SIZE(mx25_gcq_channels); + idev->info = &mx25_gcq_iio_info; + + ret = iio_device_register(idev); + if (ret) { + dev_err(dev, "Failed to register iio device\n"); + goto err_irq_free; + } + + platform_set_drvdata(pdev, priv); + + return 0; + +err_irq_free: + free_irq(priv->irq, (void *)priv); + +err_clk_unprepare: + clk_disable_unprepare(priv->clk); + + return ret; +} + +static int mx25_gcq_remove(struct platform_device *pdev) +{ + struct mx25_gcq_priv *priv = platform_get_drvdata(pdev); + struct iio_dev *idev = iio_priv_to_dev(pdev); + + iio_device_unregister(idev); + free_irq(priv->irq, (void *)priv); + clk_disable_unprepare(priv->clk); + + return 0; +} + +static struct of_device_id mx25_gcq_ids[] = { + { .compatible = "fsl,imx25-gcq", }, + { /* Senitel */ } +}; + +static struct platform_driver mx25_gcq_driver = { + .driver = { + .name = "mx25-gcq", + .owner = THIS_MODULE, + .of_match_table = mx25_gcq_ids, + }, + .probe = mx25_gcq_probe, + .remove = mx25_gcq_remove, +}; +module_platform_driver(mx25_gcq_driver); + +MODULE_DESCRIPTION("ADC driver for Freescale mx25"); +MODULE_AUTHOR("Markus Pargmann <mpa@pengutronix.de>"); +MODULE_LICENSE("GPL v2"); -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 76+ messages in thread
* [PATCH v2 3/6] iio: adc: fsl,imx25-gcq driver @ 2014-06-13 15:21 ` Denis Carikli 0 siblings, 0 replies; 76+ messages in thread From: Denis Carikli @ 2014-06-13 15:21 UTC (permalink / raw) To: linux-arm-kernel From: Markus Pargmann <mpa@pengutronix.de> This is a conversion queue driver for the mx25 SoC. It uses the central ADC which is used by two seperate independent queues. This driver prepares different conversion configurations for each possible input. For a conversion it creates a conversionqueue of one item with the correct configuration for the chosen channel. It then executes the queue once and disables the conversion queue afterwards. The reference voltages are configurable through devicetree subnodes, depending on the connections of the ADC inputs. Signed-off-by: Markus Pargmann <mpa@pengutronix.de> Signed-off-by: Denis Carikli <denis@eukrea.com> --- .../devicetree/bindings/iio/adc/fsl,imx25-gcq.txt | 54 ++++ drivers/iio/adc/Kconfig | 7 + drivers/iio/adc/Makefile | 1 + drivers/iio/adc/fsl-imx25-gcq.c | 338 ++++++++++++++++++++ 4 files changed, 400 insertions(+) create mode 100644 Documentation/devicetree/bindings/iio/adc/fsl,imx25-gcq.txt create mode 100644 drivers/iio/adc/fsl-imx25-gcq.c diff --git a/Documentation/devicetree/bindings/iio/adc/fsl,imx25-gcq.txt b/Documentation/devicetree/bindings/iio/adc/fsl,imx25-gcq.txt new file mode 100644 index 0000000..333fc55 --- /dev/null +++ b/Documentation/devicetree/bindings/iio/adc/fsl,imx25-gcq.txt @@ -0,0 +1,54 @@ +Freescale i.MX25 ADC GCQ device + +This is a generic conversion queue device that can convert any of the analog +inputs using the ADC unit of the i.MX25. + +Required properties: + - compatible: Should be "fsl,imx25-gcq". + - reg: Should be the register range of the module. + - interrupts: Should be the interrupt number of the module. Typically this is <1>. + - interrupt-parent: phandle to the tsadc module of the i.MX25. + - #address-cells: Should be <1> (setting for the subnodes) + - #size-cells: Should be <0> (setting for the subnodes) + +Optionally you can define subnodes which define the positive and negative +reference voltage for one of the analog inputs. + +Required properties for subnodes: + - reg: Should be the number of the analog input. + 0: xp + 1: yp + 2: xn + 3: yn + 4: wiper + 5: inaux0 + 6: inaux1 + 7: inaux2 + - fsl,adc-refp: Positive reference input + 0: yp + 1: xp + 2: External reference + 3: Internal reference + - fsl,adc-refn: Negative reference input + 0: xn + 1: yn + 2: ngnd_adc + 3: ngnd_adc + + +Example: + + adc: adc at 50030800 { + compatible = "fsl,imx25-gcq"; + reg = <0x50030800 0x60>; + interrupt-parent = <&tscadc>; + interrupts = <1>; + #address-cells = <1>; + #size-cells = <0>; + + inaux at 5 { + reg = <5>; + fsl,adc-refp = <3>; + fsl,adc-refn = <3>; + }; + }; diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig index a80d236..58efb8d 100644 --- a/drivers/iio/adc/Kconfig +++ b/drivers/iio/adc/Kconfig @@ -125,6 +125,13 @@ config EXYNOS_ADC of SoCs for drivers such as the touchscreen and hwmon to use to share this resource. +config FSL_MX25_ADC + tristate "Freescale MX25 ADC driver" + depends on MFD_MX25_TSADC + help + Generic Conversion Queue driver used for general purpose ADC in the + MX25. This driver supports single measurements using the MX25 ADC. + config LP8788_ADC tristate "LP8788 ADC driver" depends on MFD_LP8788 diff --git a/drivers/iio/adc/Makefile b/drivers/iio/adc/Makefile index 9d60f2d..2767fd6 100644 --- a/drivers/iio/adc/Makefile +++ b/drivers/iio/adc/Makefile @@ -14,6 +14,7 @@ obj-$(CONFIG_AD7887) += ad7887.o obj-$(CONFIG_AD799X) += ad799x.o obj-$(CONFIG_AT91_ADC) += at91_adc.o obj-$(CONFIG_EXYNOS_ADC) += exynos_adc.o +obj-$(CONFIG_FSL_MX25_ADC) += fsl-imx25-gcq.o obj-$(CONFIG_LP8788_ADC) += lp8788_adc.o obj-$(CONFIG_MAX1363) += max1363.o obj-$(CONFIG_MCP320X) += mcp320x.o diff --git a/drivers/iio/adc/fsl-imx25-gcq.c b/drivers/iio/adc/fsl-imx25-gcq.c new file mode 100644 index 0000000..1ae697c --- /dev/null +++ b/drivers/iio/adc/fsl-imx25-gcq.c @@ -0,0 +1,338 @@ +/* + * Copyright 2014 Markus Pargmann, Pengutronix <mpa@pengutronix.de> + * + * The code contained herein is licensed under the GNU General Public + * License. You may obtain a copy of the GNU General Public License + * Version 2 or later at the following locations: + * + * http://www.opensource.org/licenses/gpl-license.html + * http://www.gnu.org/copyleft/gpl.html + * + * This is the driver for the imx25 GCQ (Generic Conversion Queue) + * connected to the imx25 ADC. + */ + +#include <linux/clk.h> +#include <linux/interrupt.h> +#include <linux/iio/iio.h> +#include <linux/mfd/imx25-tsadc.h> +#include <linux/module.h> +#include <linux/of.h> +#include <linux/platform_device.h> +#include <linux/regmap.h> + +#define MX25_GCQ_TIMEOUT (msecs_to_jiffies(2000)) + +enum mx25_gcq_cfgs { + MX25_CFG_XP = 0, + MX25_CFG_YP, + MX25_CFG_XN, + MX25_CFG_YN, + MX25_CFG_WIPER, + MX25_CFG_INAUX0, + MX25_CFG_INAUX1, + MX25_CFG_INAUX2, + MX25_NUM_CFGS, +}; + +struct mx25_gcq_priv { + struct regmap *regs; + struct completion completed; + unsigned int settling_time; + struct clk *clk; + int irq; +}; + +#define MX25_IIO_CHAN(chan, id) {\ + .type = IIO_VOLTAGE,\ + .indexed = 1,\ + .channel = chan,\ + .address = chan,\ + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \ + .datasheet_name = id, \ + } + +static const struct iio_chan_spec mx25_gcq_channels[MX25_NUM_CFGS] = { + MX25_IIO_CHAN(0, "xp"), + MX25_IIO_CHAN(1, "yp"), + MX25_IIO_CHAN(2, "xn"), + MX25_IIO_CHAN(3, "yn"), + MX25_IIO_CHAN(4, "wiper"), + MX25_IIO_CHAN(5, "inaux0"), + MX25_IIO_CHAN(6, "inaux1"), + MX25_IIO_CHAN(7, "inaux2"), +}; + +static void mx25_gcq_disable_eoq(struct mx25_gcq_priv *priv) +{ + regmap_update_bits(priv->regs, MX25_ADCQ_MR, MX25_ADCQ_MR_EOQ_IRQ, + MX25_ADCQ_MR_EOQ_IRQ); +} + +static void mx25_gcq_enable_eoq(struct mx25_gcq_priv *priv) +{ + regmap_update_bits(priv->regs, MX25_ADCQ_MR, MX25_ADCQ_MR_EOQ_IRQ, 0); +} + +static irqreturn_t mx25_gcq_irq(int irq, void *data) +{ + struct mx25_gcq_priv *priv = data; + u32 stats; + + regmap_read(priv->regs, MX25_ADCQ_SR, &stats); + + if (stats & MX25_ADCQ_SR_EOQ) { + mx25_gcq_disable_eoq(priv); + complete(&priv->completed); + } + + /* Disable conversion queue run */ + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FQS, 0); + + /* Acknowledge all possible irqs */ + regmap_write(priv->regs, MX25_ADCQ_SR, MX25_ADCQ_SR_FRR | + MX25_ADCQ_SR_FUR | MX25_ADCQ_SR_FOR | MX25_ADCQ_SR_EOQ | + MX25_ADCQ_SR_PD); + + return IRQ_HANDLED; +} + +static int mx25_gcq_read_raw(struct iio_dev *idev, + struct iio_chan_spec const *chan, int *val, int *val2, + long mask) +{ + struct mx25_gcq_priv *priv = iio_priv(idev); + unsigned long timeout; + u32 data; + int ret; + + if (mask != IIO_CHAN_INFO_RAW) + return -EINVAL; + + mutex_lock(&idev->mlock); + + /* Setup the configuration we want to use */ + regmap_write(priv->regs, MX25_ADCQ_ITEM_7_0, + MX25_ADCQ_ITEM(0, chan->address)); + + mx25_gcq_enable_eoq(priv); + + /* Trigger queue for one run */ + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FQS, + MX25_ADCQ_CR_FQS); + + timeout = wait_for_completion_interruptible_timeout(&priv->completed, + MX25_GCQ_TIMEOUT); + if (timeout < 0) { + dev_err(&idev->dev, "ADC wait for measurement failed\n"); + ret = timeout; + goto out; + } else if (timeout == 0) { + dev_err(&idev->dev, "ADC timed out\n"); + ret = -ETIMEDOUT; + goto out; + } + + regmap_read(priv->regs, MX25_ADCQ_FIFO, &data); + *val = MX25_ADCQ_FIFO_DATA(data); + + ret = IIO_VAL_INT; + +out: + mutex_unlock(&idev->mlock); + + return ret; +} + +static const struct iio_info mx25_gcq_iio_info = { + .read_raw = mx25_gcq_read_raw, +}; + +static const struct regmap_config mx25_gcq_regconfig = { + .max_register = 0x5c, + .reg_bits = 32, + .val_bits = 32, + .reg_stride = 4, +}; + +static int mx25_gcq_setup_cfgs(struct platform_device *pdev, + struct mx25_gcq_priv *priv) +{ + struct device_node *np = pdev->dev.of_node; + struct device_node *child; + struct device *dev = &pdev->dev; + int ret; + int i; + + /* Setup all configurations registers with a default conversion + * configuration for each input */ + for (i = 0; i != MX25_NUM_CFGS; ++i) + regmap_write(priv->regs, MX25_ADCQ_CFG(i), + MX25_ADCQ_CFG_YPLL_OFF | + MX25_ADCQ_CFG_XNUR_OFF | + MX25_ADCQ_CFG_XPUL_OFF | + MX25_ADCQ_CFG_REFP_INT | + (i << 4) | + MX25_ADCQ_CFG_REFN_NGND2); + + for_each_child_of_node(np, child) { + u32 reg; + u32 refn; + u32 refp; + + ret = of_property_read_u32(child, "reg", ®); + if (ret) { + dev_err(dev, "Failed to get reg property\n"); + return ret; + } + if (reg > MX25_NUM_CFGS) { + dev_err(dev, "reg value is greater than the number of available configuration registers\n"); + return -EINVAL; + } + + ret = of_property_read_u32(child, "fsl,adc-refn", &refn); + if (ret) { + dev_err(dev, "Failed to get fsl,adc-refn property\n"); + return ret; + } + if (refn < 0 || refn > 3) { + dev_err(dev, "Invalid fsl,adc-refn property value %d\n", + refn); + return -EINVAL + } + + ret = of_property_read_u32(child, "fsl,adc-refp", &refp); + if (ret) { + dev_err(dev, "Failed to get fsl,adc-refp property\n"); + return ret; + } + if (refp < 0 || refp > 3) { + dev_err(dev, "Invalid fsl,adc-refp property value %d\n", + refp); + return -EINVAL; + } + + regmap_update_bits(priv->regs, MX25_ADCQ_CFG(reg), + MX25_ADCQ_CFG_REFP_MASK | + MX25_ADCQ_CFG_REFN_MASK, + (refp << 7) | (refn << 2)); + } + regmap_update_bits(priv->regs, MX25_ADCQ_CR, + MX25_ADCQ_CR_FRST | MX25_ADCQ_CR_QRST, + MX25_ADCQ_CR_FRST | MX25_ADCQ_CR_QRST); + + regmap_write(priv->regs, MX25_ADCQ_CR, + MX25_ADCQ_CR_PDMSK | + MX25_ADCQ_CR_QSM_FQS); + + return 0; +} + +static int mx25_gcq_probe(struct platform_device *pdev) +{ + struct iio_dev *idev; + struct mx25_gcq_priv *priv; + struct resource *res; + struct device *dev = &pdev->dev; + int ret; + void __iomem *mem; + + idev = devm_iio_device_alloc(&pdev->dev, sizeof(*priv)); + if (!idev) + return -ENOMEM; + + priv = iio_priv(idev); + + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + mem = devm_ioremap_resource(dev, res); + if (!mem) + return -ENOMEM; + + priv->regs = devm_regmap_init_mmio(dev, mem, &mx25_gcq_regconfig); + if (IS_ERR(priv->regs)) { + dev_err(dev, "Failed to initialize regmap\n"); + return PTR_ERR(priv->regs); + } + + init_completion(&priv->completed); + + ret = mx25_gcq_setup_cfgs(pdev, priv); + if (ret) + goto err_irq_free; + + priv->clk = mx25_tsadc_get_ipg(pdev->dev.parent); + ret = clk_prepare_enable(priv->clk); + if (ret) { + dev_err(dev, "Failed to enable clock\n"); + return ret; + } + + priv->irq = platform_get_irq(pdev, 0); + if (priv->irq <= 0) { + dev_err(dev, "Failed to get IRQ\n"); + err = priv->irq; + goto err_clk_unprepare; + } + + ret = request_irq(priv->irq, mx25_gcq_irq, NULL, pdev->name, + priv); + if (ret) { + dev_err(dev, "Failed requesting IRQ\n"); + goto err_clk_unprepare; + } + + idev->dev.parent = &pdev->dev; + idev->channels = mx25_gcq_channels; + idev->num_channels = ARRAY_SIZE(mx25_gcq_channels); + idev->info = &mx25_gcq_iio_info; + + ret = iio_device_register(idev); + if (ret) { + dev_err(dev, "Failed to register iio device\n"); + goto err_irq_free; + } + + platform_set_drvdata(pdev, priv); + + return 0; + +err_irq_free: + free_irq(priv->irq, (void *)priv); + +err_clk_unprepare: + clk_disable_unprepare(priv->clk); + + return ret; +} + +static int mx25_gcq_remove(struct platform_device *pdev) +{ + struct mx25_gcq_priv *priv = platform_get_drvdata(pdev); + struct iio_dev *idev = iio_priv_to_dev(pdev); + + iio_device_unregister(idev); + free_irq(priv->irq, (void *)priv); + clk_disable_unprepare(priv->clk); + + return 0; +} + +static struct of_device_id mx25_gcq_ids[] = { + { .compatible = "fsl,imx25-gcq", }, + { /* Senitel */ } +}; + +static struct platform_driver mx25_gcq_driver = { + .driver = { + .name = "mx25-gcq", + .owner = THIS_MODULE, + .of_match_table = mx25_gcq_ids, + }, + .probe = mx25_gcq_probe, + .remove = mx25_gcq_remove, +}; +module_platform_driver(mx25_gcq_driver); + +MODULE_DESCRIPTION("ADC driver for Freescale mx25"); +MODULE_AUTHOR("Markus Pargmann <mpa@pengutronix.de>"); +MODULE_LICENSE("GPL v2"); -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 76+ messages in thread
* Re: [PATCH v2 3/6] iio: adc: fsl,imx25-gcq driver 2014-06-13 15:21 ` Denis Carikli @ 2014-06-14 19:27 ` Hartmut Knaack -1 siblings, 0 replies; 76+ messages in thread From: Hartmut Knaack @ 2014-06-14 19:27 UTC (permalink / raw) To: Denis Carikli, Shawn Guo, Samuel Ortiz, Dmitry Torokhov, Jonathan Cameron Cc: Eric Bénard, Sascha Hauer, linux-arm-kernel, Lee Jones, linux-input, linux-iio, Fabio Estevam, Lars-Peter Clausen, Markus Pargmann Denis Carikli schrieb: > From: Markus Pargmann <mpa@pengutronix.de> > > This is a conversion queue driver for the mx25 SoC. It uses the central > ADC which is used by two seperate independent queues. This driver > prepares different conversion configurations for each possible input. > For a conversion it creates a conversionqueue of one item with the > correct configuration for the chosen channel. It then executes the queue > once and disables the conversion queue afterwards. > > The reference voltages are configurable through devicetree subnodes, > depending on the connections of the ADC inputs. It has become pretty common to call instances of iio_dev indio_dev, thus making reviews a bit easier. Another comment inline. > Signed-off-by: Markus Pargmann <mpa@pengutronix.de> > Signed-off-by: Denis Carikli <denis@eukrea.com> > --- > .../devicetree/bindings/iio/adc/fsl,imx25-gcq.txt | 54 ++++ > drivers/iio/adc/Kconfig | 7 + > drivers/iio/adc/Makefile | 1 + > drivers/iio/adc/fsl-imx25-gcq.c | 338 ++++++++++++++++++++ > 4 files changed, 400 insertions(+) > create mode 100644 Documentation/devicetree/bindings/iio/adc/fsl,imx25-gcq.txt > create mode 100644 drivers/iio/adc/fsl-imx25-gcq.c > > diff --git a/Documentation/devicetree/bindings/iio/adc/fsl,imx25-gcq.txt b/Documentation/devicetree/bindings/iio/adc/fsl,imx25-gcq.txt > new file mode 100644 > index 0000000..333fc55 > --- /dev/null > +++ b/Documentation/devicetree/bindings/iio/adc/fsl,imx25-gcq.txt > @@ -0,0 +1,54 @@ > +Freescale i.MX25 ADC GCQ device > + > +This is a generic conversion queue device that can convert any of the analog > +inputs using the ADC unit of the i.MX25. > + > +Required properties: > + - compatible: Should be "fsl,imx25-gcq". > + - reg: Should be the register range of the module. > + - interrupts: Should be the interrupt number of the module. Typically this is <1>. > + - interrupt-parent: phandle to the tsadc module of the i.MX25. > + - #address-cells: Should be <1> (setting for the subnodes) > + - #size-cells: Should be <0> (setting for the subnodes) > + > +Optionally you can define subnodes which define the positive and negative > +reference voltage for one of the analog inputs. > + > +Required properties for subnodes: > + - reg: Should be the number of the analog input. > + 0: xp > + 1: yp > + 2: xn > + 3: yn > + 4: wiper > + 5: inaux0 > + 6: inaux1 > + 7: inaux2 > + - fsl,adc-refp: Positive reference input > + 0: yp > + 1: xp > + 2: External reference > + 3: Internal reference > + - fsl,adc-refn: Negative reference input > + 0: xn > + 1: yn > + 2: ngnd_adc > + 3: ngnd_adc > + > + > +Example: > + > + adc: adc@50030800 { > + compatible = "fsl,imx25-gcq"; > + reg = <0x50030800 0x60>; > + interrupt-parent = <&tscadc>; > + interrupts = <1>; > + #address-cells = <1>; > + #size-cells = <0>; > + > + inaux@5 { > + reg = <5>; > + fsl,adc-refp = <3>; > + fsl,adc-refn = <3>; > + }; > + }; > diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig > index a80d236..58efb8d 100644 > --- a/drivers/iio/adc/Kconfig > +++ b/drivers/iio/adc/Kconfig > @@ -125,6 +125,13 @@ config EXYNOS_ADC > of SoCs for drivers such as the touchscreen and hwmon to use to share > this resource. > > +config FSL_MX25_ADC > + tristate "Freescale MX25 ADC driver" > + depends on MFD_MX25_TSADC > + help > + Generic Conversion Queue driver used for general purpose ADC in the > + MX25. This driver supports single measurements using the MX25 ADC. > + > config LP8788_ADC > tristate "LP8788 ADC driver" > depends on MFD_LP8788 > diff --git a/drivers/iio/adc/Makefile b/drivers/iio/adc/Makefile > index 9d60f2d..2767fd6 100644 > --- a/drivers/iio/adc/Makefile > +++ b/drivers/iio/adc/Makefile > @@ -14,6 +14,7 @@ obj-$(CONFIG_AD7887) += ad7887.o > obj-$(CONFIG_AD799X) += ad799x.o > obj-$(CONFIG_AT91_ADC) += at91_adc.o > obj-$(CONFIG_EXYNOS_ADC) += exynos_adc.o > +obj-$(CONFIG_FSL_MX25_ADC) += fsl-imx25-gcq.o > obj-$(CONFIG_LP8788_ADC) += lp8788_adc.o > obj-$(CONFIG_MAX1363) += max1363.o > obj-$(CONFIG_MCP320X) += mcp320x.o > diff --git a/drivers/iio/adc/fsl-imx25-gcq.c b/drivers/iio/adc/fsl-imx25-gcq.c > new file mode 100644 > index 0000000..1ae697c > --- /dev/null > +++ b/drivers/iio/adc/fsl-imx25-gcq.c > @@ -0,0 +1,338 @@ > +/* > + * Copyright 2014 Markus Pargmann, Pengutronix <mpa@pengutronix.de> > + * > + * The code contained herein is licensed under the GNU General Public > + * License. You may obtain a copy of the GNU General Public License > + * Version 2 or later at the following locations: > + * > + * http://www.opensource.org/licenses/gpl-license.html > + * http://www.gnu.org/copyleft/gpl.html > + * > + * This is the driver for the imx25 GCQ (Generic Conversion Queue) > + * connected to the imx25 ADC. > + */ > + > +#include <linux/clk.h> > +#include <linux/interrupt.h> > +#include <linux/iio/iio.h> > +#include <linux/mfd/imx25-tsadc.h> > +#include <linux/module.h> > +#include <linux/of.h> > +#include <linux/platform_device.h> > +#include <linux/regmap.h> > + > +#define MX25_GCQ_TIMEOUT (msecs_to_jiffies(2000)) > + > +enum mx25_gcq_cfgs { > + MX25_CFG_XP = 0, > + MX25_CFG_YP, > + MX25_CFG_XN, > + MX25_CFG_YN, > + MX25_CFG_WIPER, > + MX25_CFG_INAUX0, > + MX25_CFG_INAUX1, > + MX25_CFG_INAUX2, > + MX25_NUM_CFGS, > +}; > + > +struct mx25_gcq_priv { > + struct regmap *regs; > + struct completion completed; > + unsigned int settling_time; > + struct clk *clk; > + int irq; > +}; > + > +#define MX25_IIO_CHAN(chan, id) {\ > + .type = IIO_VOLTAGE,\ > + .indexed = 1,\ > + .channel = chan,\ > + .address = chan,\ > + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \ > + .datasheet_name = id, \ > + } > + > +static const struct iio_chan_spec mx25_gcq_channels[MX25_NUM_CFGS] = { > + MX25_IIO_CHAN(0, "xp"), > + MX25_IIO_CHAN(1, "yp"), > + MX25_IIO_CHAN(2, "xn"), > + MX25_IIO_CHAN(3, "yn"), > + MX25_IIO_CHAN(4, "wiper"), > + MX25_IIO_CHAN(5, "inaux0"), > + MX25_IIO_CHAN(6, "inaux1"), > + MX25_IIO_CHAN(7, "inaux2"), > +}; > + > +static void mx25_gcq_disable_eoq(struct mx25_gcq_priv *priv) > +{ > + regmap_update_bits(priv->regs, MX25_ADCQ_MR, MX25_ADCQ_MR_EOQ_IRQ, > + MX25_ADCQ_MR_EOQ_IRQ); > +} > + > +static void mx25_gcq_enable_eoq(struct mx25_gcq_priv *priv) > +{ > + regmap_update_bits(priv->regs, MX25_ADCQ_MR, MX25_ADCQ_MR_EOQ_IRQ, 0); > +} > + > +static irqreturn_t mx25_gcq_irq(int irq, void *data) > +{ > + struct mx25_gcq_priv *priv = data; > + u32 stats; > + > + regmap_read(priv->regs, MX25_ADCQ_SR, &stats); > + > + if (stats & MX25_ADCQ_SR_EOQ) { > + mx25_gcq_disable_eoq(priv); > + complete(&priv->completed); > + } > + > + /* Disable conversion queue run */ > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FQS, 0); > + > + /* Acknowledge all possible irqs */ > + regmap_write(priv->regs, MX25_ADCQ_SR, MX25_ADCQ_SR_FRR | > + MX25_ADCQ_SR_FUR | MX25_ADCQ_SR_FOR | MX25_ADCQ_SR_EOQ | > + MX25_ADCQ_SR_PD); > + > + return IRQ_HANDLED; > +} > + > +static int mx25_gcq_read_raw(struct iio_dev *idev, > + struct iio_chan_spec const *chan, int *val, int *val2, > + long mask) > +{ > + struct mx25_gcq_priv *priv = iio_priv(idev); > + unsigned long timeout; > + u32 data; > + int ret; > + > + if (mask != IIO_CHAN_INFO_RAW) > + return -EINVAL; > + > + mutex_lock(&idev->mlock); > + > + /* Setup the configuration we want to use */ > + regmap_write(priv->regs, MX25_ADCQ_ITEM_7_0, > + MX25_ADCQ_ITEM(0, chan->address)); > + > + mx25_gcq_enable_eoq(priv); > + > + /* Trigger queue for one run */ > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FQS, > + MX25_ADCQ_CR_FQS); > + > + timeout = wait_for_completion_interruptible_timeout(&priv->completed, > + MX25_GCQ_TIMEOUT); > + if (timeout < 0) { > + dev_err(&idev->dev, "ADC wait for measurement failed\n"); > + ret = timeout; > + goto out; > + } else if (timeout == 0) { > + dev_err(&idev->dev, "ADC timed out\n"); > + ret = -ETIMEDOUT; > + goto out; > + } > + > + regmap_read(priv->regs, MX25_ADCQ_FIFO, &data); > + *val = MX25_ADCQ_FIFO_DATA(data); > + > + ret = IIO_VAL_INT; > + > +out: > + mutex_unlock(&idev->mlock); > + > + return ret; > +} > + > +static const struct iio_info mx25_gcq_iio_info = { > + .read_raw = mx25_gcq_read_raw, > +}; > + > +static const struct regmap_config mx25_gcq_regconfig = { > + .max_register = 0x5c, > + .reg_bits = 32, > + .val_bits = 32, > + .reg_stride = 4, > +}; > + > +static int mx25_gcq_setup_cfgs(struct platform_device *pdev, > + struct mx25_gcq_priv *priv) > +{ > + struct device_node *np = pdev->dev.of_node; > + struct device_node *child; > + struct device *dev = &pdev->dev; > + int ret; > + int i; > + > + /* Setup all configurations registers with a default conversion > + * configuration for each input */ > + for (i = 0; i != MX25_NUM_CFGS; ++i) Since you count up, check if i is smaller than MX25_NUM_CFGS. > + regmap_write(priv->regs, MX25_ADCQ_CFG(i), > + MX25_ADCQ_CFG_YPLL_OFF | > + MX25_ADCQ_CFG_XNUR_OFF | > + MX25_ADCQ_CFG_XPUL_OFF | > + MX25_ADCQ_CFG_REFP_INT | > + (i << 4) | > + MX25_ADCQ_CFG_REFN_NGND2); > + > + for_each_child_of_node(np, child) { > + u32 reg; > + u32 refn; > + u32 refp; > + > + ret = of_property_read_u32(child, "reg", ®); > + if (ret) { > + dev_err(dev, "Failed to get reg property\n"); > + return ret; > + } > + if (reg > MX25_NUM_CFGS) { > + dev_err(dev, "reg value is greater than the number of available configuration registers\n"); > + return -EINVAL; > + } > + > + ret = of_property_read_u32(child, "fsl,adc-refn", &refn); > + if (ret) { > + dev_err(dev, "Failed to get fsl,adc-refn property\n"); > + return ret; > + } > + if (refn < 0 || refn > 3) { > + dev_err(dev, "Invalid fsl,adc-refn property value %d\n", > + refn); > + return -EINVAL > + } > + > + ret = of_property_read_u32(child, "fsl,adc-refp", &refp); > + if (ret) { > + dev_err(dev, "Failed to get fsl,adc-refp property\n"); > + return ret; > + } > + if (refp < 0 || refp > 3) { > + dev_err(dev, "Invalid fsl,adc-refp property value %d\n", > + refp); > + return -EINVAL; > + } > + > + regmap_update_bits(priv->regs, MX25_ADCQ_CFG(reg), > + MX25_ADCQ_CFG_REFP_MASK | > + MX25_ADCQ_CFG_REFN_MASK, > + (refp << 7) | (refn << 2)); > + } > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, > + MX25_ADCQ_CR_FRST | MX25_ADCQ_CR_QRST, > + MX25_ADCQ_CR_FRST | MX25_ADCQ_CR_QRST); > + > + regmap_write(priv->regs, MX25_ADCQ_CR, > + MX25_ADCQ_CR_PDMSK | > + MX25_ADCQ_CR_QSM_FQS); > + > + return 0; > +} > + > +static int mx25_gcq_probe(struct platform_device *pdev) > +{ > + struct iio_dev *idev; > + struct mx25_gcq_priv *priv; > + struct resource *res; > + struct device *dev = &pdev->dev; > + int ret; > + void __iomem *mem; > + > + idev = devm_iio_device_alloc(&pdev->dev, sizeof(*priv)); > + if (!idev) > + return -ENOMEM; > + > + priv = iio_priv(idev); > + > + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > + mem = devm_ioremap_resource(dev, res); > + if (!mem) > + return -ENOMEM; > + > + priv->regs = devm_regmap_init_mmio(dev, mem, &mx25_gcq_regconfig); > + if (IS_ERR(priv->regs)) { > + dev_err(dev, "Failed to initialize regmap\n"); > + return PTR_ERR(priv->regs); > + } > + > + init_completion(&priv->completed); > + > + ret = mx25_gcq_setup_cfgs(pdev, priv); > + if (ret) > + goto err_irq_free; > + > + priv->clk = mx25_tsadc_get_ipg(pdev->dev.parent); > + ret = clk_prepare_enable(priv->clk); > + if (ret) { > + dev_err(dev, "Failed to enable clock\n"); > + return ret; > + } > + > + priv->irq = platform_get_irq(pdev, 0); > + if (priv->irq <= 0) { > + dev_err(dev, "Failed to get IRQ\n"); > + err = priv->irq; > + goto err_clk_unprepare; > + } > + > + ret = request_irq(priv->irq, mx25_gcq_irq, NULL, pdev->name, > + priv); > + if (ret) { > + dev_err(dev, "Failed requesting IRQ\n"); > + goto err_clk_unprepare; > + } > + > + idev->dev.parent = &pdev->dev; > + idev->channels = mx25_gcq_channels; > + idev->num_channels = ARRAY_SIZE(mx25_gcq_channels); > + idev->info = &mx25_gcq_iio_info; > + > + ret = iio_device_register(idev); > + if (ret) { > + dev_err(dev, "Failed to register iio device\n"); > + goto err_irq_free; > + } > + > + platform_set_drvdata(pdev, priv); > + > + return 0; > + > +err_irq_free: > + free_irq(priv->irq, (void *)priv); > + > +err_clk_unprepare: > + clk_disable_unprepare(priv->clk); > + > + return ret; > +} > + > +static int mx25_gcq_remove(struct platform_device *pdev) > +{ > + struct mx25_gcq_priv *priv = platform_get_drvdata(pdev); > + struct iio_dev *idev = iio_priv_to_dev(pdev); > + > + iio_device_unregister(idev); > + free_irq(priv->irq, (void *)priv); > + clk_disable_unprepare(priv->clk); > + > + return 0; > +} > + > +static struct of_device_id mx25_gcq_ids[] = { > + { .compatible = "fsl,imx25-gcq", }, > + { /* Senitel */ } > +}; > + > +static struct platform_driver mx25_gcq_driver = { > + .driver = { > + .name = "mx25-gcq", > + .owner = THIS_MODULE, > + .of_match_table = mx25_gcq_ids, > + }, > + .probe = mx25_gcq_probe, > + .remove = mx25_gcq_remove, > +}; > +module_platform_driver(mx25_gcq_driver); > + > +MODULE_DESCRIPTION("ADC driver for Freescale mx25"); > +MODULE_AUTHOR("Markus Pargmann <mpa@pengutronix.de>"); > +MODULE_LICENSE("GPL v2"); ^ permalink raw reply [flat|nested] 76+ messages in thread
* [PATCH v2 3/6] iio: adc: fsl,imx25-gcq driver @ 2014-06-14 19:27 ` Hartmut Knaack 0 siblings, 0 replies; 76+ messages in thread From: Hartmut Knaack @ 2014-06-14 19:27 UTC (permalink / raw) To: linux-arm-kernel Denis Carikli schrieb: > From: Markus Pargmann <mpa@pengutronix.de> > > This is a conversion queue driver for the mx25 SoC. It uses the central > ADC which is used by two seperate independent queues. This driver > prepares different conversion configurations for each possible input. > For a conversion it creates a conversionqueue of one item with the > correct configuration for the chosen channel. It then executes the queue > once and disables the conversion queue afterwards. > > The reference voltages are configurable through devicetree subnodes, > depending on the connections of the ADC inputs. It has become pretty common to call instances of iio_dev indio_dev, thus making reviews a bit easier. Another comment inline. > Signed-off-by: Markus Pargmann <mpa@pengutronix.de> > Signed-off-by: Denis Carikli <denis@eukrea.com> > --- > .../devicetree/bindings/iio/adc/fsl,imx25-gcq.txt | 54 ++++ > drivers/iio/adc/Kconfig | 7 + > drivers/iio/adc/Makefile | 1 + > drivers/iio/adc/fsl-imx25-gcq.c | 338 ++++++++++++++++++++ > 4 files changed, 400 insertions(+) > create mode 100644 Documentation/devicetree/bindings/iio/adc/fsl,imx25-gcq.txt > create mode 100644 drivers/iio/adc/fsl-imx25-gcq.c > > diff --git a/Documentation/devicetree/bindings/iio/adc/fsl,imx25-gcq.txt b/Documentation/devicetree/bindings/iio/adc/fsl,imx25-gcq.txt > new file mode 100644 > index 0000000..333fc55 > --- /dev/null > +++ b/Documentation/devicetree/bindings/iio/adc/fsl,imx25-gcq.txt > @@ -0,0 +1,54 @@ > +Freescale i.MX25 ADC GCQ device > + > +This is a generic conversion queue device that can convert any of the analog > +inputs using the ADC unit of the i.MX25. > + > +Required properties: > + - compatible: Should be "fsl,imx25-gcq". > + - reg: Should be the register range of the module. > + - interrupts: Should be the interrupt number of the module. Typically this is <1>. > + - interrupt-parent: phandle to the tsadc module of the i.MX25. > + - #address-cells: Should be <1> (setting for the subnodes) > + - #size-cells: Should be <0> (setting for the subnodes) > + > +Optionally you can define subnodes which define the positive and negative > +reference voltage for one of the analog inputs. > + > +Required properties for subnodes: > + - reg: Should be the number of the analog input. > + 0: xp > + 1: yp > + 2: xn > + 3: yn > + 4: wiper > + 5: inaux0 > + 6: inaux1 > + 7: inaux2 > + - fsl,adc-refp: Positive reference input > + 0: yp > + 1: xp > + 2: External reference > + 3: Internal reference > + - fsl,adc-refn: Negative reference input > + 0: xn > + 1: yn > + 2: ngnd_adc > + 3: ngnd_adc > + > + > +Example: > + > + adc: adc at 50030800 { > + compatible = "fsl,imx25-gcq"; > + reg = <0x50030800 0x60>; > + interrupt-parent = <&tscadc>; > + interrupts = <1>; > + #address-cells = <1>; > + #size-cells = <0>; > + > + inaux at 5 { > + reg = <5>; > + fsl,adc-refp = <3>; > + fsl,adc-refn = <3>; > + }; > + }; > diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig > index a80d236..58efb8d 100644 > --- a/drivers/iio/adc/Kconfig > +++ b/drivers/iio/adc/Kconfig > @@ -125,6 +125,13 @@ config EXYNOS_ADC > of SoCs for drivers such as the touchscreen and hwmon to use to share > this resource. > > +config FSL_MX25_ADC > + tristate "Freescale MX25 ADC driver" > + depends on MFD_MX25_TSADC > + help > + Generic Conversion Queue driver used for general purpose ADC in the > + MX25. This driver supports single measurements using the MX25 ADC. > + > config LP8788_ADC > tristate "LP8788 ADC driver" > depends on MFD_LP8788 > diff --git a/drivers/iio/adc/Makefile b/drivers/iio/adc/Makefile > index 9d60f2d..2767fd6 100644 > --- a/drivers/iio/adc/Makefile > +++ b/drivers/iio/adc/Makefile > @@ -14,6 +14,7 @@ obj-$(CONFIG_AD7887) += ad7887.o > obj-$(CONFIG_AD799X) += ad799x.o > obj-$(CONFIG_AT91_ADC) += at91_adc.o > obj-$(CONFIG_EXYNOS_ADC) += exynos_adc.o > +obj-$(CONFIG_FSL_MX25_ADC) += fsl-imx25-gcq.o > obj-$(CONFIG_LP8788_ADC) += lp8788_adc.o > obj-$(CONFIG_MAX1363) += max1363.o > obj-$(CONFIG_MCP320X) += mcp320x.o > diff --git a/drivers/iio/adc/fsl-imx25-gcq.c b/drivers/iio/adc/fsl-imx25-gcq.c > new file mode 100644 > index 0000000..1ae697c > --- /dev/null > +++ b/drivers/iio/adc/fsl-imx25-gcq.c > @@ -0,0 +1,338 @@ > +/* > + * Copyright 2014 Markus Pargmann, Pengutronix <mpa@pengutronix.de> > + * > + * The code contained herein is licensed under the GNU General Public > + * License. You may obtain a copy of the GNU General Public License > + * Version 2 or later at the following locations: > + * > + * http://www.opensource.org/licenses/gpl-license.html > + * http://www.gnu.org/copyleft/gpl.html > + * > + * This is the driver for the imx25 GCQ (Generic Conversion Queue) > + * connected to the imx25 ADC. > + */ > + > +#include <linux/clk.h> > +#include <linux/interrupt.h> > +#include <linux/iio/iio.h> > +#include <linux/mfd/imx25-tsadc.h> > +#include <linux/module.h> > +#include <linux/of.h> > +#include <linux/platform_device.h> > +#include <linux/regmap.h> > + > +#define MX25_GCQ_TIMEOUT (msecs_to_jiffies(2000)) > + > +enum mx25_gcq_cfgs { > + MX25_CFG_XP = 0, > + MX25_CFG_YP, > + MX25_CFG_XN, > + MX25_CFG_YN, > + MX25_CFG_WIPER, > + MX25_CFG_INAUX0, > + MX25_CFG_INAUX1, > + MX25_CFG_INAUX2, > + MX25_NUM_CFGS, > +}; > + > +struct mx25_gcq_priv { > + struct regmap *regs; > + struct completion completed; > + unsigned int settling_time; > + struct clk *clk; > + int irq; > +}; > + > +#define MX25_IIO_CHAN(chan, id) {\ > + .type = IIO_VOLTAGE,\ > + .indexed = 1,\ > + .channel = chan,\ > + .address = chan,\ > + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \ > + .datasheet_name = id, \ > + } > + > +static const struct iio_chan_spec mx25_gcq_channels[MX25_NUM_CFGS] = { > + MX25_IIO_CHAN(0, "xp"), > + MX25_IIO_CHAN(1, "yp"), > + MX25_IIO_CHAN(2, "xn"), > + MX25_IIO_CHAN(3, "yn"), > + MX25_IIO_CHAN(4, "wiper"), > + MX25_IIO_CHAN(5, "inaux0"), > + MX25_IIO_CHAN(6, "inaux1"), > + MX25_IIO_CHAN(7, "inaux2"), > +}; > + > +static void mx25_gcq_disable_eoq(struct mx25_gcq_priv *priv) > +{ > + regmap_update_bits(priv->regs, MX25_ADCQ_MR, MX25_ADCQ_MR_EOQ_IRQ, > + MX25_ADCQ_MR_EOQ_IRQ); > +} > + > +static void mx25_gcq_enable_eoq(struct mx25_gcq_priv *priv) > +{ > + regmap_update_bits(priv->regs, MX25_ADCQ_MR, MX25_ADCQ_MR_EOQ_IRQ, 0); > +} > + > +static irqreturn_t mx25_gcq_irq(int irq, void *data) > +{ > + struct mx25_gcq_priv *priv = data; > + u32 stats; > + > + regmap_read(priv->regs, MX25_ADCQ_SR, &stats); > + > + if (stats & MX25_ADCQ_SR_EOQ) { > + mx25_gcq_disable_eoq(priv); > + complete(&priv->completed); > + } > + > + /* Disable conversion queue run */ > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FQS, 0); > + > + /* Acknowledge all possible irqs */ > + regmap_write(priv->regs, MX25_ADCQ_SR, MX25_ADCQ_SR_FRR | > + MX25_ADCQ_SR_FUR | MX25_ADCQ_SR_FOR | MX25_ADCQ_SR_EOQ | > + MX25_ADCQ_SR_PD); > + > + return IRQ_HANDLED; > +} > + > +static int mx25_gcq_read_raw(struct iio_dev *idev, > + struct iio_chan_spec const *chan, int *val, int *val2, > + long mask) > +{ > + struct mx25_gcq_priv *priv = iio_priv(idev); > + unsigned long timeout; > + u32 data; > + int ret; > + > + if (mask != IIO_CHAN_INFO_RAW) > + return -EINVAL; > + > + mutex_lock(&idev->mlock); > + > + /* Setup the configuration we want to use */ > + regmap_write(priv->regs, MX25_ADCQ_ITEM_7_0, > + MX25_ADCQ_ITEM(0, chan->address)); > + > + mx25_gcq_enable_eoq(priv); > + > + /* Trigger queue for one run */ > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FQS, > + MX25_ADCQ_CR_FQS); > + > + timeout = wait_for_completion_interruptible_timeout(&priv->completed, > + MX25_GCQ_TIMEOUT); > + if (timeout < 0) { > + dev_err(&idev->dev, "ADC wait for measurement failed\n"); > + ret = timeout; > + goto out; > + } else if (timeout == 0) { > + dev_err(&idev->dev, "ADC timed out\n"); > + ret = -ETIMEDOUT; > + goto out; > + } > + > + regmap_read(priv->regs, MX25_ADCQ_FIFO, &data); > + *val = MX25_ADCQ_FIFO_DATA(data); > + > + ret = IIO_VAL_INT; > + > +out: > + mutex_unlock(&idev->mlock); > + > + return ret; > +} > + > +static const struct iio_info mx25_gcq_iio_info = { > + .read_raw = mx25_gcq_read_raw, > +}; > + > +static const struct regmap_config mx25_gcq_regconfig = { > + .max_register = 0x5c, > + .reg_bits = 32, > + .val_bits = 32, > + .reg_stride = 4, > +}; > + > +static int mx25_gcq_setup_cfgs(struct platform_device *pdev, > + struct mx25_gcq_priv *priv) > +{ > + struct device_node *np = pdev->dev.of_node; > + struct device_node *child; > + struct device *dev = &pdev->dev; > + int ret; > + int i; > + > + /* Setup all configurations registers with a default conversion > + * configuration for each input */ > + for (i = 0; i != MX25_NUM_CFGS; ++i) Since you count up, check if i is smaller than MX25_NUM_CFGS. > + regmap_write(priv->regs, MX25_ADCQ_CFG(i), > + MX25_ADCQ_CFG_YPLL_OFF | > + MX25_ADCQ_CFG_XNUR_OFF | > + MX25_ADCQ_CFG_XPUL_OFF | > + MX25_ADCQ_CFG_REFP_INT | > + (i << 4) | > + MX25_ADCQ_CFG_REFN_NGND2); > + > + for_each_child_of_node(np, child) { > + u32 reg; > + u32 refn; > + u32 refp; > + > + ret = of_property_read_u32(child, "reg", ®); > + if (ret) { > + dev_err(dev, "Failed to get reg property\n"); > + return ret; > + } > + if (reg > MX25_NUM_CFGS) { > + dev_err(dev, "reg value is greater than the number of available configuration registers\n"); > + return -EINVAL; > + } > + > + ret = of_property_read_u32(child, "fsl,adc-refn", &refn); > + if (ret) { > + dev_err(dev, "Failed to get fsl,adc-refn property\n"); > + return ret; > + } > + if (refn < 0 || refn > 3) { > + dev_err(dev, "Invalid fsl,adc-refn property value %d\n", > + refn); > + return -EINVAL > + } > + > + ret = of_property_read_u32(child, "fsl,adc-refp", &refp); > + if (ret) { > + dev_err(dev, "Failed to get fsl,adc-refp property\n"); > + return ret; > + } > + if (refp < 0 || refp > 3) { > + dev_err(dev, "Invalid fsl,adc-refp property value %d\n", > + refp); > + return -EINVAL; > + } > + > + regmap_update_bits(priv->regs, MX25_ADCQ_CFG(reg), > + MX25_ADCQ_CFG_REFP_MASK | > + MX25_ADCQ_CFG_REFN_MASK, > + (refp << 7) | (refn << 2)); > + } > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, > + MX25_ADCQ_CR_FRST | MX25_ADCQ_CR_QRST, > + MX25_ADCQ_CR_FRST | MX25_ADCQ_CR_QRST); > + > + regmap_write(priv->regs, MX25_ADCQ_CR, > + MX25_ADCQ_CR_PDMSK | > + MX25_ADCQ_CR_QSM_FQS); > + > + return 0; > +} > + > +static int mx25_gcq_probe(struct platform_device *pdev) > +{ > + struct iio_dev *idev; > + struct mx25_gcq_priv *priv; > + struct resource *res; > + struct device *dev = &pdev->dev; > + int ret; > + void __iomem *mem; > + > + idev = devm_iio_device_alloc(&pdev->dev, sizeof(*priv)); > + if (!idev) > + return -ENOMEM; > + > + priv = iio_priv(idev); > + > + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > + mem = devm_ioremap_resource(dev, res); > + if (!mem) > + return -ENOMEM; > + > + priv->regs = devm_regmap_init_mmio(dev, mem, &mx25_gcq_regconfig); > + if (IS_ERR(priv->regs)) { > + dev_err(dev, "Failed to initialize regmap\n"); > + return PTR_ERR(priv->regs); > + } > + > + init_completion(&priv->completed); > + > + ret = mx25_gcq_setup_cfgs(pdev, priv); > + if (ret) > + goto err_irq_free; > + > + priv->clk = mx25_tsadc_get_ipg(pdev->dev.parent); > + ret = clk_prepare_enable(priv->clk); > + if (ret) { > + dev_err(dev, "Failed to enable clock\n"); > + return ret; > + } > + > + priv->irq = platform_get_irq(pdev, 0); > + if (priv->irq <= 0) { > + dev_err(dev, "Failed to get IRQ\n"); > + err = priv->irq; > + goto err_clk_unprepare; > + } > + > + ret = request_irq(priv->irq, mx25_gcq_irq, NULL, pdev->name, > + priv); > + if (ret) { > + dev_err(dev, "Failed requesting IRQ\n"); > + goto err_clk_unprepare; > + } > + > + idev->dev.parent = &pdev->dev; > + idev->channels = mx25_gcq_channels; > + idev->num_channels = ARRAY_SIZE(mx25_gcq_channels); > + idev->info = &mx25_gcq_iio_info; > + > + ret = iio_device_register(idev); > + if (ret) { > + dev_err(dev, "Failed to register iio device\n"); > + goto err_irq_free; > + } > + > + platform_set_drvdata(pdev, priv); > + > + return 0; > + > +err_irq_free: > + free_irq(priv->irq, (void *)priv); > + > +err_clk_unprepare: > + clk_disable_unprepare(priv->clk); > + > + return ret; > +} > + > +static int mx25_gcq_remove(struct platform_device *pdev) > +{ > + struct mx25_gcq_priv *priv = platform_get_drvdata(pdev); > + struct iio_dev *idev = iio_priv_to_dev(pdev); > + > + iio_device_unregister(idev); > + free_irq(priv->irq, (void *)priv); > + clk_disable_unprepare(priv->clk); > + > + return 0; > +} > + > +static struct of_device_id mx25_gcq_ids[] = { > + { .compatible = "fsl,imx25-gcq", }, > + { /* Senitel */ } > +}; > + > +static struct platform_driver mx25_gcq_driver = { > + .driver = { > + .name = "mx25-gcq", > + .owner = THIS_MODULE, > + .of_match_table = mx25_gcq_ids, > + }, > + .probe = mx25_gcq_probe, > + .remove = mx25_gcq_remove, > +}; > +module_platform_driver(mx25_gcq_driver); > + > +MODULE_DESCRIPTION("ADC driver for Freescale mx25"); > +MODULE_AUTHOR("Markus Pargmann <mpa@pengutronix.de>"); > +MODULE_LICENSE("GPL v2"); ^ permalink raw reply [flat|nested] 76+ messages in thread
[parent not found: <1402672899-6995-4-git-send-email-denis-fO0SIAKYzcbQT0dZR+AlfA@public.gmane.org>]
* Re: [PATCH v2 3/6] iio: adc: fsl,imx25-gcq driver 2014-06-13 15:21 ` Denis Carikli (?) @ 2014-06-13 17:25 ` Peter Meerwald -1 siblings, 0 replies; 76+ messages in thread From: Peter Meerwald @ 2014-06-13 17:25 UTC (permalink / raw) To: Denis Carikli Cc: Shawn Guo, Samuel Ortiz, Dmitry Torokhov, Jonathan Cameron, Eric Bénard, Sascha Hauer, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, Lee Jones, linux-input-u79uwXL29TY76Z2rM5mHXA, linux-iio-u79uwXL29TY76Z2rM5mHXA, Fabio Estevam, Lars-Peter Clausen, Markus Pargmann > This is a conversion queue driver for the mx25 SoC. It uses the central > ADC which is used by two seperate independent queues. This driver > prepares different conversion configurations for each possible input. > For a conversion it creates a conversionqueue of one item with the > correct configuration for the chosen channel. It then executes the queue > once and disables the conversion queue afterwards. comments inline > Signed-off-by: Markus Pargmann <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> > Signed-off-by: Denis Carikli <denis-fO0SIAKYzcbQT0dZR+AlfA@public.gmane.org> > --- > .../devicetree/bindings/iio/adc/fsl,imx25-gcq.txt | 54 ++++ > drivers/iio/adc/Kconfig | 7 + > drivers/iio/adc/Makefile | 1 + > drivers/iio/adc/fsl-imx25-gcq.c | 338 ++++++++++++++++++++ > 4 files changed, 400 insertions(+) > create mode 100644 Documentation/devicetree/bindings/iio/adc/fsl,imx25-gcq.txt > create mode 100644 drivers/iio/adc/fsl-imx25-gcq.c > > diff --git a/Documentation/devicetree/bindings/iio/adc/fsl,imx25-gcq.txt b/Documentation/devicetree/bindings/iio/adc/fsl,imx25-gcq.txt > new file mode 100644 > index 0000000..333fc55 > --- /dev/null > +++ b/Documentation/devicetree/bindings/iio/adc/fsl,imx25-gcq.txt > @@ -0,0 +1,54 @@ > +Freescale i.MX25 ADC GCQ device > + > +This is a generic conversion queue device that can convert any of the analog > +inputs using the ADC unit of the i.MX25. > + > +Required properties: > + - compatible: Should be "fsl,imx25-gcq". > + - reg: Should be the register range of the module. > + - interrupts: Should be the interrupt number of the module. Typically this is <1>. > + - interrupt-parent: phandle to the tsadc module of the i.MX25. > + - #address-cells: Should be <1> (setting for the subnodes) > + - #size-cells: Should be <0> (setting for the subnodes) > + > +Optionally you can define subnodes which define the positive and negative > +reference voltage for one of the analog inputs. > + > +Required properties for subnodes: > + - reg: Should be the number of the analog input. > + 0: xp > + 1: yp > + 2: xn > + 3: yn > + 4: wiper > + 5: inaux0 > + 6: inaux1 > + 7: inaux2 > + - fsl,adc-refp: Positive reference input > + 0: yp > + 1: xp > + 2: External reference > + 3: Internal reference > + - fsl,adc-refn: Negative reference input > + 0: xn > + 1: yn > + 2: ngnd_adc > + 3: ngnd_adc > + > + > +Example: > + > + adc: adc@50030800 { > + compatible = "fsl,imx25-gcq"; > + reg = <0x50030800 0x60>; > + interrupt-parent = <&tscadc>; > + interrupts = <1>; > + #address-cells = <1>; > + #size-cells = <0>; > + > + inaux@5 { > + reg = <5>; > + fsl,adc-refp = <3>; > + fsl,adc-refn = <3>; > + }; > + }; > diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig > index a80d236..58efb8d 100644 > --- a/drivers/iio/adc/Kconfig > +++ b/drivers/iio/adc/Kconfig > @@ -125,6 +125,13 @@ config EXYNOS_ADC > of SoCs for drivers such as the touchscreen and hwmon to use to share > this resource. > > +config FSL_MX25_ADC > + tristate "Freescale MX25 ADC driver" > + depends on MFD_MX25_TSADC > + help > + Generic Conversion Queue driver used for general purpose ADC in the > + MX25. This driver supports single measurements using the MX25 ADC. > + > config LP8788_ADC > tristate "LP8788 ADC driver" > depends on MFD_LP8788 > diff --git a/drivers/iio/adc/Makefile b/drivers/iio/adc/Makefile > index 9d60f2d..2767fd6 100644 > --- a/drivers/iio/adc/Makefile > +++ b/drivers/iio/adc/Makefile > @@ -14,6 +14,7 @@ obj-$(CONFIG_AD7887) += ad7887.o > obj-$(CONFIG_AD799X) += ad799x.o > obj-$(CONFIG_AT91_ADC) += at91_adc.o > obj-$(CONFIG_EXYNOS_ADC) += exynos_adc.o > +obj-$(CONFIG_FSL_MX25_ADC) += fsl-imx25-gcq.o > obj-$(CONFIG_LP8788_ADC) += lp8788_adc.o > obj-$(CONFIG_MAX1363) += max1363.o > obj-$(CONFIG_MCP320X) += mcp320x.o > diff --git a/drivers/iio/adc/fsl-imx25-gcq.c b/drivers/iio/adc/fsl-imx25-gcq.c > new file mode 100644 > index 0000000..1ae697c > --- /dev/null > +++ b/drivers/iio/adc/fsl-imx25-gcq.c > @@ -0,0 +1,338 @@ > +/* > + * Copyright 2014 Markus Pargmann, Pengutronix <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> > + * > + * The code contained herein is licensed under the GNU General Public > + * License. You may obtain a copy of the GNU General Public License > + * Version 2 or later at the following locations: > + * > + * http://www.opensource.org/licenses/gpl-license.html > + * http://www.gnu.org/copyleft/gpl.html > + * > + * This is the driver for the imx25 GCQ (Generic Conversion Queue) > + * connected to the imx25 ADC. > + */ > + > +#include <linux/clk.h> > +#include <linux/interrupt.h> > +#include <linux/iio/iio.h> > +#include <linux/mfd/imx25-tsadc.h> > +#include <linux/module.h> > +#include <linux/of.h> > +#include <linux/platform_device.h> > +#include <linux/regmap.h> > + > +#define MX25_GCQ_TIMEOUT (msecs_to_jiffies(2000)) > + > +enum mx25_gcq_cfgs { > + MX25_CFG_XP = 0, > + MX25_CFG_YP, > + MX25_CFG_XN, > + MX25_CFG_YN, > + MX25_CFG_WIPER, > + MX25_CFG_INAUX0, > + MX25_CFG_INAUX1, > + MX25_CFG_INAUX2, > + MX25_NUM_CFGS, > +}; > + > +struct mx25_gcq_priv { > + struct regmap *regs; > + struct completion completed; > + unsigned int settling_time; > + struct clk *clk; > + int irq; > +}; > + > +#define MX25_IIO_CHAN(chan, id) {\ prefix should be MX25_GCQ_ > + .type = IIO_VOLTAGE,\ > + .indexed = 1,\ > + .channel = chan,\ > + .address = chan,\ don't set .address and use .channel instead > + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \ > + .datasheet_name = id, \ > + } > + > +static const struct iio_chan_spec mx25_gcq_channels[MX25_NUM_CFGS] = { > + MX25_IIO_CHAN(0, "xp"), > + MX25_IIO_CHAN(1, "yp"), > + MX25_IIO_CHAN(2, "xn"), > + MX25_IIO_CHAN(3, "yn"), > + MX25_IIO_CHAN(4, "wiper"), > + MX25_IIO_CHAN(5, "inaux0"), > + MX25_IIO_CHAN(6, "inaux1"), > + MX25_IIO_CHAN(7, "inaux2"), > +}; > + > +static void mx25_gcq_disable_eoq(struct mx25_gcq_priv *priv) > +{ > + regmap_update_bits(priv->regs, MX25_ADCQ_MR, MX25_ADCQ_MR_EOQ_IRQ, > + MX25_ADCQ_MR_EOQ_IRQ); > +} > + > +static void mx25_gcq_enable_eoq(struct mx25_gcq_priv *priv) > +{ > + regmap_update_bits(priv->regs, MX25_ADCQ_MR, MX25_ADCQ_MR_EOQ_IRQ, 0); > +} > + > +static irqreturn_t mx25_gcq_irq(int irq, void *data) > +{ > + struct mx25_gcq_priv *priv = data; > + u32 stats; > + > + regmap_read(priv->regs, MX25_ADCQ_SR, &stats); > + > + if (stats & MX25_ADCQ_SR_EOQ) { > + mx25_gcq_disable_eoq(priv); > + complete(&priv->completed); > + } > + > + /* Disable conversion queue run */ > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FQS, 0); > + > + /* Acknowledge all possible irqs */ > + regmap_write(priv->regs, MX25_ADCQ_SR, MX25_ADCQ_SR_FRR | > + MX25_ADCQ_SR_FUR | MX25_ADCQ_SR_FOR | MX25_ADCQ_SR_EOQ | > + MX25_ADCQ_SR_PD); > + > + return IRQ_HANDLED; > +} > + > +static int mx25_gcq_read_raw(struct iio_dev *idev, > + struct iio_chan_spec const *chan, int *val, int *val2, > + long mask) > +{ > + struct mx25_gcq_priv *priv = iio_priv(idev); > + unsigned long timeout; this should be long, not unsigned long; see return of wait_for_completion_interruptible_timeout() > + u32 data; > + int ret; > + > + if (mask != IIO_CHAN_INFO_RAW) > + return -EINVAL; > + > + mutex_lock(&idev->mlock); > + > + /* Setup the configuration we want to use */ > + regmap_write(priv->regs, MX25_ADCQ_ITEM_7_0, > + MX25_ADCQ_ITEM(0, chan->address)); chan->channel > + > + mx25_gcq_enable_eoq(priv); > + > + /* Trigger queue for one run */ > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FQS, > + MX25_ADCQ_CR_FQS); > + > + timeout = wait_for_completion_interruptible_timeout(&priv->completed, > + MX25_GCQ_TIMEOUT); > + if (timeout < 0) { > + dev_err(&idev->dev, "ADC wait for measurement failed\n"); > + ret = timeout; > + goto out; > + } else if (timeout == 0) { > + dev_err(&idev->dev, "ADC timed out\n"); > + ret = -ETIMEDOUT; > + goto out; > + } > + > + regmap_read(priv->regs, MX25_ADCQ_FIFO, &data); this ignores the return value > + *val = MX25_ADCQ_FIFO_DATA(data); > + > + ret = IIO_VAL_INT; > + > +out: > + mutex_unlock(&idev->mlock); > + > + return ret; > +} > + > +static const struct iio_info mx25_gcq_iio_info = { > + .read_raw = mx25_gcq_read_raw, > +}; > + > +static const struct regmap_config mx25_gcq_regconfig = { > + .max_register = 0x5c, > + .reg_bits = 32, > + .val_bits = 32, > + .reg_stride = 4, > +}; > + > +static int mx25_gcq_setup_cfgs(struct platform_device *pdev, > + struct mx25_gcq_priv *priv) > +{ > + struct device_node *np = pdev->dev.of_node; > + struct device_node *child; > + struct device *dev = &pdev->dev; > + int ret; > + int i; > + > + /* Setup all configurations registers with a default conversion > + * configuration for each input */ multi-line comment style > + for (i = 0; i != MX25_NUM_CFGS; ++i) > + regmap_write(priv->regs, MX25_ADCQ_CFG(i), > + MX25_ADCQ_CFG_YPLL_OFF | > + MX25_ADCQ_CFG_XNUR_OFF | > + MX25_ADCQ_CFG_XPUL_OFF | > + MX25_ADCQ_CFG_REFP_INT | > + (i << 4) | > + MX25_ADCQ_CFG_REFN_NGND2); > + > + for_each_child_of_node(np, child) { > + u32 reg; > + u32 refn; > + u32 refp; > + > + ret = of_property_read_u32(child, "reg", ®); > + if (ret) { > + dev_err(dev, "Failed to get reg property\n"); > + return ret; > + } > + if (reg > MX25_NUM_CFGS) { >= probably > + dev_err(dev, "reg value is greater than the number of available configuration registers\n"); > + return -EINVAL; > + } > + > + ret = of_property_read_u32(child, "fsl,adc-refn", &refn); > + if (ret) { > + dev_err(dev, "Failed to get fsl,adc-refn property\n"); > + return ret; > + } > + if (refn < 0 || refn > 3) { > + dev_err(dev, "Invalid fsl,adc-refn property value %d\n", > + refn); > + return -EINVAL > + } > + > + ret = of_property_read_u32(child, "fsl,adc-refp", &refp); > + if (ret) { > + dev_err(dev, "Failed to get fsl,adc-refp property\n"); > + return ret; > + } > + if (refp < 0 || refp > 3) { > + dev_err(dev, "Invalid fsl,adc-refp property value %d\n", > + refp); > + return -EINVAL; > + } > + > + regmap_update_bits(priv->regs, MX25_ADCQ_CFG(reg), > + MX25_ADCQ_CFG_REFP_MASK | > + MX25_ADCQ_CFG_REFN_MASK, > + (refp << 7) | (refn << 2)); > + } > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, > + MX25_ADCQ_CR_FRST | MX25_ADCQ_CR_QRST, > + MX25_ADCQ_CR_FRST | MX25_ADCQ_CR_QRST); > + > + regmap_write(priv->regs, MX25_ADCQ_CR, > + MX25_ADCQ_CR_PDMSK | > + MX25_ADCQ_CR_QSM_FQS); > + > + return 0; > +} > + > +static int mx25_gcq_probe(struct platform_device *pdev) > +{ > + struct iio_dev *idev; > + struct mx25_gcq_priv *priv; > + struct resource *res; > + struct device *dev = &pdev->dev; > + int ret; > + void __iomem *mem; > + > + idev = devm_iio_device_alloc(&pdev->dev, sizeof(*priv)); > + if (!idev) > + return -ENOMEM; > + > + priv = iio_priv(idev); > + > + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > + mem = devm_ioremap_resource(dev, res); > + if (!mem) > + return -ENOMEM; > + > + priv->regs = devm_regmap_init_mmio(dev, mem, &mx25_gcq_regconfig); > + if (IS_ERR(priv->regs)) { > + dev_err(dev, "Failed to initialize regmap\n"); > + return PTR_ERR(priv->regs); > + } > + > + init_completion(&priv->completed); > + > + ret = mx25_gcq_setup_cfgs(pdev, priv); > + if (ret) > + goto err_irq_free; > + > + priv->clk = mx25_tsadc_get_ipg(pdev->dev.parent); > + ret = clk_prepare_enable(priv->clk); > + if (ret) { > + dev_err(dev, "Failed to enable clock\n"); > + return ret; > + } > + > + priv->irq = platform_get_irq(pdev, 0); > + if (priv->irq <= 0) { > + dev_err(dev, "Failed to get IRQ\n"); > + err = priv->irq; > + goto err_clk_unprepare; > + } > + > + ret = request_irq(priv->irq, mx25_gcq_irq, NULL, pdev->name, > + priv); > + if (ret) { > + dev_err(dev, "Failed requesting IRQ\n"); > + goto err_clk_unprepare; > + } > + > + idev->dev.parent = &pdev->dev; > + idev->channels = mx25_gcq_channels; > + idev->num_channels = ARRAY_SIZE(mx25_gcq_channels); > + idev->info = &mx25_gcq_iio_info; > + > + ret = iio_device_register(idev); > + if (ret) { > + dev_err(dev, "Failed to register iio device\n"); > + goto err_irq_free; > + } > + > + platform_set_drvdata(pdev, priv); > + > + return 0; > + > +err_irq_free: > + free_irq(priv->irq, (void *)priv); > + > +err_clk_unprepare: > + clk_disable_unprepare(priv->clk); > + > + return ret; > +} > + > +static int mx25_gcq_remove(struct platform_device *pdev) > +{ > + struct mx25_gcq_priv *priv = platform_get_drvdata(pdev); > + struct iio_dev *idev = iio_priv_to_dev(pdev); > + > + iio_device_unregister(idev); > + free_irq(priv->irq, (void *)priv); > + clk_disable_unprepare(priv->clk); > + > + return 0; > +} > + > +static struct of_device_id mx25_gcq_ids[] = { > + { .compatible = "fsl,imx25-gcq", }, > + { /* Senitel */ } Sentinel > +}; > + > +static struct platform_driver mx25_gcq_driver = { > + .driver = { > + .name = "mx25-gcq", > + .owner = THIS_MODULE, > + .of_match_table = mx25_gcq_ids, > + }, > + .probe = mx25_gcq_probe, > + .remove = mx25_gcq_remove, > +}; > +module_platform_driver(mx25_gcq_driver); > + > +MODULE_DESCRIPTION("ADC driver for Freescale mx25"); > +MODULE_AUTHOR("Markus Pargmann <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>"); > +MODULE_LICENSE("GPL v2"); > -- Peter Meerwald +43-664-2444418 (mobile) ^ permalink raw reply [flat|nested] 76+ messages in thread
* [PATCH v2 3/6] iio: adc: fsl,imx25-gcq driver @ 2014-06-13 17:25 ` Peter Meerwald 0 siblings, 0 replies; 76+ messages in thread From: Peter Meerwald @ 2014-06-13 17:25 UTC (permalink / raw) To: linux-arm-kernel > This is a conversion queue driver for the mx25 SoC. It uses the central > ADC which is used by two seperate independent queues. This driver > prepares different conversion configurations for each possible input. > For a conversion it creates a conversionqueue of one item with the > correct configuration for the chosen channel. It then executes the queue > once and disables the conversion queue afterwards. comments inline > Signed-off-by: Markus Pargmann <mpa@pengutronix.de> > Signed-off-by: Denis Carikli <denis@eukrea.com> > --- > .../devicetree/bindings/iio/adc/fsl,imx25-gcq.txt | 54 ++++ > drivers/iio/adc/Kconfig | 7 + > drivers/iio/adc/Makefile | 1 + > drivers/iio/adc/fsl-imx25-gcq.c | 338 ++++++++++++++++++++ > 4 files changed, 400 insertions(+) > create mode 100644 Documentation/devicetree/bindings/iio/adc/fsl,imx25-gcq.txt > create mode 100644 drivers/iio/adc/fsl-imx25-gcq.c > > diff --git a/Documentation/devicetree/bindings/iio/adc/fsl,imx25-gcq.txt b/Documentation/devicetree/bindings/iio/adc/fsl,imx25-gcq.txt > new file mode 100644 > index 0000000..333fc55 > --- /dev/null > +++ b/Documentation/devicetree/bindings/iio/adc/fsl,imx25-gcq.txt > @@ -0,0 +1,54 @@ > +Freescale i.MX25 ADC GCQ device > + > +This is a generic conversion queue device that can convert any of the analog > +inputs using the ADC unit of the i.MX25. > + > +Required properties: > + - compatible: Should be "fsl,imx25-gcq". > + - reg: Should be the register range of the module. > + - interrupts: Should be the interrupt number of the module. Typically this is <1>. > + - interrupt-parent: phandle to the tsadc module of the i.MX25. > + - #address-cells: Should be <1> (setting for the subnodes) > + - #size-cells: Should be <0> (setting for the subnodes) > + > +Optionally you can define subnodes which define the positive and negative > +reference voltage for one of the analog inputs. > + > +Required properties for subnodes: > + - reg: Should be the number of the analog input. > + 0: xp > + 1: yp > + 2: xn > + 3: yn > + 4: wiper > + 5: inaux0 > + 6: inaux1 > + 7: inaux2 > + - fsl,adc-refp: Positive reference input > + 0: yp > + 1: xp > + 2: External reference > + 3: Internal reference > + - fsl,adc-refn: Negative reference input > + 0: xn > + 1: yn > + 2: ngnd_adc > + 3: ngnd_adc > + > + > +Example: > + > + adc: adc at 50030800 { > + compatible = "fsl,imx25-gcq"; > + reg = <0x50030800 0x60>; > + interrupt-parent = <&tscadc>; > + interrupts = <1>; > + #address-cells = <1>; > + #size-cells = <0>; > + > + inaux at 5 { > + reg = <5>; > + fsl,adc-refp = <3>; > + fsl,adc-refn = <3>; > + }; > + }; > diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig > index a80d236..58efb8d 100644 > --- a/drivers/iio/adc/Kconfig > +++ b/drivers/iio/adc/Kconfig > @@ -125,6 +125,13 @@ config EXYNOS_ADC > of SoCs for drivers such as the touchscreen and hwmon to use to share > this resource. > > +config FSL_MX25_ADC > + tristate "Freescale MX25 ADC driver" > + depends on MFD_MX25_TSADC > + help > + Generic Conversion Queue driver used for general purpose ADC in the > + MX25. This driver supports single measurements using the MX25 ADC. > + > config LP8788_ADC > tristate "LP8788 ADC driver" > depends on MFD_LP8788 > diff --git a/drivers/iio/adc/Makefile b/drivers/iio/adc/Makefile > index 9d60f2d..2767fd6 100644 > --- a/drivers/iio/adc/Makefile > +++ b/drivers/iio/adc/Makefile > @@ -14,6 +14,7 @@ obj-$(CONFIG_AD7887) += ad7887.o > obj-$(CONFIG_AD799X) += ad799x.o > obj-$(CONFIG_AT91_ADC) += at91_adc.o > obj-$(CONFIG_EXYNOS_ADC) += exynos_adc.o > +obj-$(CONFIG_FSL_MX25_ADC) += fsl-imx25-gcq.o > obj-$(CONFIG_LP8788_ADC) += lp8788_adc.o > obj-$(CONFIG_MAX1363) += max1363.o > obj-$(CONFIG_MCP320X) += mcp320x.o > diff --git a/drivers/iio/adc/fsl-imx25-gcq.c b/drivers/iio/adc/fsl-imx25-gcq.c > new file mode 100644 > index 0000000..1ae697c > --- /dev/null > +++ b/drivers/iio/adc/fsl-imx25-gcq.c > @@ -0,0 +1,338 @@ > +/* > + * Copyright 2014 Markus Pargmann, Pengutronix <mpa@pengutronix.de> > + * > + * The code contained herein is licensed under the GNU General Public > + * License. You may obtain a copy of the GNU General Public License > + * Version 2 or later at the following locations: > + * > + * http://www.opensource.org/licenses/gpl-license.html > + * http://www.gnu.org/copyleft/gpl.html > + * > + * This is the driver for the imx25 GCQ (Generic Conversion Queue) > + * connected to the imx25 ADC. > + */ > + > +#include <linux/clk.h> > +#include <linux/interrupt.h> > +#include <linux/iio/iio.h> > +#include <linux/mfd/imx25-tsadc.h> > +#include <linux/module.h> > +#include <linux/of.h> > +#include <linux/platform_device.h> > +#include <linux/regmap.h> > + > +#define MX25_GCQ_TIMEOUT (msecs_to_jiffies(2000)) > + > +enum mx25_gcq_cfgs { > + MX25_CFG_XP = 0, > + MX25_CFG_YP, > + MX25_CFG_XN, > + MX25_CFG_YN, > + MX25_CFG_WIPER, > + MX25_CFG_INAUX0, > + MX25_CFG_INAUX1, > + MX25_CFG_INAUX2, > + MX25_NUM_CFGS, > +}; > + > +struct mx25_gcq_priv { > + struct regmap *regs; > + struct completion completed; > + unsigned int settling_time; > + struct clk *clk; > + int irq; > +}; > + > +#define MX25_IIO_CHAN(chan, id) {\ prefix should be MX25_GCQ_ > + .type = IIO_VOLTAGE,\ > + .indexed = 1,\ > + .channel = chan,\ > + .address = chan,\ don't set .address and use .channel instead > + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \ > + .datasheet_name = id, \ > + } > + > +static const struct iio_chan_spec mx25_gcq_channels[MX25_NUM_CFGS] = { > + MX25_IIO_CHAN(0, "xp"), > + MX25_IIO_CHAN(1, "yp"), > + MX25_IIO_CHAN(2, "xn"), > + MX25_IIO_CHAN(3, "yn"), > + MX25_IIO_CHAN(4, "wiper"), > + MX25_IIO_CHAN(5, "inaux0"), > + MX25_IIO_CHAN(6, "inaux1"), > + MX25_IIO_CHAN(7, "inaux2"), > +}; > + > +static void mx25_gcq_disable_eoq(struct mx25_gcq_priv *priv) > +{ > + regmap_update_bits(priv->regs, MX25_ADCQ_MR, MX25_ADCQ_MR_EOQ_IRQ, > + MX25_ADCQ_MR_EOQ_IRQ); > +} > + > +static void mx25_gcq_enable_eoq(struct mx25_gcq_priv *priv) > +{ > + regmap_update_bits(priv->regs, MX25_ADCQ_MR, MX25_ADCQ_MR_EOQ_IRQ, 0); > +} > + > +static irqreturn_t mx25_gcq_irq(int irq, void *data) > +{ > + struct mx25_gcq_priv *priv = data; > + u32 stats; > + > + regmap_read(priv->regs, MX25_ADCQ_SR, &stats); > + > + if (stats & MX25_ADCQ_SR_EOQ) { > + mx25_gcq_disable_eoq(priv); > + complete(&priv->completed); > + } > + > + /* Disable conversion queue run */ > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FQS, 0); > + > + /* Acknowledge all possible irqs */ > + regmap_write(priv->regs, MX25_ADCQ_SR, MX25_ADCQ_SR_FRR | > + MX25_ADCQ_SR_FUR | MX25_ADCQ_SR_FOR | MX25_ADCQ_SR_EOQ | > + MX25_ADCQ_SR_PD); > + > + return IRQ_HANDLED; > +} > + > +static int mx25_gcq_read_raw(struct iio_dev *idev, > + struct iio_chan_spec const *chan, int *val, int *val2, > + long mask) > +{ > + struct mx25_gcq_priv *priv = iio_priv(idev); > + unsigned long timeout; this should be long, not unsigned long; see return of wait_for_completion_interruptible_timeout() > + u32 data; > + int ret; > + > + if (mask != IIO_CHAN_INFO_RAW) > + return -EINVAL; > + > + mutex_lock(&idev->mlock); > + > + /* Setup the configuration we want to use */ > + regmap_write(priv->regs, MX25_ADCQ_ITEM_7_0, > + MX25_ADCQ_ITEM(0, chan->address)); chan->channel > + > + mx25_gcq_enable_eoq(priv); > + > + /* Trigger queue for one run */ > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FQS, > + MX25_ADCQ_CR_FQS); > + > + timeout = wait_for_completion_interruptible_timeout(&priv->completed, > + MX25_GCQ_TIMEOUT); > + if (timeout < 0) { > + dev_err(&idev->dev, "ADC wait for measurement failed\n"); > + ret = timeout; > + goto out; > + } else if (timeout == 0) { > + dev_err(&idev->dev, "ADC timed out\n"); > + ret = -ETIMEDOUT; > + goto out; > + } > + > + regmap_read(priv->regs, MX25_ADCQ_FIFO, &data); this ignores the return value > + *val = MX25_ADCQ_FIFO_DATA(data); > + > + ret = IIO_VAL_INT; > + > +out: > + mutex_unlock(&idev->mlock); > + > + return ret; > +} > + > +static const struct iio_info mx25_gcq_iio_info = { > + .read_raw = mx25_gcq_read_raw, > +}; > + > +static const struct regmap_config mx25_gcq_regconfig = { > + .max_register = 0x5c, > + .reg_bits = 32, > + .val_bits = 32, > + .reg_stride = 4, > +}; > + > +static int mx25_gcq_setup_cfgs(struct platform_device *pdev, > + struct mx25_gcq_priv *priv) > +{ > + struct device_node *np = pdev->dev.of_node; > + struct device_node *child; > + struct device *dev = &pdev->dev; > + int ret; > + int i; > + > + /* Setup all configurations registers with a default conversion > + * configuration for each input */ multi-line comment style > + for (i = 0; i != MX25_NUM_CFGS; ++i) > + regmap_write(priv->regs, MX25_ADCQ_CFG(i), > + MX25_ADCQ_CFG_YPLL_OFF | > + MX25_ADCQ_CFG_XNUR_OFF | > + MX25_ADCQ_CFG_XPUL_OFF | > + MX25_ADCQ_CFG_REFP_INT | > + (i << 4) | > + MX25_ADCQ_CFG_REFN_NGND2); > + > + for_each_child_of_node(np, child) { > + u32 reg; > + u32 refn; > + u32 refp; > + > + ret = of_property_read_u32(child, "reg", ®); > + if (ret) { > + dev_err(dev, "Failed to get reg property\n"); > + return ret; > + } > + if (reg > MX25_NUM_CFGS) { >= probably > + dev_err(dev, "reg value is greater than the number of available configuration registers\n"); > + return -EINVAL; > + } > + > + ret = of_property_read_u32(child, "fsl,adc-refn", &refn); > + if (ret) { > + dev_err(dev, "Failed to get fsl,adc-refn property\n"); > + return ret; > + } > + if (refn < 0 || refn > 3) { > + dev_err(dev, "Invalid fsl,adc-refn property value %d\n", > + refn); > + return -EINVAL > + } > + > + ret = of_property_read_u32(child, "fsl,adc-refp", &refp); > + if (ret) { > + dev_err(dev, "Failed to get fsl,adc-refp property\n"); > + return ret; > + } > + if (refp < 0 || refp > 3) { > + dev_err(dev, "Invalid fsl,adc-refp property value %d\n", > + refp); > + return -EINVAL; > + } > + > + regmap_update_bits(priv->regs, MX25_ADCQ_CFG(reg), > + MX25_ADCQ_CFG_REFP_MASK | > + MX25_ADCQ_CFG_REFN_MASK, > + (refp << 7) | (refn << 2)); > + } > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, > + MX25_ADCQ_CR_FRST | MX25_ADCQ_CR_QRST, > + MX25_ADCQ_CR_FRST | MX25_ADCQ_CR_QRST); > + > + regmap_write(priv->regs, MX25_ADCQ_CR, > + MX25_ADCQ_CR_PDMSK | > + MX25_ADCQ_CR_QSM_FQS); > + > + return 0; > +} > + > +static int mx25_gcq_probe(struct platform_device *pdev) > +{ > + struct iio_dev *idev; > + struct mx25_gcq_priv *priv; > + struct resource *res; > + struct device *dev = &pdev->dev; > + int ret; > + void __iomem *mem; > + > + idev = devm_iio_device_alloc(&pdev->dev, sizeof(*priv)); > + if (!idev) > + return -ENOMEM; > + > + priv = iio_priv(idev); > + > + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > + mem = devm_ioremap_resource(dev, res); > + if (!mem) > + return -ENOMEM; > + > + priv->regs = devm_regmap_init_mmio(dev, mem, &mx25_gcq_regconfig); > + if (IS_ERR(priv->regs)) { > + dev_err(dev, "Failed to initialize regmap\n"); > + return PTR_ERR(priv->regs); > + } > + > + init_completion(&priv->completed); > + > + ret = mx25_gcq_setup_cfgs(pdev, priv); > + if (ret) > + goto err_irq_free; > + > + priv->clk = mx25_tsadc_get_ipg(pdev->dev.parent); > + ret = clk_prepare_enable(priv->clk); > + if (ret) { > + dev_err(dev, "Failed to enable clock\n"); > + return ret; > + } > + > + priv->irq = platform_get_irq(pdev, 0); > + if (priv->irq <= 0) { > + dev_err(dev, "Failed to get IRQ\n"); > + err = priv->irq; > + goto err_clk_unprepare; > + } > + > + ret = request_irq(priv->irq, mx25_gcq_irq, NULL, pdev->name, > + priv); > + if (ret) { > + dev_err(dev, "Failed requesting IRQ\n"); > + goto err_clk_unprepare; > + } > + > + idev->dev.parent = &pdev->dev; > + idev->channels = mx25_gcq_channels; > + idev->num_channels = ARRAY_SIZE(mx25_gcq_channels); > + idev->info = &mx25_gcq_iio_info; > + > + ret = iio_device_register(idev); > + if (ret) { > + dev_err(dev, "Failed to register iio device\n"); > + goto err_irq_free; > + } > + > + platform_set_drvdata(pdev, priv); > + > + return 0; > + > +err_irq_free: > + free_irq(priv->irq, (void *)priv); > + > +err_clk_unprepare: > + clk_disable_unprepare(priv->clk); > + > + return ret; > +} > + > +static int mx25_gcq_remove(struct platform_device *pdev) > +{ > + struct mx25_gcq_priv *priv = platform_get_drvdata(pdev); > + struct iio_dev *idev = iio_priv_to_dev(pdev); > + > + iio_device_unregister(idev); > + free_irq(priv->irq, (void *)priv); > + clk_disable_unprepare(priv->clk); > + > + return 0; > +} > + > +static struct of_device_id mx25_gcq_ids[] = { > + { .compatible = "fsl,imx25-gcq", }, > + { /* Senitel */ } Sentinel > +}; > + > +static struct platform_driver mx25_gcq_driver = { > + .driver = { > + .name = "mx25-gcq", > + .owner = THIS_MODULE, > + .of_match_table = mx25_gcq_ids, > + }, > + .probe = mx25_gcq_probe, > + .remove = mx25_gcq_remove, > +}; > +module_platform_driver(mx25_gcq_driver); > + > +MODULE_DESCRIPTION("ADC driver for Freescale mx25"); > +MODULE_AUTHOR("Markus Pargmann <mpa@pengutronix.de>"); > +MODULE_LICENSE("GPL v2"); > -- Peter Meerwald +43-664-2444418 (mobile) ^ permalink raw reply [flat|nested] 76+ messages in thread
* Re: [PATCH v2 3/6] iio: adc: fsl,imx25-gcq driver @ 2014-06-13 17:25 ` Peter Meerwald 0 siblings, 0 replies; 76+ messages in thread From: Peter Meerwald @ 2014-06-13 17:25 UTC (permalink / raw) To: Denis Carikli Cc: Shawn Guo, Samuel Ortiz, Dmitry Torokhov, Jonathan Cameron, Eric Bénard, Sascha Hauer, linux-arm-kernel, Lee Jones, linux-input, linux-iio, Fabio Estevam, Lars-Peter Clausen, Markus Pargmann > This is a conversion queue driver for the mx25 SoC. It uses the central > ADC which is used by two seperate independent queues. This driver > prepares different conversion configurations for each possible input. > For a conversion it creates a conversionqueue of one item with the > correct configuration for the chosen channel. It then executes the queue > once and disables the conversion queue afterwards. comments inline > Signed-off-by: Markus Pargmann <mpa@pengutronix.de> > Signed-off-by: Denis Carikli <denis@eukrea.com> > --- > .../devicetree/bindings/iio/adc/fsl,imx25-gcq.txt | 54 ++++ > drivers/iio/adc/Kconfig | 7 + > drivers/iio/adc/Makefile | 1 + > drivers/iio/adc/fsl-imx25-gcq.c | 338 ++++++++++++++++++++ > 4 files changed, 400 insertions(+) > create mode 100644 Documentation/devicetree/bindings/iio/adc/fsl,imx25-gcq.txt > create mode 100644 drivers/iio/adc/fsl-imx25-gcq.c > > diff --git a/Documentation/devicetree/bindings/iio/adc/fsl,imx25-gcq.txt b/Documentation/devicetree/bindings/iio/adc/fsl,imx25-gcq.txt > new file mode 100644 > index 0000000..333fc55 > --- /dev/null > +++ b/Documentation/devicetree/bindings/iio/adc/fsl,imx25-gcq.txt > @@ -0,0 +1,54 @@ > +Freescale i.MX25 ADC GCQ device > + > +This is a generic conversion queue device that can convert any of the analog > +inputs using the ADC unit of the i.MX25. > + > +Required properties: > + - compatible: Should be "fsl,imx25-gcq". > + - reg: Should be the register range of the module. > + - interrupts: Should be the interrupt number of the module. Typically this is <1>. > + - interrupt-parent: phandle to the tsadc module of the i.MX25. > + - #address-cells: Should be <1> (setting for the subnodes) > + - #size-cells: Should be <0> (setting for the subnodes) > + > +Optionally you can define subnodes which define the positive and negative > +reference voltage for one of the analog inputs. > + > +Required properties for subnodes: > + - reg: Should be the number of the analog input. > + 0: xp > + 1: yp > + 2: xn > + 3: yn > + 4: wiper > + 5: inaux0 > + 6: inaux1 > + 7: inaux2 > + - fsl,adc-refp: Positive reference input > + 0: yp > + 1: xp > + 2: External reference > + 3: Internal reference > + - fsl,adc-refn: Negative reference input > + 0: xn > + 1: yn > + 2: ngnd_adc > + 3: ngnd_adc > + > + > +Example: > + > + adc: adc@50030800 { > + compatible = "fsl,imx25-gcq"; > + reg = <0x50030800 0x60>; > + interrupt-parent = <&tscadc>; > + interrupts = <1>; > + #address-cells = <1>; > + #size-cells = <0>; > + > + inaux@5 { > + reg = <5>; > + fsl,adc-refp = <3>; > + fsl,adc-refn = <3>; > + }; > + }; > diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig > index a80d236..58efb8d 100644 > --- a/drivers/iio/adc/Kconfig > +++ b/drivers/iio/adc/Kconfig > @@ -125,6 +125,13 @@ config EXYNOS_ADC > of SoCs for drivers such as the touchscreen and hwmon to use to share > this resource. > > +config FSL_MX25_ADC > + tristate "Freescale MX25 ADC driver" > + depends on MFD_MX25_TSADC > + help > + Generic Conversion Queue driver used for general purpose ADC in the > + MX25. This driver supports single measurements using the MX25 ADC. > + > config LP8788_ADC > tristate "LP8788 ADC driver" > depends on MFD_LP8788 > diff --git a/drivers/iio/adc/Makefile b/drivers/iio/adc/Makefile > index 9d60f2d..2767fd6 100644 > --- a/drivers/iio/adc/Makefile > +++ b/drivers/iio/adc/Makefile > @@ -14,6 +14,7 @@ obj-$(CONFIG_AD7887) += ad7887.o > obj-$(CONFIG_AD799X) += ad799x.o > obj-$(CONFIG_AT91_ADC) += at91_adc.o > obj-$(CONFIG_EXYNOS_ADC) += exynos_adc.o > +obj-$(CONFIG_FSL_MX25_ADC) += fsl-imx25-gcq.o > obj-$(CONFIG_LP8788_ADC) += lp8788_adc.o > obj-$(CONFIG_MAX1363) += max1363.o > obj-$(CONFIG_MCP320X) += mcp320x.o > diff --git a/drivers/iio/adc/fsl-imx25-gcq.c b/drivers/iio/adc/fsl-imx25-gcq.c > new file mode 100644 > index 0000000..1ae697c > --- /dev/null > +++ b/drivers/iio/adc/fsl-imx25-gcq.c > @@ -0,0 +1,338 @@ > +/* > + * Copyright 2014 Markus Pargmann, Pengutronix <mpa@pengutronix.de> > + * > + * The code contained herein is licensed under the GNU General Public > + * License. You may obtain a copy of the GNU General Public License > + * Version 2 or later at the following locations: > + * > + * http://www.opensource.org/licenses/gpl-license.html > + * http://www.gnu.org/copyleft/gpl.html > + * > + * This is the driver for the imx25 GCQ (Generic Conversion Queue) > + * connected to the imx25 ADC. > + */ > + > +#include <linux/clk.h> > +#include <linux/interrupt.h> > +#include <linux/iio/iio.h> > +#include <linux/mfd/imx25-tsadc.h> > +#include <linux/module.h> > +#include <linux/of.h> > +#include <linux/platform_device.h> > +#include <linux/regmap.h> > + > +#define MX25_GCQ_TIMEOUT (msecs_to_jiffies(2000)) > + > +enum mx25_gcq_cfgs { > + MX25_CFG_XP = 0, > + MX25_CFG_YP, > + MX25_CFG_XN, > + MX25_CFG_YN, > + MX25_CFG_WIPER, > + MX25_CFG_INAUX0, > + MX25_CFG_INAUX1, > + MX25_CFG_INAUX2, > + MX25_NUM_CFGS, > +}; > + > +struct mx25_gcq_priv { > + struct regmap *regs; > + struct completion completed; > + unsigned int settling_time; > + struct clk *clk; > + int irq; > +}; > + > +#define MX25_IIO_CHAN(chan, id) {\ prefix should be MX25_GCQ_ > + .type = IIO_VOLTAGE,\ > + .indexed = 1,\ > + .channel = chan,\ > + .address = chan,\ don't set .address and use .channel instead > + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \ > + .datasheet_name = id, \ > + } > + > +static const struct iio_chan_spec mx25_gcq_channels[MX25_NUM_CFGS] = { > + MX25_IIO_CHAN(0, "xp"), > + MX25_IIO_CHAN(1, "yp"), > + MX25_IIO_CHAN(2, "xn"), > + MX25_IIO_CHAN(3, "yn"), > + MX25_IIO_CHAN(4, "wiper"), > + MX25_IIO_CHAN(5, "inaux0"), > + MX25_IIO_CHAN(6, "inaux1"), > + MX25_IIO_CHAN(7, "inaux2"), > +}; > + > +static void mx25_gcq_disable_eoq(struct mx25_gcq_priv *priv) > +{ > + regmap_update_bits(priv->regs, MX25_ADCQ_MR, MX25_ADCQ_MR_EOQ_IRQ, > + MX25_ADCQ_MR_EOQ_IRQ); > +} > + > +static void mx25_gcq_enable_eoq(struct mx25_gcq_priv *priv) > +{ > + regmap_update_bits(priv->regs, MX25_ADCQ_MR, MX25_ADCQ_MR_EOQ_IRQ, 0); > +} > + > +static irqreturn_t mx25_gcq_irq(int irq, void *data) > +{ > + struct mx25_gcq_priv *priv = data; > + u32 stats; > + > + regmap_read(priv->regs, MX25_ADCQ_SR, &stats); > + > + if (stats & MX25_ADCQ_SR_EOQ) { > + mx25_gcq_disable_eoq(priv); > + complete(&priv->completed); > + } > + > + /* Disable conversion queue run */ > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FQS, 0); > + > + /* Acknowledge all possible irqs */ > + regmap_write(priv->regs, MX25_ADCQ_SR, MX25_ADCQ_SR_FRR | > + MX25_ADCQ_SR_FUR | MX25_ADCQ_SR_FOR | MX25_ADCQ_SR_EOQ | > + MX25_ADCQ_SR_PD); > + > + return IRQ_HANDLED; > +} > + > +static int mx25_gcq_read_raw(struct iio_dev *idev, > + struct iio_chan_spec const *chan, int *val, int *val2, > + long mask) > +{ > + struct mx25_gcq_priv *priv = iio_priv(idev); > + unsigned long timeout; this should be long, not unsigned long; see return of wait_for_completion_interruptible_timeout() > + u32 data; > + int ret; > + > + if (mask != IIO_CHAN_INFO_RAW) > + return -EINVAL; > + > + mutex_lock(&idev->mlock); > + > + /* Setup the configuration we want to use */ > + regmap_write(priv->regs, MX25_ADCQ_ITEM_7_0, > + MX25_ADCQ_ITEM(0, chan->address)); chan->channel > + > + mx25_gcq_enable_eoq(priv); > + > + /* Trigger queue for one run */ > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FQS, > + MX25_ADCQ_CR_FQS); > + > + timeout = wait_for_completion_interruptible_timeout(&priv->completed, > + MX25_GCQ_TIMEOUT); > + if (timeout < 0) { > + dev_err(&idev->dev, "ADC wait for measurement failed\n"); > + ret = timeout; > + goto out; > + } else if (timeout == 0) { > + dev_err(&idev->dev, "ADC timed out\n"); > + ret = -ETIMEDOUT; > + goto out; > + } > + > + regmap_read(priv->regs, MX25_ADCQ_FIFO, &data); this ignores the return value > + *val = MX25_ADCQ_FIFO_DATA(data); > + > + ret = IIO_VAL_INT; > + > +out: > + mutex_unlock(&idev->mlock); > + > + return ret; > +} > + > +static const struct iio_info mx25_gcq_iio_info = { > + .read_raw = mx25_gcq_read_raw, > +}; > + > +static const struct regmap_config mx25_gcq_regconfig = { > + .max_register = 0x5c, > + .reg_bits = 32, > + .val_bits = 32, > + .reg_stride = 4, > +}; > + > +static int mx25_gcq_setup_cfgs(struct platform_device *pdev, > + struct mx25_gcq_priv *priv) > +{ > + struct device_node *np = pdev->dev.of_node; > + struct device_node *child; > + struct device *dev = &pdev->dev; > + int ret; > + int i; > + > + /* Setup all configurations registers with a default conversion > + * configuration for each input */ multi-line comment style > + for (i = 0; i != MX25_NUM_CFGS; ++i) > + regmap_write(priv->regs, MX25_ADCQ_CFG(i), > + MX25_ADCQ_CFG_YPLL_OFF | > + MX25_ADCQ_CFG_XNUR_OFF | > + MX25_ADCQ_CFG_XPUL_OFF | > + MX25_ADCQ_CFG_REFP_INT | > + (i << 4) | > + MX25_ADCQ_CFG_REFN_NGND2); > + > + for_each_child_of_node(np, child) { > + u32 reg; > + u32 refn; > + u32 refp; > + > + ret = of_property_read_u32(child, "reg", ®); > + if (ret) { > + dev_err(dev, "Failed to get reg property\n"); > + return ret; > + } > + if (reg > MX25_NUM_CFGS) { >= probably > + dev_err(dev, "reg value is greater than the number of available configuration registers\n"); > + return -EINVAL; > + } > + > + ret = of_property_read_u32(child, "fsl,adc-refn", &refn); > + if (ret) { > + dev_err(dev, "Failed to get fsl,adc-refn property\n"); > + return ret; > + } > + if (refn < 0 || refn > 3) { > + dev_err(dev, "Invalid fsl,adc-refn property value %d\n", > + refn); > + return -EINVAL > + } > + > + ret = of_property_read_u32(child, "fsl,adc-refp", &refp); > + if (ret) { > + dev_err(dev, "Failed to get fsl,adc-refp property\n"); > + return ret; > + } > + if (refp < 0 || refp > 3) { > + dev_err(dev, "Invalid fsl,adc-refp property value %d\n", > + refp); > + return -EINVAL; > + } > + > + regmap_update_bits(priv->regs, MX25_ADCQ_CFG(reg), > + MX25_ADCQ_CFG_REFP_MASK | > + MX25_ADCQ_CFG_REFN_MASK, > + (refp << 7) | (refn << 2)); > + } > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, > + MX25_ADCQ_CR_FRST | MX25_ADCQ_CR_QRST, > + MX25_ADCQ_CR_FRST | MX25_ADCQ_CR_QRST); > + > + regmap_write(priv->regs, MX25_ADCQ_CR, > + MX25_ADCQ_CR_PDMSK | > + MX25_ADCQ_CR_QSM_FQS); > + > + return 0; > +} > + > +static int mx25_gcq_probe(struct platform_device *pdev) > +{ > + struct iio_dev *idev; > + struct mx25_gcq_priv *priv; > + struct resource *res; > + struct device *dev = &pdev->dev; > + int ret; > + void __iomem *mem; > + > + idev = devm_iio_device_alloc(&pdev->dev, sizeof(*priv)); > + if (!idev) > + return -ENOMEM; > + > + priv = iio_priv(idev); > + > + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > + mem = devm_ioremap_resource(dev, res); > + if (!mem) > + return -ENOMEM; > + > + priv->regs = devm_regmap_init_mmio(dev, mem, &mx25_gcq_regconfig); > + if (IS_ERR(priv->regs)) { > + dev_err(dev, "Failed to initialize regmap\n"); > + return PTR_ERR(priv->regs); > + } > + > + init_completion(&priv->completed); > + > + ret = mx25_gcq_setup_cfgs(pdev, priv); > + if (ret) > + goto err_irq_free; > + > + priv->clk = mx25_tsadc_get_ipg(pdev->dev.parent); > + ret = clk_prepare_enable(priv->clk); > + if (ret) { > + dev_err(dev, "Failed to enable clock\n"); > + return ret; > + } > + > + priv->irq = platform_get_irq(pdev, 0); > + if (priv->irq <= 0) { > + dev_err(dev, "Failed to get IRQ\n"); > + err = priv->irq; > + goto err_clk_unprepare; > + } > + > + ret = request_irq(priv->irq, mx25_gcq_irq, NULL, pdev->name, > + priv); > + if (ret) { > + dev_err(dev, "Failed requesting IRQ\n"); > + goto err_clk_unprepare; > + } > + > + idev->dev.parent = &pdev->dev; > + idev->channels = mx25_gcq_channels; > + idev->num_channels = ARRAY_SIZE(mx25_gcq_channels); > + idev->info = &mx25_gcq_iio_info; > + > + ret = iio_device_register(idev); > + if (ret) { > + dev_err(dev, "Failed to register iio device\n"); > + goto err_irq_free; > + } > + > + platform_set_drvdata(pdev, priv); > + > + return 0; > + > +err_irq_free: > + free_irq(priv->irq, (void *)priv); > + > +err_clk_unprepare: > + clk_disable_unprepare(priv->clk); > + > + return ret; > +} > + > +static int mx25_gcq_remove(struct platform_device *pdev) > +{ > + struct mx25_gcq_priv *priv = platform_get_drvdata(pdev); > + struct iio_dev *idev = iio_priv_to_dev(pdev); > + > + iio_device_unregister(idev); > + free_irq(priv->irq, (void *)priv); > + clk_disable_unprepare(priv->clk); > + > + return 0; > +} > + > +static struct of_device_id mx25_gcq_ids[] = { > + { .compatible = "fsl,imx25-gcq", }, > + { /* Senitel */ } Sentinel > +}; > + > +static struct platform_driver mx25_gcq_driver = { > + .driver = { > + .name = "mx25-gcq", > + .owner = THIS_MODULE, > + .of_match_table = mx25_gcq_ids, > + }, > + .probe = mx25_gcq_probe, > + .remove = mx25_gcq_remove, > +}; > +module_platform_driver(mx25_gcq_driver); > + > +MODULE_DESCRIPTION("ADC driver for Freescale mx25"); > +MODULE_AUTHOR("Markus Pargmann <mpa@pengutronix.de>"); > +MODULE_LICENSE("GPL v2"); > -- Peter Meerwald +43-664-2444418 (mobile) ^ permalink raw reply [flat|nested] 76+ messages in thread
* Re: [PATCH v2 3/6] iio: adc: fsl,imx25-gcq driver 2014-06-13 15:21 ` Denis Carikli (?) @ 2014-06-21 10:30 ` Jonathan Cameron -1 siblings, 0 replies; 76+ messages in thread From: Jonathan Cameron @ 2014-06-21 10:30 UTC (permalink / raw) To: Denis Carikli, Shawn Guo, Samuel Ortiz, Dmitry Torokhov Cc: Eric Bénard, Sascha Hauer, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, Lee Jones, linux-input-u79uwXL29TY76Z2rM5mHXA, linux-iio-u79uwXL29TY76Z2rM5mHXA, Fabio Estevam, Lars-Peter Clausen, Markus Pargmann, Devicetree List On 13/06/14 16:21, Denis Carikli wrote: > From: Markus Pargmann <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> > > This is a conversion queue driver for the mx25 SoC. It uses the central > ADC which is used by two seperate independent queues. This driver > prepares different conversion configurations for each possible input. > For a conversion it creates a conversionqueue of one item with the > correct configuration for the chosen channel. It then executes the queue > once and disables the conversion queue afterwards. > > The reference voltages are configurable through devicetree subnodes, > depending on the connections of the ADC inputs. > > Signed-off-by: Markus Pargmann <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> > Signed-off-by: Denis Carikli <denis-fO0SIAKYzcbQT0dZR+AlfA@public.gmane.org> Couple of little bits + I think we have enough 'interesting' bits in the device tree binding that we are going to need an Ack from a device tree maintainer. Note any patch at all with device tree bindings should be cc'd to devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org > --- > .../devicetree/bindings/iio/adc/fsl,imx25-gcq.txt | 54 ++++ > drivers/iio/adc/Kconfig | 7 + > drivers/iio/adc/Makefile | 1 + > drivers/iio/adc/fsl-imx25-gcq.c | 338 ++++++++++++++++++++ > 4 files changed, 400 insertions(+) > create mode 100644 Documentation/devicetree/bindings/iio/adc/fsl,imx25-gcq.txt > create mode 100644 drivers/iio/adc/fsl-imx25-gcq.c > > diff --git a/Documentation/devicetree/bindings/iio/adc/fsl,imx25-gcq.txt b/Documentation/devicetree/bindings/iio/adc/fsl,imx25-gcq.txt > new file mode 100644 > index 0000000..333fc55 > --- /dev/null > +++ b/Documentation/devicetree/bindings/iio/adc/fsl,imx25-gcq.txt > @@ -0,0 +1,54 @@ > +Freescale i.MX25 ADC GCQ device > + > +This is a generic conversion queue device that can convert any of the analog > +inputs using the ADC unit of the i.MX25. > + > +Required properties: > + - compatible: Should be "fsl,imx25-gcq". > + - reg: Should be the register range of the module. > + - interrupts: Should be the interrupt number of the module. Typically this is <1>. > + - interrupt-parent: phandle to the tsadc module of the i.MX25. > + - #address-cells: Should be <1> (setting for the subnodes) > + - #size-cells: Should be <0> (setting for the subnodes) > + > +Optionally you can define subnodes which define the positive and negative > +reference voltage for one of the analog inputs. > + > +Required properties for subnodes: > + - reg: Should be the number of the analog input. > + 0: xp > + 1: yp > + 2: xn > + 3: yn > + 4: wiper > + 5: inaux0 > + 6: inaux1 > + 7: inaux2 > + - fsl,adc-refp: Positive reference input > + 0: yp > + 1: xp > + 2: External reference > + 3: Internal reference > + - fsl,adc-refn: Negative reference input > + 0: xn > + 1: yn > + 2: ngnd_adc > + 3: ngnd_adc > + > + > +Example: > + > + adc: adc@50030800 { > + compatible = "fsl,imx25-gcq"; > + reg = <0x50030800 0x60>; > + interrupt-parent = <&tscadc>; > + interrupts = <1>; > + #address-cells = <1>; > + #size-cells = <0>; > + > + inaux@5 { > + reg = <5>; > + fsl,adc-refp = <3>; > + fsl,adc-refn = <3>; > + }; > + }; This lot is involved enough that we'll need a devicetree maintainer ack I think... > diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig > index a80d236..58efb8d 100644 > --- a/drivers/iio/adc/Kconfig > +++ b/drivers/iio/adc/Kconfig > @@ -125,6 +125,13 @@ config EXYNOS_ADC > of SoCs for drivers such as the touchscreen and hwmon to use to share > this resource. > > +config FSL_MX25_ADC > + tristate "Freescale MX25 ADC driver" > + depends on MFD_MX25_TSADC > + help > + Generic Conversion Queue driver used for general purpose ADC in the > + MX25. This driver supports single measurements using the MX25 ADC. > + > config LP8788_ADC > tristate "LP8788 ADC driver" > depends on MFD_LP8788 > diff --git a/drivers/iio/adc/Makefile b/drivers/iio/adc/Makefile > index 9d60f2d..2767fd6 100644 > --- a/drivers/iio/adc/Makefile > +++ b/drivers/iio/adc/Makefile > @@ -14,6 +14,7 @@ obj-$(CONFIG_AD7887) += ad7887.o > obj-$(CONFIG_AD799X) += ad799x.o > obj-$(CONFIG_AT91_ADC) += at91_adc.o > obj-$(CONFIG_EXYNOS_ADC) += exynos_adc.o > +obj-$(CONFIG_FSL_MX25_ADC) += fsl-imx25-gcq.o > obj-$(CONFIG_LP8788_ADC) += lp8788_adc.o > obj-$(CONFIG_MAX1363) += max1363.o > obj-$(CONFIG_MCP320X) += mcp320x.o > diff --git a/drivers/iio/adc/fsl-imx25-gcq.c b/drivers/iio/adc/fsl-imx25-gcq.c > new file mode 100644 > index 0000000..1ae697c > --- /dev/null > +++ b/drivers/iio/adc/fsl-imx25-gcq.c > @@ -0,0 +1,338 @@ > +/* > + * Copyright 2014 Markus Pargmann, Pengutronix <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> > + * > + * The code contained herein is licensed under the GNU General Public > + * License. You may obtain a copy of the GNU General Public License > + * Version 2 or later at the following locations: > + * > + * http://www.opensource.org/licenses/gpl-license.html > + * http://www.gnu.org/copyleft/gpl.html > + * > + * This is the driver for the imx25 GCQ (Generic Conversion Queue) > + * connected to the imx25 ADC. > + */ > + > +#include <linux/clk.h> > +#include <linux/interrupt.h> > +#include <linux/iio/iio.h> > +#include <linux/mfd/imx25-tsadc.h> > +#include <linux/module.h> > +#include <linux/of.h> > +#include <linux/platform_device.h> > +#include <linux/regmap.h> > + > +#define MX25_GCQ_TIMEOUT (msecs_to_jiffies(2000)) > + > +enum mx25_gcq_cfgs { > + MX25_CFG_XP = 0, > + MX25_CFG_YP, > + MX25_CFG_XN, > + MX25_CFG_YN, > + MX25_CFG_WIPER, > + MX25_CFG_INAUX0, > + MX25_CFG_INAUX1, > + MX25_CFG_INAUX2, > + MX25_NUM_CFGS, > +}; > + > +struct mx25_gcq_priv { > + struct regmap *regs; > + struct completion completed; > + unsigned int settling_time; > + struct clk *clk; > + int irq; > +}; > + > +#define MX25_IIO_CHAN(chan, id) {\ > + .type = IIO_VOLTAGE,\ > + .indexed = 1,\ > + .channel = chan,\ > + .address = chan,\ No real point in setting address if it is equal to channel. Just use channel instead. Address is just here for when it is convenient to store something like a register address rather than for a copy of the index. > + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \ No known info on converting this to real voltages? I'd normally expect a scale parameter at least with any raw channel output, but fair enough if it's not obvous what this should be. > + .datasheet_name = id, \ > + } > + > +static const struct iio_chan_spec mx25_gcq_channels[MX25_NUM_CFGS] = { > + MX25_IIO_CHAN(0, "xp"), > + MX25_IIO_CHAN(1, "yp"), > + MX25_IIO_CHAN(2, "xn"), > + MX25_IIO_CHAN(3, "yn"), > + MX25_IIO_CHAN(4, "wiper"), > + MX25_IIO_CHAN(5, "inaux0"), > + MX25_IIO_CHAN(6, "inaux1"), > + MX25_IIO_CHAN(7, "inaux2"), > +}; > + > +static void mx25_gcq_disable_eoq(struct mx25_gcq_priv *priv) > +{ > + regmap_update_bits(priv->regs, MX25_ADCQ_MR, MX25_ADCQ_MR_EOQ_IRQ, > + MX25_ADCQ_MR_EOQ_IRQ); > +} > + > +static void mx25_gcq_enable_eoq(struct mx25_gcq_priv *priv) > +{ > + regmap_update_bits(priv->regs, MX25_ADCQ_MR, MX25_ADCQ_MR_EOQ_IRQ, 0); > +} > + > +static irqreturn_t mx25_gcq_irq(int irq, void *data) > +{ I suppose there isn't that much in here, but could it be a threaded irq without loosing anything significant? A general good practice element rather than a specific comment on what you have here! > + struct mx25_gcq_priv *priv = data; > + u32 stats; > + > + regmap_read(priv->regs, MX25_ADCQ_SR, &stats); > + > + if (stats & MX25_ADCQ_SR_EOQ) { > + mx25_gcq_disable_eoq(priv); > + complete(&priv->completed); > + } > + > + /* Disable conversion queue run */ > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FQS, 0); > + > + /* Acknowledge all possible irqs */ > + regmap_write(priv->regs, MX25_ADCQ_SR, MX25_ADCQ_SR_FRR | > + MX25_ADCQ_SR_FUR | MX25_ADCQ_SR_FOR | MX25_ADCQ_SR_EOQ | > + MX25_ADCQ_SR_PD); > + > + return IRQ_HANDLED; > +} > + > +static int mx25_gcq_read_raw(struct iio_dev *idev, > + struct iio_chan_spec const *chan, int *val, int *val2, > + long mask) > +{ > + struct mx25_gcq_priv *priv = iio_priv(idev); > + unsigned long timeout; > + u32 data; > + int ret; > + > + if (mask != IIO_CHAN_INFO_RAW) > + return -EINVAL; > + > + mutex_lock(&idev->mlock); > + > + /* Setup the configuration we want to use */ > + regmap_write(priv->regs, MX25_ADCQ_ITEM_7_0, > + MX25_ADCQ_ITEM(0, chan->address)); > + > + mx25_gcq_enable_eoq(priv); > + > + /* Trigger queue for one run */ > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FQS, > + MX25_ADCQ_CR_FQS); > + > + timeout = wait_for_completion_interruptible_timeout(&priv->completed, > + MX25_GCQ_TIMEOUT); > + if (timeout < 0) { > + dev_err(&idev->dev, "ADC wait for measurement failed\n"); > + ret = timeout; > + goto out; > + } else if (timeout == 0) { > + dev_err(&idev->dev, "ADC timed out\n"); > + ret = -ETIMEDOUT; > + goto out; > + } > + > + regmap_read(priv->regs, MX25_ADCQ_FIFO, &data); > + *val = MX25_ADCQ_FIFO_DATA(data); > + > + ret = IIO_VAL_INT; > + > +out: > + mutex_unlock(&idev->mlock); > + > + return ret; > +} > + > +static const struct iio_info mx25_gcq_iio_info = { > + .read_raw = mx25_gcq_read_raw, > +}; > + > +static const struct regmap_config mx25_gcq_regconfig = { > + .max_register = 0x5c, > + .reg_bits = 32, > + .val_bits = 32, > + .reg_stride = 4, > +}; > + > +static int mx25_gcq_setup_cfgs(struct platform_device *pdev, > + struct mx25_gcq_priv *priv) > +{ > + struct device_node *np = pdev->dev.of_node; > + struct device_node *child; > + struct device *dev = &pdev->dev; > + int ret; > + int i; > + > + /* Setup all configurations registers with a default conversion > + * configuration for each input */ > + for (i = 0; i != MX25_NUM_CFGS; ++i) > + regmap_write(priv->regs, MX25_ADCQ_CFG(i), > + MX25_ADCQ_CFG_YPLL_OFF | > + MX25_ADCQ_CFG_XNUR_OFF | > + MX25_ADCQ_CFG_XPUL_OFF | > + MX25_ADCQ_CFG_REFP_INT | > + (i << 4) | > + MX25_ADCQ_CFG_REFN_NGND2); > + > + for_each_child_of_node(np, child) { > + u32 reg; > + u32 refn; > + u32 refp; > + > + ret = of_property_read_u32(child, "reg", ®); > + if (ret) { > + dev_err(dev, "Failed to get reg property\n"); > + return ret; > + } > + if (reg > MX25_NUM_CFGS) { > + dev_err(dev, "reg value is greater than the number of available configuration registers\n"); > + return -EINVAL; > + } > + > + ret = of_property_read_u32(child, "fsl,adc-refn", &refn); > + if (ret) { > + dev_err(dev, "Failed to get fsl,adc-refn property\n"); > + return ret; > + } > + if (refn < 0 || refn > 3) { > + dev_err(dev, "Invalid fsl,adc-refn property value %d\n", > + refn); > + return -EINVAL > + } > + > + ret = of_property_read_u32(child, "fsl,adc-refp", &refp); > + if (ret) { > + dev_err(dev, "Failed to get fsl,adc-refp property\n"); > + return ret; > + } > + if (refp < 0 || refp > 3) { > + dev_err(dev, "Invalid fsl,adc-refp property value %d\n", > + refp); > + return -EINVAL; > + } > + > + regmap_update_bits(priv->regs, MX25_ADCQ_CFG(reg), > + MX25_ADCQ_CFG_REFP_MASK | > + MX25_ADCQ_CFG_REFN_MASK, > + (refp << 7) | (refn << 2)); > + } > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, > + MX25_ADCQ_CR_FRST | MX25_ADCQ_CR_QRST, > + MX25_ADCQ_CR_FRST | MX25_ADCQ_CR_QRST); > + > + regmap_write(priv->regs, MX25_ADCQ_CR, > + MX25_ADCQ_CR_PDMSK | > + MX25_ADCQ_CR_QSM_FQS); > + > + return 0; > +} > + > +static int mx25_gcq_probe(struct platform_device *pdev) > +{ > + struct iio_dev *idev; > + struct mx25_gcq_priv *priv; > + struct resource *res; > + struct device *dev = &pdev->dev; > + int ret; > + void __iomem *mem; > + > + idev = devm_iio_device_alloc(&pdev->dev, sizeof(*priv)); > + if (!idev) > + return -ENOMEM; > + > + priv = iio_priv(idev); > + > + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); check this succeeded. > + mem = devm_ioremap_resource(dev, res); > + if (!mem) > + return -ENOMEM; > + > + priv->regs = devm_regmap_init_mmio(dev, mem, &mx25_gcq_regconfig); > + if (IS_ERR(priv->regs)) { > + dev_err(dev, "Failed to initialize regmap\n"); > + return PTR_ERR(priv->regs); > + } > + > + init_completion(&priv->completed); > + > + ret = mx25_gcq_setup_cfgs(pdev, priv); > + if (ret) This looks suspect given you haven't actually gained the irq yet (any time we have a return ret after a goto something tends to be interesting!) > + goto err_irq_free; > + > + priv->clk = mx25_tsadc_get_ipg(pdev->dev.parent); > + ret = clk_prepare_enable(priv->clk); > + if (ret) { > + dev_err(dev, "Failed to enable clock\n"); > + return ret; > + } > + > + priv->irq = platform_get_irq(pdev, 0); > + if (priv->irq <= 0) { > + dev_err(dev, "Failed to get IRQ\n"); > + err = priv->irq; > + goto err_clk_unprepare; > + } > + > + ret = request_irq(priv->irq, mx25_gcq_irq, NULL, pdev->name, > + priv); As mentioned above, could this be a threaded irq without causing significant problems? > + if (ret) { > + dev_err(dev, "Failed requesting IRQ\n"); > + goto err_clk_unprepare; > + } > + > + idev->dev.parent = &pdev->dev; > + idev->channels = mx25_gcq_channels; > + idev->num_channels = ARRAY_SIZE(mx25_gcq_channels); > + idev->info = &mx25_gcq_iio_info; > + > + ret = iio_device_register(idev); > + if (ret) { > + dev_err(dev, "Failed to register iio device\n"); > + goto err_irq_free; > + } > + > + platform_set_drvdata(pdev, priv); > + > + return 0; > + > +err_irq_free: > + free_irq(priv->irq, (void *)priv); > + > +err_clk_unprepare: > + clk_disable_unprepare(priv->clk); > + > + return ret; > +} > + > +static int mx25_gcq_remove(struct platform_device *pdev) > +{ > + struct mx25_gcq_priv *priv = platform_get_drvdata(pdev); > + struct iio_dev *idev = iio_priv_to_dev(pdev); > + > + iio_device_unregister(idev); > + free_irq(priv->irq, (void *)priv); > + clk_disable_unprepare(priv->clk); > + > + return 0; > +} > + > +static struct of_device_id mx25_gcq_ids[] = { > + { .compatible = "fsl,imx25-gcq", }, > + { /* Senitel */ } > +}; > + > +static struct platform_driver mx25_gcq_driver = { > + .driver = { > + .name = "mx25-gcq", > + .owner = THIS_MODULE, > + .of_match_table = mx25_gcq_ids, > + }, > + .probe = mx25_gcq_probe, > + .remove = mx25_gcq_remove, > +}; > +module_platform_driver(mx25_gcq_driver); > + > +MODULE_DESCRIPTION("ADC driver for Freescale mx25"); > +MODULE_AUTHOR("Markus Pargmann <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>"); > +MODULE_LICENSE("GPL v2"); > ^ permalink raw reply [flat|nested] 76+ messages in thread
* [PATCH v2 3/6] iio: adc: fsl,imx25-gcq driver @ 2014-06-21 10:30 ` Jonathan Cameron 0 siblings, 0 replies; 76+ messages in thread From: Jonathan Cameron @ 2014-06-21 10:30 UTC (permalink / raw) To: linux-arm-kernel On 13/06/14 16:21, Denis Carikli wrote: > From: Markus Pargmann <mpa@pengutronix.de> > > This is a conversion queue driver for the mx25 SoC. It uses the central > ADC which is used by two seperate independent queues. This driver > prepares different conversion configurations for each possible input. > For a conversion it creates a conversionqueue of one item with the > correct configuration for the chosen channel. It then executes the queue > once and disables the conversion queue afterwards. > > The reference voltages are configurable through devicetree subnodes, > depending on the connections of the ADC inputs. > > Signed-off-by: Markus Pargmann <mpa@pengutronix.de> > Signed-off-by: Denis Carikli <denis@eukrea.com> Couple of little bits + I think we have enough 'interesting' bits in the device tree binding that we are going to need an Ack from a device tree maintainer. Note any patch at all with device tree bindings should be cc'd to devicetree at vger.kernel.org > --- > .../devicetree/bindings/iio/adc/fsl,imx25-gcq.txt | 54 ++++ > drivers/iio/adc/Kconfig | 7 + > drivers/iio/adc/Makefile | 1 + > drivers/iio/adc/fsl-imx25-gcq.c | 338 ++++++++++++++++++++ > 4 files changed, 400 insertions(+) > create mode 100644 Documentation/devicetree/bindings/iio/adc/fsl,imx25-gcq.txt > create mode 100644 drivers/iio/adc/fsl-imx25-gcq.c > > diff --git a/Documentation/devicetree/bindings/iio/adc/fsl,imx25-gcq.txt b/Documentation/devicetree/bindings/iio/adc/fsl,imx25-gcq.txt > new file mode 100644 > index 0000000..333fc55 > --- /dev/null > +++ b/Documentation/devicetree/bindings/iio/adc/fsl,imx25-gcq.txt > @@ -0,0 +1,54 @@ > +Freescale i.MX25 ADC GCQ device > + > +This is a generic conversion queue device that can convert any of the analog > +inputs using the ADC unit of the i.MX25. > + > +Required properties: > + - compatible: Should be "fsl,imx25-gcq". > + - reg: Should be the register range of the module. > + - interrupts: Should be the interrupt number of the module. Typically this is <1>. > + - interrupt-parent: phandle to the tsadc module of the i.MX25. > + - #address-cells: Should be <1> (setting for the subnodes) > + - #size-cells: Should be <0> (setting for the subnodes) > + > +Optionally you can define subnodes which define the positive and negative > +reference voltage for one of the analog inputs. > + > +Required properties for subnodes: > + - reg: Should be the number of the analog input. > + 0: xp > + 1: yp > + 2: xn > + 3: yn > + 4: wiper > + 5: inaux0 > + 6: inaux1 > + 7: inaux2 > + - fsl,adc-refp: Positive reference input > + 0: yp > + 1: xp > + 2: External reference > + 3: Internal reference > + - fsl,adc-refn: Negative reference input > + 0: xn > + 1: yn > + 2: ngnd_adc > + 3: ngnd_adc > + > + > +Example: > + > + adc: adc at 50030800 { > + compatible = "fsl,imx25-gcq"; > + reg = <0x50030800 0x60>; > + interrupt-parent = <&tscadc>; > + interrupts = <1>; > + #address-cells = <1>; > + #size-cells = <0>; > + > + inaux at 5 { > + reg = <5>; > + fsl,adc-refp = <3>; > + fsl,adc-refn = <3>; > + }; > + }; This lot is involved enough that we'll need a devicetree maintainer ack I think... > diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig > index a80d236..58efb8d 100644 > --- a/drivers/iio/adc/Kconfig > +++ b/drivers/iio/adc/Kconfig > @@ -125,6 +125,13 @@ config EXYNOS_ADC > of SoCs for drivers such as the touchscreen and hwmon to use to share > this resource. > > +config FSL_MX25_ADC > + tristate "Freescale MX25 ADC driver" > + depends on MFD_MX25_TSADC > + help > + Generic Conversion Queue driver used for general purpose ADC in the > + MX25. This driver supports single measurements using the MX25 ADC. > + > config LP8788_ADC > tristate "LP8788 ADC driver" > depends on MFD_LP8788 > diff --git a/drivers/iio/adc/Makefile b/drivers/iio/adc/Makefile > index 9d60f2d..2767fd6 100644 > --- a/drivers/iio/adc/Makefile > +++ b/drivers/iio/adc/Makefile > @@ -14,6 +14,7 @@ obj-$(CONFIG_AD7887) += ad7887.o > obj-$(CONFIG_AD799X) += ad799x.o > obj-$(CONFIG_AT91_ADC) += at91_adc.o > obj-$(CONFIG_EXYNOS_ADC) += exynos_adc.o > +obj-$(CONFIG_FSL_MX25_ADC) += fsl-imx25-gcq.o > obj-$(CONFIG_LP8788_ADC) += lp8788_adc.o > obj-$(CONFIG_MAX1363) += max1363.o > obj-$(CONFIG_MCP320X) += mcp320x.o > diff --git a/drivers/iio/adc/fsl-imx25-gcq.c b/drivers/iio/adc/fsl-imx25-gcq.c > new file mode 100644 > index 0000000..1ae697c > --- /dev/null > +++ b/drivers/iio/adc/fsl-imx25-gcq.c > @@ -0,0 +1,338 @@ > +/* > + * Copyright 2014 Markus Pargmann, Pengutronix <mpa@pengutronix.de> > + * > + * The code contained herein is licensed under the GNU General Public > + * License. You may obtain a copy of the GNU General Public License > + * Version 2 or later at the following locations: > + * > + * http://www.opensource.org/licenses/gpl-license.html > + * http://www.gnu.org/copyleft/gpl.html > + * > + * This is the driver for the imx25 GCQ (Generic Conversion Queue) > + * connected to the imx25 ADC. > + */ > + > +#include <linux/clk.h> > +#include <linux/interrupt.h> > +#include <linux/iio/iio.h> > +#include <linux/mfd/imx25-tsadc.h> > +#include <linux/module.h> > +#include <linux/of.h> > +#include <linux/platform_device.h> > +#include <linux/regmap.h> > + > +#define MX25_GCQ_TIMEOUT (msecs_to_jiffies(2000)) > + > +enum mx25_gcq_cfgs { > + MX25_CFG_XP = 0, > + MX25_CFG_YP, > + MX25_CFG_XN, > + MX25_CFG_YN, > + MX25_CFG_WIPER, > + MX25_CFG_INAUX0, > + MX25_CFG_INAUX1, > + MX25_CFG_INAUX2, > + MX25_NUM_CFGS, > +}; > + > +struct mx25_gcq_priv { > + struct regmap *regs; > + struct completion completed; > + unsigned int settling_time; > + struct clk *clk; > + int irq; > +}; > + > +#define MX25_IIO_CHAN(chan, id) {\ > + .type = IIO_VOLTAGE,\ > + .indexed = 1,\ > + .channel = chan,\ > + .address = chan,\ No real point in setting address if it is equal to channel. Just use channel instead. Address is just here for when it is convenient to store something like a register address rather than for a copy of the index. > + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \ No known info on converting this to real voltages? I'd normally expect a scale parameter at least with any raw channel output, but fair enough if it's not obvous what this should be. > + .datasheet_name = id, \ > + } > + > +static const struct iio_chan_spec mx25_gcq_channels[MX25_NUM_CFGS] = { > + MX25_IIO_CHAN(0, "xp"), > + MX25_IIO_CHAN(1, "yp"), > + MX25_IIO_CHAN(2, "xn"), > + MX25_IIO_CHAN(3, "yn"), > + MX25_IIO_CHAN(4, "wiper"), > + MX25_IIO_CHAN(5, "inaux0"), > + MX25_IIO_CHAN(6, "inaux1"), > + MX25_IIO_CHAN(7, "inaux2"), > +}; > + > +static void mx25_gcq_disable_eoq(struct mx25_gcq_priv *priv) > +{ > + regmap_update_bits(priv->regs, MX25_ADCQ_MR, MX25_ADCQ_MR_EOQ_IRQ, > + MX25_ADCQ_MR_EOQ_IRQ); > +} > + > +static void mx25_gcq_enable_eoq(struct mx25_gcq_priv *priv) > +{ > + regmap_update_bits(priv->regs, MX25_ADCQ_MR, MX25_ADCQ_MR_EOQ_IRQ, 0); > +} > + > +static irqreturn_t mx25_gcq_irq(int irq, void *data) > +{ I suppose there isn't that much in here, but could it be a threaded irq without loosing anything significant? A general good practice element rather than a specific comment on what you have here! > + struct mx25_gcq_priv *priv = data; > + u32 stats; > + > + regmap_read(priv->regs, MX25_ADCQ_SR, &stats); > + > + if (stats & MX25_ADCQ_SR_EOQ) { > + mx25_gcq_disable_eoq(priv); > + complete(&priv->completed); > + } > + > + /* Disable conversion queue run */ > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FQS, 0); > + > + /* Acknowledge all possible irqs */ > + regmap_write(priv->regs, MX25_ADCQ_SR, MX25_ADCQ_SR_FRR | > + MX25_ADCQ_SR_FUR | MX25_ADCQ_SR_FOR | MX25_ADCQ_SR_EOQ | > + MX25_ADCQ_SR_PD); > + > + return IRQ_HANDLED; > +} > + > +static int mx25_gcq_read_raw(struct iio_dev *idev, > + struct iio_chan_spec const *chan, int *val, int *val2, > + long mask) > +{ > + struct mx25_gcq_priv *priv = iio_priv(idev); > + unsigned long timeout; > + u32 data; > + int ret; > + > + if (mask != IIO_CHAN_INFO_RAW) > + return -EINVAL; > + > + mutex_lock(&idev->mlock); > + > + /* Setup the configuration we want to use */ > + regmap_write(priv->regs, MX25_ADCQ_ITEM_7_0, > + MX25_ADCQ_ITEM(0, chan->address)); > + > + mx25_gcq_enable_eoq(priv); > + > + /* Trigger queue for one run */ > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FQS, > + MX25_ADCQ_CR_FQS); > + > + timeout = wait_for_completion_interruptible_timeout(&priv->completed, > + MX25_GCQ_TIMEOUT); > + if (timeout < 0) { > + dev_err(&idev->dev, "ADC wait for measurement failed\n"); > + ret = timeout; > + goto out; > + } else if (timeout == 0) { > + dev_err(&idev->dev, "ADC timed out\n"); > + ret = -ETIMEDOUT; > + goto out; > + } > + > + regmap_read(priv->regs, MX25_ADCQ_FIFO, &data); > + *val = MX25_ADCQ_FIFO_DATA(data); > + > + ret = IIO_VAL_INT; > + > +out: > + mutex_unlock(&idev->mlock); > + > + return ret; > +} > + > +static const struct iio_info mx25_gcq_iio_info = { > + .read_raw = mx25_gcq_read_raw, > +}; > + > +static const struct regmap_config mx25_gcq_regconfig = { > + .max_register = 0x5c, > + .reg_bits = 32, > + .val_bits = 32, > + .reg_stride = 4, > +}; > + > +static int mx25_gcq_setup_cfgs(struct platform_device *pdev, > + struct mx25_gcq_priv *priv) > +{ > + struct device_node *np = pdev->dev.of_node; > + struct device_node *child; > + struct device *dev = &pdev->dev; > + int ret; > + int i; > + > + /* Setup all configurations registers with a default conversion > + * configuration for each input */ > + for (i = 0; i != MX25_NUM_CFGS; ++i) > + regmap_write(priv->regs, MX25_ADCQ_CFG(i), > + MX25_ADCQ_CFG_YPLL_OFF | > + MX25_ADCQ_CFG_XNUR_OFF | > + MX25_ADCQ_CFG_XPUL_OFF | > + MX25_ADCQ_CFG_REFP_INT | > + (i << 4) | > + MX25_ADCQ_CFG_REFN_NGND2); > + > + for_each_child_of_node(np, child) { > + u32 reg; > + u32 refn; > + u32 refp; > + > + ret = of_property_read_u32(child, "reg", ®); > + if (ret) { > + dev_err(dev, "Failed to get reg property\n"); > + return ret; > + } > + if (reg > MX25_NUM_CFGS) { > + dev_err(dev, "reg value is greater than the number of available configuration registers\n"); > + return -EINVAL; > + } > + > + ret = of_property_read_u32(child, "fsl,adc-refn", &refn); > + if (ret) { > + dev_err(dev, "Failed to get fsl,adc-refn property\n"); > + return ret; > + } > + if (refn < 0 || refn > 3) { > + dev_err(dev, "Invalid fsl,adc-refn property value %d\n", > + refn); > + return -EINVAL > + } > + > + ret = of_property_read_u32(child, "fsl,adc-refp", &refp); > + if (ret) { > + dev_err(dev, "Failed to get fsl,adc-refp property\n"); > + return ret; > + } > + if (refp < 0 || refp > 3) { > + dev_err(dev, "Invalid fsl,adc-refp property value %d\n", > + refp); > + return -EINVAL; > + } > + > + regmap_update_bits(priv->regs, MX25_ADCQ_CFG(reg), > + MX25_ADCQ_CFG_REFP_MASK | > + MX25_ADCQ_CFG_REFN_MASK, > + (refp << 7) | (refn << 2)); > + } > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, > + MX25_ADCQ_CR_FRST | MX25_ADCQ_CR_QRST, > + MX25_ADCQ_CR_FRST | MX25_ADCQ_CR_QRST); > + > + regmap_write(priv->regs, MX25_ADCQ_CR, > + MX25_ADCQ_CR_PDMSK | > + MX25_ADCQ_CR_QSM_FQS); > + > + return 0; > +} > + > +static int mx25_gcq_probe(struct platform_device *pdev) > +{ > + struct iio_dev *idev; > + struct mx25_gcq_priv *priv; > + struct resource *res; > + struct device *dev = &pdev->dev; > + int ret; > + void __iomem *mem; > + > + idev = devm_iio_device_alloc(&pdev->dev, sizeof(*priv)); > + if (!idev) > + return -ENOMEM; > + > + priv = iio_priv(idev); > + > + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); check this succeeded. > + mem = devm_ioremap_resource(dev, res); > + if (!mem) > + return -ENOMEM; > + > + priv->regs = devm_regmap_init_mmio(dev, mem, &mx25_gcq_regconfig); > + if (IS_ERR(priv->regs)) { > + dev_err(dev, "Failed to initialize regmap\n"); > + return PTR_ERR(priv->regs); > + } > + > + init_completion(&priv->completed); > + > + ret = mx25_gcq_setup_cfgs(pdev, priv); > + if (ret) This looks suspect given you haven't actually gained the irq yet (any time we have a return ret after a goto something tends to be interesting!) > + goto err_irq_free; > + > + priv->clk = mx25_tsadc_get_ipg(pdev->dev.parent); > + ret = clk_prepare_enable(priv->clk); > + if (ret) { > + dev_err(dev, "Failed to enable clock\n"); > + return ret; > + } > + > + priv->irq = platform_get_irq(pdev, 0); > + if (priv->irq <= 0) { > + dev_err(dev, "Failed to get IRQ\n"); > + err = priv->irq; > + goto err_clk_unprepare; > + } > + > + ret = request_irq(priv->irq, mx25_gcq_irq, NULL, pdev->name, > + priv); As mentioned above, could this be a threaded irq without causing significant problems? > + if (ret) { > + dev_err(dev, "Failed requesting IRQ\n"); > + goto err_clk_unprepare; > + } > + > + idev->dev.parent = &pdev->dev; > + idev->channels = mx25_gcq_channels; > + idev->num_channels = ARRAY_SIZE(mx25_gcq_channels); > + idev->info = &mx25_gcq_iio_info; > + > + ret = iio_device_register(idev); > + if (ret) { > + dev_err(dev, "Failed to register iio device\n"); > + goto err_irq_free; > + } > + > + platform_set_drvdata(pdev, priv); > + > + return 0; > + > +err_irq_free: > + free_irq(priv->irq, (void *)priv); > + > +err_clk_unprepare: > + clk_disable_unprepare(priv->clk); > + > + return ret; > +} > + > +static int mx25_gcq_remove(struct platform_device *pdev) > +{ > + struct mx25_gcq_priv *priv = platform_get_drvdata(pdev); > + struct iio_dev *idev = iio_priv_to_dev(pdev); > + > + iio_device_unregister(idev); > + free_irq(priv->irq, (void *)priv); > + clk_disable_unprepare(priv->clk); > + > + return 0; > +} > + > +static struct of_device_id mx25_gcq_ids[] = { > + { .compatible = "fsl,imx25-gcq", }, > + { /* Senitel */ } > +}; > + > +static struct platform_driver mx25_gcq_driver = { > + .driver = { > + .name = "mx25-gcq", > + .owner = THIS_MODULE, > + .of_match_table = mx25_gcq_ids, > + }, > + .probe = mx25_gcq_probe, > + .remove = mx25_gcq_remove, > +}; > +module_platform_driver(mx25_gcq_driver); > + > +MODULE_DESCRIPTION("ADC driver for Freescale mx25"); > +MODULE_AUTHOR("Markus Pargmann <mpa@pengutronix.de>"); > +MODULE_LICENSE("GPL v2"); > ^ permalink raw reply [flat|nested] 76+ messages in thread
* Re: [PATCH v2 3/6] iio: adc: fsl,imx25-gcq driver @ 2014-06-21 10:30 ` Jonathan Cameron 0 siblings, 0 replies; 76+ messages in thread From: Jonathan Cameron @ 2014-06-21 10:30 UTC (permalink / raw) To: Denis Carikli, Shawn Guo, Samuel Ortiz, Dmitry Torokhov Cc: Eric Bénard, Sascha Hauer, linux-arm-kernel, Lee Jones, linux-input, linux-iio, Fabio Estevam, Lars-Peter Clausen, Markus Pargmann, Devicetree List On 13/06/14 16:21, Denis Carikli wrote: > From: Markus Pargmann <mpa@pengutronix.de> > > This is a conversion queue driver for the mx25 SoC. It uses the central > ADC which is used by two seperate independent queues. This driver > prepares different conversion configurations for each possible input. > For a conversion it creates a conversionqueue of one item with the > correct configuration for the chosen channel. It then executes the queue > once and disables the conversion queue afterwards. > > The reference voltages are configurable through devicetree subnodes, > depending on the connections of the ADC inputs. > > Signed-off-by: Markus Pargmann <mpa@pengutronix.de> > Signed-off-by: Denis Carikli <denis@eukrea.com> Couple of little bits + I think we have enough 'interesting' bits in the device tree binding that we are going to need an Ack from a device tree maintainer. Note any patch at all with device tree bindings should be cc'd to devicetree@vger.kernel.org > --- > .../devicetree/bindings/iio/adc/fsl,imx25-gcq.txt | 54 ++++ > drivers/iio/adc/Kconfig | 7 + > drivers/iio/adc/Makefile | 1 + > drivers/iio/adc/fsl-imx25-gcq.c | 338 ++++++++++++++++++++ > 4 files changed, 400 insertions(+) > create mode 100644 Documentation/devicetree/bindings/iio/adc/fsl,imx25-gcq.txt > create mode 100644 drivers/iio/adc/fsl-imx25-gcq.c > > diff --git a/Documentation/devicetree/bindings/iio/adc/fsl,imx25-gcq.txt b/Documentation/devicetree/bindings/iio/adc/fsl,imx25-gcq.txt > new file mode 100644 > index 0000000..333fc55 > --- /dev/null > +++ b/Documentation/devicetree/bindings/iio/adc/fsl,imx25-gcq.txt > @@ -0,0 +1,54 @@ > +Freescale i.MX25 ADC GCQ device > + > +This is a generic conversion queue device that can convert any of the analog > +inputs using the ADC unit of the i.MX25. > + > +Required properties: > + - compatible: Should be "fsl,imx25-gcq". > + - reg: Should be the register range of the module. > + - interrupts: Should be the interrupt number of the module. Typically this is <1>. > + - interrupt-parent: phandle to the tsadc module of the i.MX25. > + - #address-cells: Should be <1> (setting for the subnodes) > + - #size-cells: Should be <0> (setting for the subnodes) > + > +Optionally you can define subnodes which define the positive and negative > +reference voltage for one of the analog inputs. > + > +Required properties for subnodes: > + - reg: Should be the number of the analog input. > + 0: xp > + 1: yp > + 2: xn > + 3: yn > + 4: wiper > + 5: inaux0 > + 6: inaux1 > + 7: inaux2 > + - fsl,adc-refp: Positive reference input > + 0: yp > + 1: xp > + 2: External reference > + 3: Internal reference > + - fsl,adc-refn: Negative reference input > + 0: xn > + 1: yn > + 2: ngnd_adc > + 3: ngnd_adc > + > + > +Example: > + > + adc: adc@50030800 { > + compatible = "fsl,imx25-gcq"; > + reg = <0x50030800 0x60>; > + interrupt-parent = <&tscadc>; > + interrupts = <1>; > + #address-cells = <1>; > + #size-cells = <0>; > + > + inaux@5 { > + reg = <5>; > + fsl,adc-refp = <3>; > + fsl,adc-refn = <3>; > + }; > + }; This lot is involved enough that we'll need a devicetree maintainer ack I think... > diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig > index a80d236..58efb8d 100644 > --- a/drivers/iio/adc/Kconfig > +++ b/drivers/iio/adc/Kconfig > @@ -125,6 +125,13 @@ config EXYNOS_ADC > of SoCs for drivers such as the touchscreen and hwmon to use to share > this resource. > > +config FSL_MX25_ADC > + tristate "Freescale MX25 ADC driver" > + depends on MFD_MX25_TSADC > + help > + Generic Conversion Queue driver used for general purpose ADC in the > + MX25. This driver supports single measurements using the MX25 ADC. > + > config LP8788_ADC > tristate "LP8788 ADC driver" > depends on MFD_LP8788 > diff --git a/drivers/iio/adc/Makefile b/drivers/iio/adc/Makefile > index 9d60f2d..2767fd6 100644 > --- a/drivers/iio/adc/Makefile > +++ b/drivers/iio/adc/Makefile > @@ -14,6 +14,7 @@ obj-$(CONFIG_AD7887) += ad7887.o > obj-$(CONFIG_AD799X) += ad799x.o > obj-$(CONFIG_AT91_ADC) += at91_adc.o > obj-$(CONFIG_EXYNOS_ADC) += exynos_adc.o > +obj-$(CONFIG_FSL_MX25_ADC) += fsl-imx25-gcq.o > obj-$(CONFIG_LP8788_ADC) += lp8788_adc.o > obj-$(CONFIG_MAX1363) += max1363.o > obj-$(CONFIG_MCP320X) += mcp320x.o > diff --git a/drivers/iio/adc/fsl-imx25-gcq.c b/drivers/iio/adc/fsl-imx25-gcq.c > new file mode 100644 > index 0000000..1ae697c > --- /dev/null > +++ b/drivers/iio/adc/fsl-imx25-gcq.c > @@ -0,0 +1,338 @@ > +/* > + * Copyright 2014 Markus Pargmann, Pengutronix <mpa@pengutronix.de> > + * > + * The code contained herein is licensed under the GNU General Public > + * License. You may obtain a copy of the GNU General Public License > + * Version 2 or later at the following locations: > + * > + * http://www.opensource.org/licenses/gpl-license.html > + * http://www.gnu.org/copyleft/gpl.html > + * > + * This is the driver for the imx25 GCQ (Generic Conversion Queue) > + * connected to the imx25 ADC. > + */ > + > +#include <linux/clk.h> > +#include <linux/interrupt.h> > +#include <linux/iio/iio.h> > +#include <linux/mfd/imx25-tsadc.h> > +#include <linux/module.h> > +#include <linux/of.h> > +#include <linux/platform_device.h> > +#include <linux/regmap.h> > + > +#define MX25_GCQ_TIMEOUT (msecs_to_jiffies(2000)) > + > +enum mx25_gcq_cfgs { > + MX25_CFG_XP = 0, > + MX25_CFG_YP, > + MX25_CFG_XN, > + MX25_CFG_YN, > + MX25_CFG_WIPER, > + MX25_CFG_INAUX0, > + MX25_CFG_INAUX1, > + MX25_CFG_INAUX2, > + MX25_NUM_CFGS, > +}; > + > +struct mx25_gcq_priv { > + struct regmap *regs; > + struct completion completed; > + unsigned int settling_time; > + struct clk *clk; > + int irq; > +}; > + > +#define MX25_IIO_CHAN(chan, id) {\ > + .type = IIO_VOLTAGE,\ > + .indexed = 1,\ > + .channel = chan,\ > + .address = chan,\ No real point in setting address if it is equal to channel. Just use channel instead. Address is just here for when it is convenient to store something like a register address rather than for a copy of the index. > + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \ No known info on converting this to real voltages? I'd normally expect a scale parameter at least with any raw channel output, but fair enough if it's not obvous what this should be. > + .datasheet_name = id, \ > + } > + > +static const struct iio_chan_spec mx25_gcq_channels[MX25_NUM_CFGS] = { > + MX25_IIO_CHAN(0, "xp"), > + MX25_IIO_CHAN(1, "yp"), > + MX25_IIO_CHAN(2, "xn"), > + MX25_IIO_CHAN(3, "yn"), > + MX25_IIO_CHAN(4, "wiper"), > + MX25_IIO_CHAN(5, "inaux0"), > + MX25_IIO_CHAN(6, "inaux1"), > + MX25_IIO_CHAN(7, "inaux2"), > +}; > + > +static void mx25_gcq_disable_eoq(struct mx25_gcq_priv *priv) > +{ > + regmap_update_bits(priv->regs, MX25_ADCQ_MR, MX25_ADCQ_MR_EOQ_IRQ, > + MX25_ADCQ_MR_EOQ_IRQ); > +} > + > +static void mx25_gcq_enable_eoq(struct mx25_gcq_priv *priv) > +{ > + regmap_update_bits(priv->regs, MX25_ADCQ_MR, MX25_ADCQ_MR_EOQ_IRQ, 0); > +} > + > +static irqreturn_t mx25_gcq_irq(int irq, void *data) > +{ I suppose there isn't that much in here, but could it be a threaded irq without loosing anything significant? A general good practice element rather than a specific comment on what you have here! > + struct mx25_gcq_priv *priv = data; > + u32 stats; > + > + regmap_read(priv->regs, MX25_ADCQ_SR, &stats); > + > + if (stats & MX25_ADCQ_SR_EOQ) { > + mx25_gcq_disable_eoq(priv); > + complete(&priv->completed); > + } > + > + /* Disable conversion queue run */ > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FQS, 0); > + > + /* Acknowledge all possible irqs */ > + regmap_write(priv->regs, MX25_ADCQ_SR, MX25_ADCQ_SR_FRR | > + MX25_ADCQ_SR_FUR | MX25_ADCQ_SR_FOR | MX25_ADCQ_SR_EOQ | > + MX25_ADCQ_SR_PD); > + > + return IRQ_HANDLED; > +} > + > +static int mx25_gcq_read_raw(struct iio_dev *idev, > + struct iio_chan_spec const *chan, int *val, int *val2, > + long mask) > +{ > + struct mx25_gcq_priv *priv = iio_priv(idev); > + unsigned long timeout; > + u32 data; > + int ret; > + > + if (mask != IIO_CHAN_INFO_RAW) > + return -EINVAL; > + > + mutex_lock(&idev->mlock); > + > + /* Setup the configuration we want to use */ > + regmap_write(priv->regs, MX25_ADCQ_ITEM_7_0, > + MX25_ADCQ_ITEM(0, chan->address)); > + > + mx25_gcq_enable_eoq(priv); > + > + /* Trigger queue for one run */ > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FQS, > + MX25_ADCQ_CR_FQS); > + > + timeout = wait_for_completion_interruptible_timeout(&priv->completed, > + MX25_GCQ_TIMEOUT); > + if (timeout < 0) { > + dev_err(&idev->dev, "ADC wait for measurement failed\n"); > + ret = timeout; > + goto out; > + } else if (timeout == 0) { > + dev_err(&idev->dev, "ADC timed out\n"); > + ret = -ETIMEDOUT; > + goto out; > + } > + > + regmap_read(priv->regs, MX25_ADCQ_FIFO, &data); > + *val = MX25_ADCQ_FIFO_DATA(data); > + > + ret = IIO_VAL_INT; > + > +out: > + mutex_unlock(&idev->mlock); > + > + return ret; > +} > + > +static const struct iio_info mx25_gcq_iio_info = { > + .read_raw = mx25_gcq_read_raw, > +}; > + > +static const struct regmap_config mx25_gcq_regconfig = { > + .max_register = 0x5c, > + .reg_bits = 32, > + .val_bits = 32, > + .reg_stride = 4, > +}; > + > +static int mx25_gcq_setup_cfgs(struct platform_device *pdev, > + struct mx25_gcq_priv *priv) > +{ > + struct device_node *np = pdev->dev.of_node; > + struct device_node *child; > + struct device *dev = &pdev->dev; > + int ret; > + int i; > + > + /* Setup all configurations registers with a default conversion > + * configuration for each input */ > + for (i = 0; i != MX25_NUM_CFGS; ++i) > + regmap_write(priv->regs, MX25_ADCQ_CFG(i), > + MX25_ADCQ_CFG_YPLL_OFF | > + MX25_ADCQ_CFG_XNUR_OFF | > + MX25_ADCQ_CFG_XPUL_OFF | > + MX25_ADCQ_CFG_REFP_INT | > + (i << 4) | > + MX25_ADCQ_CFG_REFN_NGND2); > + > + for_each_child_of_node(np, child) { > + u32 reg; > + u32 refn; > + u32 refp; > + > + ret = of_property_read_u32(child, "reg", ®); > + if (ret) { > + dev_err(dev, "Failed to get reg property\n"); > + return ret; > + } > + if (reg > MX25_NUM_CFGS) { > + dev_err(dev, "reg value is greater than the number of available configuration registers\n"); > + return -EINVAL; > + } > + > + ret = of_property_read_u32(child, "fsl,adc-refn", &refn); > + if (ret) { > + dev_err(dev, "Failed to get fsl,adc-refn property\n"); > + return ret; > + } > + if (refn < 0 || refn > 3) { > + dev_err(dev, "Invalid fsl,adc-refn property value %d\n", > + refn); > + return -EINVAL > + } > + > + ret = of_property_read_u32(child, "fsl,adc-refp", &refp); > + if (ret) { > + dev_err(dev, "Failed to get fsl,adc-refp property\n"); > + return ret; > + } > + if (refp < 0 || refp > 3) { > + dev_err(dev, "Invalid fsl,adc-refp property value %d\n", > + refp); > + return -EINVAL; > + } > + > + regmap_update_bits(priv->regs, MX25_ADCQ_CFG(reg), > + MX25_ADCQ_CFG_REFP_MASK | > + MX25_ADCQ_CFG_REFN_MASK, > + (refp << 7) | (refn << 2)); > + } > + regmap_update_bits(priv->regs, MX25_ADCQ_CR, > + MX25_ADCQ_CR_FRST | MX25_ADCQ_CR_QRST, > + MX25_ADCQ_CR_FRST | MX25_ADCQ_CR_QRST); > + > + regmap_write(priv->regs, MX25_ADCQ_CR, > + MX25_ADCQ_CR_PDMSK | > + MX25_ADCQ_CR_QSM_FQS); > + > + return 0; > +} > + > +static int mx25_gcq_probe(struct platform_device *pdev) > +{ > + struct iio_dev *idev; > + struct mx25_gcq_priv *priv; > + struct resource *res; > + struct device *dev = &pdev->dev; > + int ret; > + void __iomem *mem; > + > + idev = devm_iio_device_alloc(&pdev->dev, sizeof(*priv)); > + if (!idev) > + return -ENOMEM; > + > + priv = iio_priv(idev); > + > + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); check this succeeded. > + mem = devm_ioremap_resource(dev, res); > + if (!mem) > + return -ENOMEM; > + > + priv->regs = devm_regmap_init_mmio(dev, mem, &mx25_gcq_regconfig); > + if (IS_ERR(priv->regs)) { > + dev_err(dev, "Failed to initialize regmap\n"); > + return PTR_ERR(priv->regs); > + } > + > + init_completion(&priv->completed); > + > + ret = mx25_gcq_setup_cfgs(pdev, priv); > + if (ret) This looks suspect given you haven't actually gained the irq yet (any time we have a return ret after a goto something tends to be interesting!) > + goto err_irq_free; > + > + priv->clk = mx25_tsadc_get_ipg(pdev->dev.parent); > + ret = clk_prepare_enable(priv->clk); > + if (ret) { > + dev_err(dev, "Failed to enable clock\n"); > + return ret; > + } > + > + priv->irq = platform_get_irq(pdev, 0); > + if (priv->irq <= 0) { > + dev_err(dev, "Failed to get IRQ\n"); > + err = priv->irq; > + goto err_clk_unprepare; > + } > + > + ret = request_irq(priv->irq, mx25_gcq_irq, NULL, pdev->name, > + priv); As mentioned above, could this be a threaded irq without causing significant problems? > + if (ret) { > + dev_err(dev, "Failed requesting IRQ\n"); > + goto err_clk_unprepare; > + } > + > + idev->dev.parent = &pdev->dev; > + idev->channels = mx25_gcq_channels; > + idev->num_channels = ARRAY_SIZE(mx25_gcq_channels); > + idev->info = &mx25_gcq_iio_info; > + > + ret = iio_device_register(idev); > + if (ret) { > + dev_err(dev, "Failed to register iio device\n"); > + goto err_irq_free; > + } > + > + platform_set_drvdata(pdev, priv); > + > + return 0; > + > +err_irq_free: > + free_irq(priv->irq, (void *)priv); > + > +err_clk_unprepare: > + clk_disable_unprepare(priv->clk); > + > + return ret; > +} > + > +static int mx25_gcq_remove(struct platform_device *pdev) > +{ > + struct mx25_gcq_priv *priv = platform_get_drvdata(pdev); > + struct iio_dev *idev = iio_priv_to_dev(pdev); > + > + iio_device_unregister(idev); > + free_irq(priv->irq, (void *)priv); > + clk_disable_unprepare(priv->clk); > + > + return 0; > +} > + > +static struct of_device_id mx25_gcq_ids[] = { > + { .compatible = "fsl,imx25-gcq", }, > + { /* Senitel */ } > +}; > + > +static struct platform_driver mx25_gcq_driver = { > + .driver = { > + .name = "mx25-gcq", > + .owner = THIS_MODULE, > + .of_match_table = mx25_gcq_ids, > + }, > + .probe = mx25_gcq_probe, > + .remove = mx25_gcq_remove, > +}; > +module_platform_driver(mx25_gcq_driver); > + > +MODULE_DESCRIPTION("ADC driver for Freescale mx25"); > +MODULE_AUTHOR("Markus Pargmann <mpa@pengutronix.de>"); > +MODULE_LICENSE("GPL v2"); > ^ permalink raw reply [flat|nested] 76+ messages in thread
[parent not found: <53A55EDF.4010104-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>]
* Re: [PATCH v2 3/6] iio: adc: fsl,imx25-gcq driver 2014-06-21 10:30 ` Jonathan Cameron (?) @ 2014-06-24 10:38 ` Denis Carikli -1 siblings, 0 replies; 76+ messages in thread From: Denis Carikli @ 2014-06-24 10:38 UTC (permalink / raw) To: Jonathan Cameron, Shawn Guo, Samuel Ortiz, Dmitry Torokhov Cc: Eric Bénard, Sascha Hauer, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, Lee Jones, linux-input-u79uwXL29TY76Z2rM5mHXA, linux-iio-u79uwXL29TY76Z2rM5mHXA, Fabio Estevam, Lars-Peter Clausen, Markus Pargmann, Devicetree List On 06/21/2014 12:30 PM, Jonathan Cameron wrote: >> + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \ > No known info on converting this to real voltages? I'd normally expect > a scale parameter at least with any raw channel output, but fair enough > if it's not obvous what this should be. We know the internal reference voltage. We can also know the external reference voltage by representing it as a regulator. Since there are many combinations should a regulator for each reference(external reference, xp, yp, xn and yn) be used? Denis. ^ permalink raw reply [flat|nested] 76+ messages in thread
* [PATCH v2 3/6] iio: adc: fsl,imx25-gcq driver @ 2014-06-24 10:38 ` Denis Carikli 0 siblings, 0 replies; 76+ messages in thread From: Denis Carikli @ 2014-06-24 10:38 UTC (permalink / raw) To: linux-arm-kernel On 06/21/2014 12:30 PM, Jonathan Cameron wrote: >> + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \ > No known info on converting this to real voltages? I'd normally expect > a scale parameter at least with any raw channel output, but fair enough > if it's not obvous what this should be. We know the internal reference voltage. We can also know the external reference voltage by representing it as a regulator. Since there are many combinations should a regulator for each reference(external reference, xp, yp, xn and yn) be used? Denis. ^ permalink raw reply [flat|nested] 76+ messages in thread
* Re: [PATCH v2 3/6] iio: adc: fsl,imx25-gcq driver @ 2014-06-24 10:38 ` Denis Carikli 0 siblings, 0 replies; 76+ messages in thread From: Denis Carikli @ 2014-06-24 10:38 UTC (permalink / raw) To: Jonathan Cameron, Shawn Guo, Samuel Ortiz, Dmitry Torokhov Cc: Eric Bénard, Sascha Hauer, linux-arm-kernel, Lee Jones, linux-input, linux-iio, Fabio Estevam, Lars-Peter Clausen, Markus Pargmann, Devicetree List On 06/21/2014 12:30 PM, Jonathan Cameron wrote: >> + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \ > No known info on converting this to real voltages? I'd normally expect > a scale parameter at least with any raw channel output, but fair enough > if it's not obvous what this should be. We know the internal reference voltage. We can also know the external reference voltage by representing it as a regulator. Since there are many combinations should a regulator for each reference(external reference, xp, yp, xn and yn) be used? Denis. ^ permalink raw reply [flat|nested] 76+ messages in thread
[parent not found: <53A95533.8090500-fO0SIAKYzcbQT0dZR+AlfA@public.gmane.org>]
* Re: [PATCH v2 3/6] iio: adc: fsl,imx25-gcq driver 2014-06-24 10:38 ` Denis Carikli (?) @ 2014-06-29 11:01 ` Jonathan Cameron -1 siblings, 0 replies; 76+ messages in thread From: Jonathan Cameron @ 2014-06-29 11:01 UTC (permalink / raw) To: Denis Carikli, Shawn Guo, Samuel Ortiz, Dmitry Torokhov Cc: Eric Bénard, Sascha Hauer, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, Lee Jones, linux-input-u79uwXL29TY76Z2rM5mHXA, linux-iio-u79uwXL29TY76Z2rM5mHXA, Fabio Estevam, Lars-Peter Clausen, Markus Pargmann, Devicetree List On 24/06/14 11:38, Denis Carikli wrote: > On 06/21/2014 12:30 PM, Jonathan Cameron wrote: >>> + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \ >> No known info on converting this to real voltages? I'd normally expect >> a scale parameter at least with any raw channel output, but fair enough >> if it's not obvous what this should be. > > We know the internal reference voltage. > We can also know the external reference voltage by representing it as a regulator. > > Since there are many combinations should a regulator for each reference(external reference, xp, yp, xn and yn) be used? > yes. ^ permalink raw reply [flat|nested] 76+ messages in thread
* [PATCH v2 3/6] iio: adc: fsl,imx25-gcq driver @ 2014-06-29 11:01 ` Jonathan Cameron 0 siblings, 0 replies; 76+ messages in thread From: Jonathan Cameron @ 2014-06-29 11:01 UTC (permalink / raw) To: linux-arm-kernel On 24/06/14 11:38, Denis Carikli wrote: > On 06/21/2014 12:30 PM, Jonathan Cameron wrote: >>> + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \ >> No known info on converting this to real voltages? I'd normally expect >> a scale parameter at least with any raw channel output, but fair enough >> if it's not obvous what this should be. > > We know the internal reference voltage. > We can also know the external reference voltage by representing it as a regulator. > > Since there are many combinations should a regulator for each reference(external reference, xp, yp, xn and yn) be used? > yes. ^ permalink raw reply [flat|nested] 76+ messages in thread
* Re: [PATCH v2 3/6] iio: adc: fsl,imx25-gcq driver @ 2014-06-29 11:01 ` Jonathan Cameron 0 siblings, 0 replies; 76+ messages in thread From: Jonathan Cameron @ 2014-06-29 11:01 UTC (permalink / raw) To: Denis Carikli, Shawn Guo, Samuel Ortiz, Dmitry Torokhov Cc: Eric Bénard, Sascha Hauer, linux-arm-kernel, Lee Jones, linux-input, linux-iio, Fabio Estevam, Lars-Peter Clausen, Markus Pargmann, Devicetree List On 24/06/14 11:38, Denis Carikli wrote: > On 06/21/2014 12:30 PM, Jonathan Cameron wrote: >>> + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \ >> No known info on converting this to real voltages? I'd normally expect >> a scale parameter at least with any raw channel output, but fair enough >> if it's not obvous what this should be. > > We know the internal reference voltage. > We can also know the external reference voltage by representing it as a regulator. > > Since there are many combinations should a regulator for each reference(external reference, xp, yp, xn and yn) be used? > yes. ^ permalink raw reply [flat|nested] 76+ messages in thread
* [PATCH v2 4/6] ARM: dts: imx25: Add touchscreen support 2014-06-13 15:21 ` Denis Carikli @ 2014-06-13 15:21 ` Denis Carikli -1 siblings, 0 replies; 76+ messages in thread From: Denis Carikli @ 2014-06-13 15:21 UTC (permalink / raw) To: Shawn Guo, Samuel Ortiz, Dmitry Torokhov, Jonathan Cameron Cc: Eric Bénard, Sascha Hauer, linux-arm-kernel, Lee Jones, linux-input, linux-iio, Fabio Estevam, Lars-Peter Clausen, Markus Pargmann, Denis Carikli Signed-off-by: Denis Carikli <denis@eukrea.com> --- arch/arm/boot/dts/imx25.dtsi | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/imx25.dtsi b/arch/arm/boot/dts/imx25.dtsi index 98783f5..5564167 100644 --- a/arch/arm/boot/dts/imx25.dtsi +++ b/arch/arm/boot/dts/imx25.dtsi @@ -264,12 +264,17 @@ status = "disabled"; }; - tsc: tsc@50030000 { - compatible = "fsl,imx25-adc", "fsl,imx21-tsc"; - reg = <0x50030000 0x4000>; + tscadc: tscadc@50030000 { + compatible = "fsl,imx25-tsadc"; + reg = <0x50030000 0xc>; interrupts = <46>; clocks = <&clks 119>; clock-names = "ipg"; + interrupt-controller; + #interrupt-cells = <1>; + #address-cells = <1>; + #size-cells = <1>; + ranges; status = "disabled"; }; -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 76+ messages in thread
* [PATCH v2 4/6] ARM: dts: imx25: Add touchscreen support @ 2014-06-13 15:21 ` Denis Carikli 0 siblings, 0 replies; 76+ messages in thread From: Denis Carikli @ 2014-06-13 15:21 UTC (permalink / raw) To: linux-arm-kernel Signed-off-by: Denis Carikli <denis@eukrea.com> --- arch/arm/boot/dts/imx25.dtsi | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/imx25.dtsi b/arch/arm/boot/dts/imx25.dtsi index 98783f5..5564167 100644 --- a/arch/arm/boot/dts/imx25.dtsi +++ b/arch/arm/boot/dts/imx25.dtsi @@ -264,12 +264,17 @@ status = "disabled"; }; - tsc: tsc at 50030000 { - compatible = "fsl,imx25-adc", "fsl,imx21-tsc"; - reg = <0x50030000 0x4000>; + tscadc: tscadc at 50030000 { + compatible = "fsl,imx25-tsadc"; + reg = <0x50030000 0xc>; interrupts = <46>; clocks = <&clks 119>; clock-names = "ipg"; + interrupt-controller; + #interrupt-cells = <1>; + #address-cells = <1>; + #size-cells = <1>; + ranges; status = "disabled"; }; -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 76+ messages in thread
* [PATCH v2 5/6] ARM: dts: imx25: mbimxsd25: Add touchscreen support. 2014-06-13 15:21 ` Denis Carikli @ 2014-06-13 15:21 ` Denis Carikli -1 siblings, 0 replies; 76+ messages in thread From: Denis Carikli @ 2014-06-13 15:21 UTC (permalink / raw) To: Shawn Guo, Samuel Ortiz, Dmitry Torokhov, Jonathan Cameron Cc: Eric Bénard, Sascha Hauer, linux-arm-kernel, Lee Jones, linux-input, linux-iio, Fabio Estevam, Lars-Peter Clausen, Markus Pargmann, Denis Carikli Signed-off-by: Denis Carikli <denis@eukrea.com> --- .../imx25-eukrea-mbimxsd25-baseboard-cmo-qvga.dts | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard-cmo-qvga.dts b/arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard-cmo-qvga.dts index 9797280..047918d 100644 --- a/arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard-cmo-qvga.dts +++ b/arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard-cmo-qvga.dts @@ -70,3 +70,16 @@ lcd-supply = <®_lcd_3v3>; status = "okay"; }; + +&tscadc { + status = "okay"; + + tsc: tcq@50030400 { + compatible = "fsl,imx25-tcq"; + reg = <0x50030400 0x60>; + interrupt-parent = <&tscadc>; + interrupts = <0>; + fsl,wires = <4>; + fsl,pen-debounce = <100>; + }; +}; -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 76+ messages in thread
* [PATCH v2 5/6] ARM: dts: imx25: mbimxsd25: Add touchscreen support. @ 2014-06-13 15:21 ` Denis Carikli 0 siblings, 0 replies; 76+ messages in thread From: Denis Carikli @ 2014-06-13 15:21 UTC (permalink / raw) To: linux-arm-kernel Signed-off-by: Denis Carikli <denis@eukrea.com> --- .../imx25-eukrea-mbimxsd25-baseboard-cmo-qvga.dts | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard-cmo-qvga.dts b/arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard-cmo-qvga.dts index 9797280..047918d 100644 --- a/arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard-cmo-qvga.dts +++ b/arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard-cmo-qvga.dts @@ -70,3 +70,16 @@ lcd-supply = <®_lcd_3v3>; status = "okay"; }; + +&tscadc { + status = "okay"; + + tsc: tcq at 50030400 { + compatible = "fsl,imx25-tcq"; + reg = <0x50030400 0x60>; + interrupt-parent = <&tscadc>; + interrupts = <0>; + fsl,wires = <4>; + fsl,pen-debounce = <100>; + }; +}; -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 76+ messages in thread
* Re: [PATCH v2 5/6] ARM: dts: imx25: mbimxsd25: Add touchscreen support. 2014-06-13 15:21 ` Denis Carikli @ 2014-06-13 17:10 ` Fabio Estevam -1 siblings, 0 replies; 76+ messages in thread From: Fabio Estevam @ 2014-06-13 17:10 UTC (permalink / raw) To: Denis Carikli Cc: Shawn Guo, Samuel Ortiz, Dmitry Torokhov, Jonathan Cameron, Eric Bénard, Sascha Hauer, linux-arm-kernel, Lee Jones, linux-input, linux-iio, Lars-Peter Clausen, Markus Pargmann Hi Denis, On Fri, Jun 13, 2014 at 12:21 PM, Denis Carikli <denis@eukrea.com> wrote: > Signed-off-by: Denis Carikli <denis@eukrea.com> > --- > .../imx25-eukrea-mbimxsd25-baseboard-cmo-qvga.dts | 13 +++++++++++++ > 1 file changed, 13 insertions(+) > > diff --git a/arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard-cmo-qvga.dts b/arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard-cmo-qvga.dts > index 9797280..047918d 100644 > --- a/arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard-cmo-qvga.dts > +++ b/arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard-cmo-qvga.dts > @@ -70,3 +70,16 @@ > lcd-supply = <®_lcd_3v3>; > status = "okay"; > }; > + > +&tscadc { > + status = "okay"; > + > + tsc: tcq@50030400 { > + compatible = "fsl,imx25-tcq"; > + reg = <0x50030400 0x60>; > + interrupt-parent = <&tscadc>; > + interrupts = <0>; > + fsl,wires = <4>; > + fsl,pen-debounce = <100>; What about just keeping only inside the dts: &tsadc { status = "okay"; } Then the rest could go to the imx25.dtsi. fsl,wires and fsl,pen-debounce could be overwritten by board dts if needed. ^ permalink raw reply [flat|nested] 76+ messages in thread
* [PATCH v2 5/6] ARM: dts: imx25: mbimxsd25: Add touchscreen support. @ 2014-06-13 17:10 ` Fabio Estevam 0 siblings, 0 replies; 76+ messages in thread From: Fabio Estevam @ 2014-06-13 17:10 UTC (permalink / raw) To: linux-arm-kernel Hi Denis, On Fri, Jun 13, 2014 at 12:21 PM, Denis Carikli <denis@eukrea.com> wrote: > Signed-off-by: Denis Carikli <denis@eukrea.com> > --- > .../imx25-eukrea-mbimxsd25-baseboard-cmo-qvga.dts | 13 +++++++++++++ > 1 file changed, 13 insertions(+) > > diff --git a/arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard-cmo-qvga.dts b/arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard-cmo-qvga.dts > index 9797280..047918d 100644 > --- a/arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard-cmo-qvga.dts > +++ b/arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard-cmo-qvga.dts > @@ -70,3 +70,16 @@ > lcd-supply = <®_lcd_3v3>; > status = "okay"; > }; > + > +&tscadc { > + status = "okay"; > + > + tsc: tcq at 50030400 { > + compatible = "fsl,imx25-tcq"; > + reg = <0x50030400 0x60>; > + interrupt-parent = <&tscadc>; > + interrupts = <0>; > + fsl,wires = <4>; > + fsl,pen-debounce = <100>; What about just keeping only inside the dts: &tsadc { status = "okay"; } Then the rest could go to the imx25.dtsi. fsl,wires and fsl,pen-debounce could be overwritten by board dts if needed. ^ permalink raw reply [flat|nested] 76+ messages in thread
* [PATCH v2 6/6] ARM: imx_v4_v5_defconfig: Add I.MX25 Touchscreen controller support. 2014-06-13 15:21 ` Denis Carikli @ 2014-06-13 15:21 ` Denis Carikli -1 siblings, 0 replies; 76+ messages in thread From: Denis Carikli @ 2014-06-13 15:21 UTC (permalink / raw) To: Shawn Guo, Samuel Ortiz, Dmitry Torokhov, Jonathan Cameron Cc: Eric Bénard, Sascha Hauer, linux-arm-kernel, Lee Jones, linux-input, linux-iio, Fabio Estevam, Lars-Peter Clausen, Markus Pargmann, Denis Carikli Signed-off-by: Denis Carikli <denis@eukrea.com> --- arch/arm/configs/imx_v4_v5_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/configs/imx_v4_v5_defconfig b/arch/arm/configs/imx_v4_v5_defconfig index 397f43c..b6b3674 100644 --- a/arch/arm/configs/imx_v4_v5_defconfig +++ b/arch/arm/configs/imx_v4_v5_defconfig @@ -98,6 +98,7 @@ CONFIG_KEYBOARD_IMX=y # CONFIG_INPUT_MOUSE is not set CONFIG_INPUT_TOUCHSCREEN=y CONFIG_TOUCHSCREEN_ADS7846=m +CONFIG_TOUCHSCREEN_MX25=y CONFIG_TOUCHSCREEN_MC13783=y # CONFIG_LEGACY_PTYS is not set CONFIG_SERIAL_8250=m @@ -118,6 +119,7 @@ CONFIG_HWMON=m CONFIG_SENSORS_MC13783_ADC=m CONFIG_WATCHDOG=y CONFIG_IMX2_WDT=y +CONFIG_MFD_MX25_TSADC=y CONFIG_MFD_MC13XXX_SPI=y CONFIG_REGULATOR=y CONFIG_REGULATOR_FIXED_VOLTAGE=y -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 76+ messages in thread
* [PATCH v2 6/6] ARM: imx_v4_v5_defconfig: Add I.MX25 Touchscreen controller support. @ 2014-06-13 15:21 ` Denis Carikli 0 siblings, 0 replies; 76+ messages in thread From: Denis Carikli @ 2014-06-13 15:21 UTC (permalink / raw) To: linux-arm-kernel Signed-off-by: Denis Carikli <denis@eukrea.com> --- arch/arm/configs/imx_v4_v5_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/configs/imx_v4_v5_defconfig b/arch/arm/configs/imx_v4_v5_defconfig index 397f43c..b6b3674 100644 --- a/arch/arm/configs/imx_v4_v5_defconfig +++ b/arch/arm/configs/imx_v4_v5_defconfig @@ -98,6 +98,7 @@ CONFIG_KEYBOARD_IMX=y # CONFIG_INPUT_MOUSE is not set CONFIG_INPUT_TOUCHSCREEN=y CONFIG_TOUCHSCREEN_ADS7846=m +CONFIG_TOUCHSCREEN_MX25=y CONFIG_TOUCHSCREEN_MC13783=y # CONFIG_LEGACY_PTYS is not set CONFIG_SERIAL_8250=m @@ -118,6 +119,7 @@ CONFIG_HWMON=m CONFIG_SENSORS_MC13783_ADC=m CONFIG_WATCHDOG=y CONFIG_IMX2_WDT=y +CONFIG_MFD_MX25_TSADC=y CONFIG_MFD_MC13XXX_SPI=y CONFIG_REGULATOR=y CONFIG_REGULATOR_FIXED_VOLTAGE=y -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 76+ messages in thread
end of thread, other threads:[~2014-07-03 17:57 UTC | newest]
Thread overview: 76+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-02-20 16:21 [PATCH 0/3] arm imx25 touchscreen/ADC drivers Markus Pargmann
2014-02-20 16:21 ` Markus Pargmann
2014-02-20 16:21 ` [PATCH 1/3] mfd: fsl imx25 Touchscreen ADC driver Markus Pargmann
2014-02-20 16:21 ` Markus Pargmann
2014-02-20 17:17 ` Fabio Estevam
2014-02-20 17:17 ` Fabio Estevam
[not found] ` <CAOMZO5BDyyvXs9CxJQOkuEpxZ8fqamCPB67sNhJxES+XU2XkXQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-02-21 9:18 ` Markus Pargmann
2014-02-21 9:18 ` Markus Pargmann
2014-02-21 9:18 ` Markus Pargmann
2014-02-21 10:18 ` Markus Pargmann
2014-02-21 10:18 ` Markus Pargmann
2014-02-21 10:18 ` Markus Pargmann
2014-02-20 16:21 ` [PATCH 2/3] input: touchscreen: imx25 tcq driver Markus Pargmann
2014-02-20 16:21 ` Markus Pargmann
[not found] ` <1392913312-9030-3-git-send-email-mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2014-02-23 6:44 ` Dmitry Torokhov
2014-02-23 6:44 ` Dmitry Torokhov
2014-02-23 6:44 ` Dmitry Torokhov
2014-02-25 11:05 ` Markus Pargmann
2014-02-25 11:05 ` Markus Pargmann
[not found] ` <1392913312-9030-1-git-send-email-mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2014-02-20 16:21 ` [PATCH 3/3] iio: adc: fsl,imx25-gcq driver Markus Pargmann
2014-02-20 16:21 ` Markus Pargmann
2014-02-20 16:21 ` Markus Pargmann
2014-02-20 17:46 ` Lars-Peter Clausen
2014-02-20 17:46 ` Lars-Peter Clausen
2014-02-20 17:46 ` Lars-Peter Clausen
2014-02-21 10:12 ` Markus Pargmann
2014-02-21 10:12 ` Markus Pargmann
2014-06-13 15:21 ` Dust off the "arm imx25 touchscreen/ADC drivers" patch serie Denis Carikli
2014-06-13 15:21 ` Denis Carikli
2014-06-13 15:21 ` [PATCH v2 1/6] mfd: fsl imx25 Touchscreen ADC driver Denis Carikli
2014-06-13 15:21 ` Denis Carikli
[not found] ` <1402672899-6995-2-git-send-email-denis-fO0SIAKYzcbQT0dZR+AlfA@public.gmane.org>
2014-06-21 10:09 ` Jonathan Cameron
2014-06-21 10:09 ` Jonathan Cameron
2014-06-21 10:09 ` Jonathan Cameron
2014-06-13 15:21 ` [PATCH v2 2/6] input: touchscreen: imx25 tcq driver Denis Carikli
2014-06-13 15:21 ` Denis Carikli
[not found] ` <1402672899-6995-3-git-send-email-denis-fO0SIAKYzcbQT0dZR+AlfA@public.gmane.org>
2014-06-15 7:27 ` Dmitry Torokhov
2014-06-15 7:27 ` Dmitry Torokhov
2014-06-15 7:27 ` Dmitry Torokhov
2014-06-21 10:18 ` Jonathan Cameron
2014-06-21 10:18 ` Jonathan Cameron
2014-06-21 19:55 ` Fabio Estevam
2014-06-21 19:55 ` Fabio Estevam
[not found] ` <CAOMZO5BxZDX5TDZdUCbpTw2LpVC=vr4cnn4eSpzd_023wcy+Fg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-06-29 11:00 ` Jonathan Cameron
2014-06-29 11:00 ` Jonathan Cameron
2014-06-29 11:00 ` Jonathan Cameron
[not found] ` <53AFF1C4.1010402-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2014-06-29 11:49 ` Russell King - ARM Linux
2014-06-29 11:49 ` Russell King - ARM Linux
2014-06-29 11:49 ` Russell King - ARM Linux
[not found] ` <20140629114901.GO32514-l+eeeJia6m9vn6HldHNs0ANdhmdF6hFW@public.gmane.org>
2014-07-03 17:57 ` Jonathan Cameron
2014-07-03 17:57 ` Jonathan Cameron
2014-07-03 17:57 ` Jonathan Cameron
2014-06-13 15:21 ` [PATCH v2 3/6] iio: adc: fsl,imx25-gcq driver Denis Carikli
2014-06-13 15:21 ` Denis Carikli
2014-06-14 19:27 ` Hartmut Knaack
2014-06-14 19:27 ` Hartmut Knaack
[not found] ` <1402672899-6995-4-git-send-email-denis-fO0SIAKYzcbQT0dZR+AlfA@public.gmane.org>
2014-06-13 17:25 ` Peter Meerwald
2014-06-13 17:25 ` Peter Meerwald
2014-06-13 17:25 ` Peter Meerwald
2014-06-21 10:30 ` Jonathan Cameron
2014-06-21 10:30 ` Jonathan Cameron
2014-06-21 10:30 ` Jonathan Cameron
[not found] ` <53A55EDF.4010104-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2014-06-24 10:38 ` Denis Carikli
2014-06-24 10:38 ` Denis Carikli
2014-06-24 10:38 ` Denis Carikli
[not found] ` <53A95533.8090500-fO0SIAKYzcbQT0dZR+AlfA@public.gmane.org>
2014-06-29 11:01 ` Jonathan Cameron
2014-06-29 11:01 ` Jonathan Cameron
2014-06-29 11:01 ` Jonathan Cameron
2014-06-13 15:21 ` [PATCH v2 4/6] ARM: dts: imx25: Add touchscreen support Denis Carikli
2014-06-13 15:21 ` Denis Carikli
2014-06-13 15:21 ` [PATCH v2 5/6] ARM: dts: imx25: mbimxsd25: " Denis Carikli
2014-06-13 15:21 ` Denis Carikli
2014-06-13 17:10 ` Fabio Estevam
2014-06-13 17:10 ` Fabio Estevam
2014-06-13 15:21 ` [PATCH v2 6/6] ARM: imx_v4_v5_defconfig: Add I.MX25 Touchscreen controller support Denis Carikli
2014-06-13 15:21 ` Denis Carikli
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.