iio: ADC driver for EP93xx SoC
Subsystems (5)
Alexander Sverdlin
maintainerv3 cover iio: ADC driver for EP93xx SoC
This series prepares the necessary infrastructure for ADC platform device on Cirrus Logic EP93xx family of SoCs and adds the driver for ADC device using IIO subsystem.
Changelog
v3:
Rebased to the current master
sizeof(struct foo) -> sizeof(*bar)
v2:
Added Documentation/iio/ep93xx_adc.txt
Removed extend_name
Added timeout to the status polling loop
Used iio_device_register() instead of devm_iio_device_register()
Alexander Sverdlin (5):
clk: ep93xx: Implement clk_get_parent()
clk: ep93xx: Add ADC clock
ep93xx: Add ADC platform device support to core
edb93xx: Add ADC platform device
iio: adc: New driver for Cirrus Logic EP93xx ADC
Documentation/iio/ep93xx_adc.txt | 29 +++ arch/arm/mach-ep93xx/clock.c | 14 ++ arch/arm/mach-ep93xx/core.c | 24 +++ arch/arm/mach-ep93xx/edb93xx.c | 1 + arch/arm/mach-ep93xx/include/mach/platform.h | 1 + arch/arm/mach-ep93xx/soc.h | 1 + drivers/iio/adc/Kconfig | 11 ++ drivers/iio/adc/Makefile | 1 + drivers/iio/adc/ep93xx_adc.c | 260 +++++++++++++++++++++++++++ 9 files changed, 342 insertions(+) create mode 100644 Documentation/iio/ep93xx_adc.txt create mode 100644 drivers/iio/adc/ep93xx_adc.c
Signature · 1 line
2.12.2
Alexander Sverdlin
maintainerPATCH v3 1/5 clk: ep93xx: Implement clk_get_parent()
Trivial implementation of clk_get_parent(), but necessary for some drivers, such as ADC.
--- arch/arm/mach-ep93xx/clock.c | 6 ++++++ 1 file changed, 6 insertions(+)
arch/arm/mach-ep93xx/clock.c +6 -0
@@ -475,6 +475,12 @@ int clk_set_rate(struct clk *clk, unsigned long rate) }EXPORT_SYMBOL (clk_set_rate); +struct clk *clk_get_parent (struct clk *clk) +{ +return clk->parent; +} +EXPORT_SYMBOL (clk_get_parent); +static char fclk_divisors[] = {1 ,2 ,4 ,8 ,16 ,1 ,1 ,1 };static char hclk_divisors[] = {1 ,2 ,4 ,5 ,6 ,8 ,16 ,32 };
Signature · 1 line
2.12.2
Alexander Sverdlin
maintainerPATCH v3 2/5 clk: ep93xx: Add ADC clock
In reply to Alexander SverdlinFrom: Alexander Sverdlin <[email protected]>
ADC and keypad controller clocks share the same control register, so use the existing infrastructure to add ADC clock support for Cirrus Logic EP93xx SoCs.
--- arch/arm/mach-ep93xx/clock.c | 8 ++++++++ 1 file changed, 8 insertions(+)
arch/arm/mach-ep93xx/clock.c +8 -0
@@ -98,6 +98,13 @@ static struct clk clk_keypad = { .enable_mask = EP93XX_SYSCON_KEYTCHCLKDIV_KEN, .set_rate = set_keytchclk_rate, }; +static struct clk clk_adc = { + .parent = &clk_xtali, + .sw_locked =1 , + .enable_reg =EP93XX_SYSCON_KEYTCHCLKDIV , + .enable_mask =EP93XX_SYSCON_KEYTCHCLKDIV_TSEN , + .set_rate = set_keytchclk_rate, +};static struct clk clk_spi = { .parent = &clk_xtali, .rate =EP93XX_EXT_CLK_RATE ,
@@ -214,6 +221,7 @@ static struct clk_lookup clocks[] = {INIT_CK (NULL ,"pll2" , &clk_pll2),INIT_CK ("ohci-platform" ,NULL , &clk_usb_host),INIT_CK ("ep93xx-keypad" ,NULL , &clk_keypad), +INIT_CK ("ep93xx-adc" ,NULL , &clk_adc),INIT_CK ("ep93xx-fb" ,NULL , &clk_video),INIT_CK ("ep93xx-spi.0" ,NULL , &clk_spi), INIT_CK("ep93xx-i2s", "mclk", &clk_i2s_mclk),
Signature · 1 line
2.12.2
Alexander Sverdlin
maintainerPATCH v3 3/5 ep93xx: Add ADC platform device support to core
In reply to Alexander SverdlinNewly provided ep93xx_register_adc() could be used by machine-specific code to create ADC platform device on Cirrus Logic EP93xx SoC-based machines.
--- arch/arm/mach-ep93xx/core.c | 24 ++++++++++++++++++++++++ arch/arm/mach-ep93xx/include/mach/platform.h | 1 + arch/arm/mach-ep93xx/soc.h | 1 + 3 files changed, 26 insertions(+)
arch/arm/mach-ep93xx/core.c +24 -0
@@ -821,6 +821,30 @@ void ep93xx_ide_release_gpio(struct platform_device *pdev)EXPORT_SYMBOL (ep93xx_ide_release_gpio);/************************************************************************* +* EP93xx ADC +*************************************************************************/ +static struct resource ep93xx_adc_resources[] = { +DEFINE_RES_MEM (EP93XX_ADC_PHYS_BASE ,0x28 ), +DEFINE_RES_IRQ (IRQ_EP93XX_TOUCH ), +}; + +static struct platform_device ep93xx_adc_device = { + .name ="ep93xx-adc" , + .id =-1 , + .num_resources =ARRAY_SIZE (ep93xx_adc_resources), + .resource = ep93xx_adc_resources, +}; + +void __init ep93xx_register_adc (void ) +{ +/* Power up ADC, deactivate Touch Screen Controller */ +ep93xx_devcfg_set_clear (EP93XX_SYSCON_DEVCFG_TIN , +EP93XX_SYSCON_DEVCFG_ADCPD ); + +platform_device_register (&ep93xx_adc_device); +} + +/************************************************************************* * EP93xx Security peripheral *************************************************************************/
arch/arm/mach-ep93xx/include/mach/platform.h +1 -0
@@ -52,6 +52,7 @@ int ep93xx_i2s_acquire(void);void ep93xx_i2s_release (void );void ep93xx_register_ac97 (void );void ep93xx_register_ide (void ); +void ep93xx_register_adc (void );int ep93xx_ide_acquire_gpio (struct platform_device *pdev);void ep93xx_ide_release_gpio (struct platform_device *pdev);
arch/arm/mach-ep93xx/soc.h +1 -0
@@ -95,6 +95,7 @@#define EP93XX_KEY_MATRIX_PHYS_BASE EP93XX_APB_PHYS(0x000f0000)#define EP93XX_KEY_MATRIX_BASE EP93XX_APB_IOMEM(0x000f0000) +#define EP93XX_ADC_PHYS_BASE EP93XX_APB_PHYS(0x00100000)#define EP93XX_ADC_BASE EP93XX_APB_IOMEM(0x00100000)#define EP93XX_TOUCHSCREEN_BASE EP93XX_APB_IOMEM(0x00100000)
Signature · 1 line
2.12.2
Alexander Sverdlin
maintainerPATCH v3 4/5 edb93xx: Add ADC platform device
In reply to Alexander SverdlinThis enables the creation of ADC platform device on EDB93xx series of Cirrus Logic evaluation boards. The driver for this device must be enabled separately, either as built-in, or a module.
--- arch/arm/mach-ep93xx/edb93xx.c | 1 + 1 file changed, 1 insertion(+)
arch/arm/mach-ep93xx/edb93xx.c +1 -0
@@ -245,6 +245,7 @@ static void __init edb93xx_init_machine(void)edb93xx_register_pwm ();edb93xx_register_fb ();edb93xx_register_ide (); +ep93xx_register_adc (); }
Signature · 1 line
2.12.2
Alexander Sverdlin
maintainerPATCH v3 5/5 iio: adc: New driver for Cirrus Logic EP93xx ADC
In reply to Alexander SverdlinNew driver adding support for ADC found on Cirrus Logic EP93xx series of SoCs. Board specific code must take care to create plaform device with all necessary resources.
--- Documentation/iio/ep93xx_adc.txt | 29 +++++ drivers/iio/adc/Kconfig | 11 ++ drivers/iio/adc/Makefile | 1 + drivers/iio/adc/ep93xx_adc.c | 260 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 301 insertions(+) create mode 100644 Documentation/iio/ep93xx_adc.txt create mode 100644 drivers/iio/adc/ep93xx_adc.c
Documentation/iio/ep93xx_adc.txt new file +29 -0
@@ -0,0 +1,29 @@ +Cirrus Logic EP93xx ADC driver. + +1. Overview + +The driver is intended to work on both low-end (EP9301, EP9302) devices with +5-channel ADC and high-end (EP9307, EP9312, EP9315) devices with 10-channel +touchscreen/ADC module. + +2. Channel numbering + +Numbering scheme for channels 0..4 is defined in EP9301 and EP9302 datasheets. +EP9307, EP9312 and EP9312 have 3 channels more (total 8), but the numbering is +not defined. So the last three are numbered randomly, let's say. + +Assuming ep93xx_adc is IIO device0, you'd find following entries under +/sys/bus/iio/devices/iio:device0/: + + +-----------------+---------------+ + | sysfs entry | ball/pin name | + +-----------------+---------------+ + | in_voltage0_raw | YM | + | in_voltage1_raw | SXP | + | in_voltage2_raw | SXM | + | in_voltage3_raw | SYP | + | in_voltage4_raw | SYM | + | in_voltage5_raw | XP | + | in_voltage6_raw | XM | + | in_voltage7_raw | YP | + +-----------------+---------------+
drivers/iio/adc/Kconfig +11 -0
@@ -249,6 +249,17 @@ config ENVELOPE_DETECTOR To compile this driver as a module, choose M here: the module will be called envelope-detector. +config EP93XX_ADC + tristate "Cirrus Logic EP93XX ADC driver" + depends on ARCH_EP93XX + help + Driver for the ADC module on the EP93XX series of SoC from Cirrus Logic. + It's recommended to switch on CONFIG_HIGH_RES_TIMERS option, in this + case driver will reduce its CPU usage by 90% in some use cases. + + To compile this driver as a module, choose M here: the module will be + called ep93xx_adc. + config EXYNOS_ADC tristate "Exynos ADC driver support" depends on ARCH_EXYNOS || ARCH_S3C24XX || ARCH_S3C64XX || (OF && COMPILE_TEST)
drivers/iio/adc/Makefile +1 -0
@@ -25,6 +25,7 @@ obj-$(CONFIG_CC10001_ADC) += cc10001_adc.o obj-$(CONFIG_CPCAP_ADC) += cpcap-adc.o obj-$(CONFIG_DA9150_GPADC) += da9150-gpadc.o obj-$(CONFIG_ENVELOPE_DETECTOR) += envelope-detector.o +obj-$(CONFIG_EP93XX_ADC) += ep93xx_adc.o obj-$(CONFIG_EXYNOS_ADC) += exynos_adc.o obj-$(CONFIG_FSL_MX25_ADC) += fsl-imx25-gcq.o obj-$(CONFIG_HI8435) += hi8435.o
drivers/iio/adc/ep93xx_adc.c new file +260 -0
260 lines not on this page · raw message
Signature · 1 line
2.12.2
Re: [PATCH v3 5/5] iio: adc: New driver for Cirrus Logic EP93xx ADC
Quoted 3 lines · Alexander Sverdlin
New driver adding support for ADC found on Cirrus Logic EP93xx series of SoCs. Board specific code must take care to create plaform device with all necessary resources.
some minor comments below
Quoted 22 lines
Signed-off-by Alexander Sverdlin <[email protected]>Acked-by Jonathan Cameron <[email protected]>--- Documentation/iio/ep93xx_adc.txt | 29 +++++ drivers/iio/adc/Kconfig | 11 ++ drivers/iio/adc/Makefile | 1 + drivers/iio/adc/ep93xx_adc.c | 260 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 301 insertions(+) create mode 100644 Documentation/iio/ep93xx_adc.txt create mode 100644 drivers/iio/adc/ep93xx_adc.cDocumentation/iio/ep93xx_adc.txt new file +5
-0@@ -0,0 +1,29 @@ +Cirrus Logic EP93xx ADC driver. + +1. Overview + +The driver is intended to work on both low-end (EP9301, EP9302) devices with
Documentation/iio/ep93xx_adc.txt line 15
Quoted 10 lines
Documentation/iio/ep93xx_adc.txt new file +10
-0+5-channel ADC and high-end (EP9307, EP9312, EP9315) devices with 10-channel +touchscreen/ADC module. + +2. Channel numbering + +Numbering scheme for channels 0..4 is defined in EP9301 and EP9302 datasheets. +EP9307, EP9312 and EP9312 have 3 channels more (total 8), but the numbering is +not defined. So the last three are numbered randomly, let's say. + +Assuming ep93xx_adc is IIO device0, you'd find following entries under
find _the_ following entries
Quoted 72 lines
Documentation/iio/ep93xx_adc.txt new file +14
-0+/sys/bus/iio/devices/iio:device0/: + + +-----------------+---------------+ + | sysfs entry | ball/pin name | + +-----------------+---------------+ + | in_voltage0_raw | YM | + | in_voltage1_raw | SXP | + | in_voltage2_raw | SXM | + | in_voltage3_raw | SYP | + | in_voltage4_raw | SYM | + | in_voltage5_raw | XP | + | in_voltage6_raw | XM | + | in_voltage7_raw | YP | + +-----------------+---------------+drivers/iio/adc/Kconfig +11
-0@@ -249,6 +249,17 @@ config ENVELOPE_DETECTOR To compile this driver as a module, choose M here: the module will be called envelope-detector. +config EP93XX_ADC + tristate "Cirrus Logic EP93XX ADC driver" + depends on ARCH_EP93XX + help + Driver for the ADC module on the EP93XX series of SoC from Cirrus Logic. + It's recommended to switch on CONFIG_HIGH_RES_TIMERS option, in this + case driver will reduce its CPU usage by 90% in some use cases. + + To compile this driver as a module, choose M here: the module will be + called ep93xx_adc. + config EXYNOS_ADC tristate "Exynos ADC driver support" depends on ARCH_EXYNOS || ARCH_S3C24XX || ARCH_S3C64XX || (OF && COMPILE_TEST)drivers/iio/adc/Makefile +1
-0@@ -25,6 +25,7 @@ obj-$(CONFIG_CC10001_ADC) += cc10001_adc.o obj-$(CONFIG_CPCAP_ADC) += cpcap-adc.o obj-$(CONFIG_DA9150_GPADC) += da9150-gpadc.o obj-$(CONFIG_ENVELOPE_DETECTOR) += envelope-detector.o +obj-$(CONFIG_EP93XX_ADC) += ep93xx_adc.o obj-$(CONFIG_EXYNOS_ADC) += exynos_adc.o obj-$(CONFIG_FSL_MX25_ADC) += fsl-imx25-gcq.o obj-$(CONFIG_HI8435) += hi8435.odrivers/iio/adc/ep93xx_adc.c new file +18
-0@@ -0,0 +1,260 @@ +/* +* Driver for ADC module on the Cirrus Logic EP93xx series of SoCs +* +* Copyright (C) 2015 Alexander Sverdlin +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +* +* The driver uses polling to get the conversion status. According to EP93xx +* datasheets, reading ADCResult register starts the conversion, but user is also +* responsible for ensuring that delay between adjacent conversion triggers is +* long enough so that maximum allowed conversion rate is not exceeded. This +* basically renders IRQ mode unusable. +*/ + +#include <linux/clk.h> +#include <linux/delay.h>
drivers/iio/adc/ep93xx_adc.c line 28
Quoted 10 lines
drivers/iio/adc/ep93xx_adc.c new file +10
-0+#include <linux/device.h> +#include <linux/err.h> +#include <linux/iio/iio.h> +#include <linux/io.h> +#include <linux/irqflags.h> +#include <linux/module.h> +#include <linux/mutex.h> +#include <linux/platform_device.h> + +#define EP93XX_NUM_CHANNELS 8
only used for the array declaration, could be dropped
Quoted 10 lines
drivers/iio/adc/ep93xx_adc.c new file +10
-0+ +/* +* This code could benefit from real HR Timers, but jiffy granularity would +* lower ADC conversion rate down to CONFIG_HZ, so we fallback to busy wait +* in such case. +* +* HR Timers-based version loads CPU only up to 10% during back to back ADC +* conversion, while busy wait-based version consumes whole CPU power. +*/ +#ifdef CONFIG_HIGH_RES_TIMERS
drivers/iio/adc/ep93xx_adc.c line 48
Quoted 10 lines
drivers/iio/adc/ep93xx_adc.c new file +10
-0+#define ep93xx_adc_delay (usmin, usmax) usleep_range(usmin, usmax) +#else +#define ep93xx_adc_delay (usmin, usmax) udelay(usmin) +#endif + +#define EP93XX_ADC_RESULT 0x08 +#define EP93XX_ADC_SDR BIT(31) +#define EP93XX_ADC_SWITCH 0x18 +#define EP93XX_ADC_SW_LOCK 0x20 +#define EP93XX_ADC_INT_EN 0x24
_INT_EN is not used
drivers/iio/adc/ep93xx_adc.c line 49
Quoted 1 line
drivers/iio/adc/ep93xx_adc.c new file +1
-0+#define EP93XX_ADC_RINTEN BIT(11)
not used also
Quoted 52 lines
drivers/iio/adc/ep93xx_adc.c new file +52
-0+ +struct ep93xx_adc_priv { +struct clk *clk; +void __iomem *base; +int lastch; +struct mutex lock; +}; + +#define EP93XX_ADC_CH (index, dname, swcfg) { \ + .type = IIO_VOLTAGE, \ + .indexed = 1, \ + .channel = index, \ + .address = swcfg, \ + .datasheet_name = dname, \ + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \ + .info_mask_shared_by_all = BIT(IIO_CHAN_INFO_SCALE) | \ + BIT(IIO_CHAN_INFO_OFFSET), \ +} + +/* +* Numbering scheme for channels 0..4 is defined in EP9301 and EP9302 datasheets. +* EP9307, EP9312 and EP9312 have 3 channels more (total 8), but the numbering is +* not defined. So the last three are numbered randomly, let's say. +*/ +static const struct iio_chan_spec ep93xx_adc_channels[EP93XX_NUM_CHANNELS ] = { +EP93XX_ADC_CH (0 ,"YM" ,0x608 ), +EP93XX_ADC_CH (1 ,"SXP" ,0x680 ), +EP93XX_ADC_CH (2 ,"SXM" ,0x640 ), +EP93XX_ADC_CH (3 ,"SYP" ,0x620 ), +EP93XX_ADC_CH (4 ,"SYM" ,0x610 ), +EP93XX_ADC_CH (5 ,"XP" ,0x601 ), +EP93XX_ADC_CH (6 ,"XM" ,0x602 ), +EP93XX_ADC_CH (7 ,"YP" ,0x604 ), +}; + +static int ep93xx_read_raw (struct iio_dev *iiodev, +struct iio_chan_spec const *channel,int *value, +int *shift,long mask) +{ +struct ep93xx_adc_priv *priv =iio_priv (iiodev); +unsigned long timeout; +int ret; + +switch (mask) { +case IIO_CHAN_INFO_RAW : +mutex_lock (&priv->lock); +if (priv->lastch != channel->channel) { + priv->lastch = channel->channel; +/* +* Switch register is software-locked, unlocking must be +* immediately followed by write +*/
drivers/iio/adc/ep93xx_adc.c line 111
Quoted 10 lines
drivers/iio/adc/ep93xx_adc.c new file +10
-0+local_irq_disable (); +writel_relaxed (0xAA , priv->base +EP93XX_ADC_SW_LOCK ); +writel_relaxed (channel->address, + priv->base +EP93XX_ADC_SWITCH ); +local_irq_enable (); +/* +* Settling delay depends on module clock and could be +* 2ms or 500us +*/ +ep93xx_adc_delay (2000 ,2000 );
min == max? here and below
what about the 500us?
drivers/iio/adc/ep93xx_adc.c line 115
Quoted 4 lines
drivers/iio/adc/ep93xx_adc.c new file +4
-0+ } +/* Start the conversion, eventually discarding old result */ +readl_relaxed (priv->base +EP93XX_ADC_RESULT ); +/* Ensure maximun conversion rate is not exceeded */
maximum
drivers/iio/adc/ep93xx_adc.c line 127
Quoted 12 lines
drivers/iio/adc/ep93xx_adc.c new file +12
-0+ep93xx_adc_delay (DIV_ROUND_UP (1000000 ,925 ), +DIV_ROUND_UP (1000000 ,925 )); +/* At this point conversion must be completed, but anyway... */ + ret =IIO_VAL_INT ; + timeout = jiffies +msecs_to_jiffies (1 ) +1 ; +while (1 ) { +u32 t; + + t =readl_relaxed (priv->base +EP93XX_ADC_RESULT ); +if (t &EP93XX_ADC_SDR ) { +/* Sign extend lower 16 bits */ + *value = (s16 )t;
could use sign_extend32() and drop the comment
Quoted 6 lines
drivers/iio/adc/ep93xx_adc.c new file +6
-0+break ; + } + +if (time_after (jiffies, timeout)) { +dev_err (&iiodev->dev,"Conversion timeout\n" ); + ret = -ETIMEDOUT ;
drivers/iio/adc/ep93xx_adc.c line 143
Quoted 10 lines
drivers/iio/adc/ep93xx_adc.c new file +10
-0+break ; + } + +cpu_relax (); + } +mutex_unlock (&priv->lock); +return ret; + +case IIO_CHAN_INFO_OFFSET : +/* According to datasheet, range is -25000..25000 */
so signed values (-25000..25000) are mapped to unsigned values (0..50000)?
Quoted 59 lines
drivers/iio/adc/ep93xx_adc.c new file +59
-0+ *value =25000 ; +return IIO_VAL_INT ; + +case IIO_CHAN_INFO_SCALE : +/* Typical supply voltage is 3.3v */ + *value = (1ULL <<32 ) *3300 /50000 ; + *shift =32 ; +return IIO_VAL_FRACTIONAL_LOG2 ; + } + +return -EINVAL ; +} + +static const struct iio_info ep93xx_adc_info = { + .driver_module =THIS_MODULE , + .read_raw = ep93xx_read_raw, +}; + +static int ep93xx_adc_probe (struct platform_device *pdev) +{ +int ret; +struct iio_dev *iiodev; +struct ep93xx_adc_priv *priv; +struct clk *pclk; +struct resource *res; + + iiodev =devm_iio_device_alloc (&pdev->dev,sizeof (*priv)); +if (!iiodev) +return -ENOMEM ; + priv =iio_priv (iiodev); + + res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); +if (!res) { +dev_err (&pdev->dev,"Cannot obtain memory resource\n" ); +return -ENXIO ; + } + priv->base =devm_ioremap_resource (&pdev->dev, res); +if (IS_ERR (priv->base)) { +dev_err (&pdev->dev,"Cannot map memory resource\n" ); +return PTR_ERR (priv->base); + } + + iiodev->dev.parent = &pdev->dev; + iiodev->name =dev_name (&pdev->dev); + iiodev->modes =INDIO_DIRECT_MODE ; + iiodev->info = &ep93xx_adc_info; + iiodev->num_channels =ARRAY_SIZE (ep93xx_adc_channels); + iiodev->channels = ep93xx_adc_channels; + + priv->lastch =-1 ; +mutex_init (&priv->lock); + +platform_set_drvdata (pdev, iiodev); + + priv->clk =devm_clk_get (&pdev->dev,NULL ); +if (IS_ERR (priv->clk)) { +dev_err (&pdev->dev,"Cannot obtain clock\n" ); +return PTR_ERR (priv->clk); + }
drivers/iio/adc/ep93xx_adc.c line 212
Quoted 10 lines
drivers/iio/adc/ep93xx_adc.c new file +10
-0+ + pclk =clk_get_parent (priv->clk); +if (!pclk) { +dev_warn (&pdev->dev,"Cannot obtain parent clock\n" ); + }else { +/* +* This is actually a place for improvement: +* EP93xx ADC supports two clock divisors -- 4 and 16, +* resulting in conversion rates 3750 and 925 samples per second +* respectively with 500uS or 2ms settling time respectively.
2x respectively
uS -> us
the delay in _read() is fixed to 2ms
Quoted 49 lines
drivers/iio/adc/ep93xx_adc.c new file +48
-0+* One might find this interesting enough to be configurable. +*/ + ret =clk_set_rate (priv->clk,clk_get_rate (pclk) /16 ); +if (ret) +dev_warn (&pdev->dev,"Cannot set clock rate\n" ); +/* +* We can tolerate rate setting failure because the module should +* work in any case. +*/ + } + + ret =clk_enable (priv->clk); +if (ret) { +dev_err (&pdev->dev,"Cannot enable clock\n" ); +return ret; + } + + ret =iio_device_register (iiodev); +if (ret) +clk_disable (priv->clk); + +return ret; +} + +static int ep93xx_adc_remove (struct platform_device *pdev) +{ +struct iio_dev *iiodev =platform_get_drvdata (pdev); +struct ep93xx_adc_priv *priv =iio_priv (iiodev); + +iio_device_unregister (iiodev); +clk_disable (priv->clk); + +return 0 ; +} + +static struct platform_driver ep93xx_adc_driver = { + .driver = { + .name ="ep93xx-adc" , + }, + .probe = ep93xx_adc_probe, + .remove = ep93xx_adc_remove, +}; +module_platform_driver (ep93xx_adc_driver); + +MODULE_AUTHOR ("Alexander Sverdlin <[email protected]>" ); +MODULE_DESCRIPTION ("Cirrus Logic EP93XX ADC driver" ); +MODULE_LICENSE ("GPL" ); +MODULE_ALIAS ("platform:ep93xx-adc" );
Signature · 2 lines
Peter Meerwald-Stadler Mobile: +43 664 24 44 418
Alexander Sverdlin
maintainerRe: [PATCH v3 5/5] iio: adc: New driver for Cirrus Logic EP93xx ADC
Hello Peter,
Quoted 6 lines · Peter Meerwald-Stadler
drivers/iio/adc/ep93xx_adc.c line 111
Quoted 5 lines
drivers/iio/adc/ep93xx_adc.c new file +5
-0+/* +* Settling delay depends on module clock and could be +* 2ms or 500us +*/ +ep93xx_adc_delay (2000 ,2000 );min == max? here and below
Yes. I'm not allowed to lower this and increasing this lowers the conversion rate, which makes no sense. In practice, this 200MHz SoC survives couple of thousands interrupts per second perfectly. It takes some single percent of CPU time on back to back conversions.
Quoted 1 line
what about the 500us?
See below, it's just a hint if someone ever would like to implement the second conversion rate option.
Quoted 6 lines
drivers/iio/adc/ep93xx_adc.c line 115
Quoted 4 lines
drivers/iio/adc/ep93xx_adc.c new file +4
-0+ } +/* Start the conversion, eventually discarding old result */ +readl_relaxed (priv->base +EP93XX_ADC_RESULT ); +/* Ensure maximun conversion rate is not exceeded */ maximum
Quoted 13 lines
drivers/iio/adc/ep93xx_adc.c line 127
Quoted 12 lines
drivers/iio/adc/ep93xx_adc.c new file +12
-0+ep93xx_adc_delay (DIV_ROUND_UP (1000000 ,925 ), +DIV_ROUND_UP (1000000 ,925 )); +/* At this point conversion must be completed, but anyway... */ + ret =IIO_VAL_INT ; + timeout = jiffies +msecs_to_jiffies (1 ) +1 ; +while (1 ) { +u32 t; + + t =readl_relaxed (priv->base +EP93XX_ADC_RESULT ); +if (t &EP93XX_ADC_SDR ) { +/* Sign extend lower 16 bits */ + *value = (s16 )t;could use
sign_extend32()and drop the comment
OK :)
Quoted 9 lines
Quoted 9 lines
drivers/iio/adc/ep93xx_adc.c new file +9
-0+break ; + } + +if (time_after (jiffies, timeout)) { +dev_err (&iiodev->dev,"Conversion timeout\n" ); + ret = -ETIMEDOUT ; +break ; + } +
Quoted 8 lines
drivers/iio/adc/ep93xx_adc.c line 143
Quoted 7 lines
drivers/iio/adc/ep93xx_adc.c new file +7
-0+cpu_relax (); + } +mutex_unlock (&priv->lock); +return ret; + +case IIO_CHAN_INFO_OFFSET : +/* According to datasheet, range is -25000..25000 */ so signed values (-25000..25000) are mapped to unsigned values (0..50000)?
Yes, strange HW design with 2.5v reference out of 5v supply.
Quoted 72 lines
Quoted 59 lines
drivers/iio/adc/ep93xx_adc.c new file +59
-0+ *value =25000 ; +return IIO_VAL_INT ; + +case IIO_CHAN_INFO_SCALE : +/* Typical supply voltage is 3.3v */ + *value = (1ULL <<32 ) *3300 /50000 ; + *shift =32 ; +return IIO_VAL_FRACTIONAL_LOG2 ; + } + +return -EINVAL ; +} + +static const struct iio_info ep93xx_adc_info = { + .driver_module =THIS_MODULE , + .read_raw = ep93xx_read_raw, +}; + +static int ep93xx_adc_probe (struct platform_device *pdev) +{ +int ret; +struct iio_dev *iiodev; +struct ep93xx_adc_priv *priv; +struct clk *pclk; +struct resource *res; + + iiodev =devm_iio_device_alloc (&pdev->dev,sizeof (*priv)); +if (!iiodev) +return -ENOMEM ; + priv =iio_priv (iiodev); + + res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); +if (!res) { +dev_err (&pdev->dev,"Cannot obtain memory resource\n" ); +return -ENXIO ; + } + priv->base =devm_ioremap_resource (&pdev->dev, res); +if (IS_ERR (priv->base)) { +dev_err (&pdev->dev,"Cannot map memory resource\n" ); +return PTR_ERR (priv->base); + } + + iiodev->dev.parent = &pdev->dev; + iiodev->name =dev_name (&pdev->dev); + iiodev->modes =INDIO_DIRECT_MODE ; + iiodev->info = &ep93xx_adc_info; + iiodev->num_channels =ARRAY_SIZE (ep93xx_adc_channels); + iiodev->channels = ep93xx_adc_channels; + + priv->lastch =-1 ; +mutex_init (&priv->lock); + +platform_set_drvdata (pdev, iiodev); + + priv->clk =devm_clk_get (&pdev->dev,NULL ); +if (IS_ERR (priv->clk)) { +dev_err (&pdev->dev,"Cannot obtain clock\n" ); +return PTR_ERR (priv->clk); + }drivers/iio/adc/ep93xx_adc.c line 212
Quoted 10 lines
drivers/iio/adc/ep93xx_adc.c new file +10
-0+ + pclk =clk_get_parent (priv->clk); +if (!pclk) { +dev_warn (&pdev->dev,"Cannot obtain parent clock\n" ); + }else { +/* +* This is actually a place for improvement: +* EP93xx ADC supports two clock divisors -- 4 and 16, +* resulting in conversion rates 3750 and 925 samples per second +* respectively with 500uS or 2ms settling time respectively. 2x respectively
uS -> us
Quoted 1 line
the delay in
_read()is fixed to 2ms
Yes, it's a hint/todo if someone would need faster conversion rate.
Quoted 2 lines
Review
Quoted 2 lines
(quoted diff) +2
-0+ * One might find this interesting enough to be configurable. + */
Thanks for your comments!
Alexander.
Jonathan Cameron
maintainerPATCH v3 5/5 iio: adc: New driver for Cirrus Logic EP93xx ADC
In reply to Alexander SverdlinQuoted 6 lines · Alexander Sverdlin
New driver adding support for ADC found on Cirrus Logic EP93xx series of SoCs. Board specific code must take care to create plaform device with all necessary resources.
but otherwise the delay on this one is going to be picking up the necessary acks for the early patches or persuading them to take this patch through the path to the arm-soc tree.
I don't have anything much to add from the review front. I'd sort of assumed this was working it's way into the kernel already!
Thanks,
Jonathan
Quoted 345 lines
--- Documentation/iio/ep93xx_adc.txt | 29 +++++ drivers/iio/adc/Kconfig | 11 ++ drivers/iio/adc/Makefile | 1 + drivers/iio/adc/ep93xx_adc.c | 260 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 301 insertions(+)create mode 100644
Documentation/iio/ep93xx_adc.txtcreate mode 100644drivers/iio/adc/ep93xx_adc.cDocumentation/iio/ep93xx_adc.txt new file +29
-0@@ -0,0 +1,29 @@ +Cirrus Logic EP93xx ADC driver. + +1. Overview + +The driver is intended to work on both low-end (EP9301, EP9302) devices with +5-channel ADC and high-end (EP9307, EP9312, EP9315) devices with 10-channel +touchscreen/ADC module. + +2. Channel numbering + +Numbering scheme for channels 0..4 is defined in EP9301 and EP9302 datasheets. +EP9307, EP9312 and EP9312 have 3 channels more (total 8), but the numbering is +not defined. So the last three are numbered randomly, let's say. + +Assuming ep93xx_adc is IIO device0, you'd find following entries under +/sys/bus/iio/devices/iio:device0/: + + +-----------------+---------------+ + | sysfs entry | ball/pin name | + +-----------------+---------------+ + | in_voltage0_raw | YM | + | in_voltage1_raw | SXP | + | in_voltage2_raw | SXM | + | in_voltage3_raw | SYP | + | in_voltage4_raw | SYM | + | in_voltage5_raw | XP | + | in_voltage6_raw | XM | + | in_voltage7_raw | YP | + +-----------------+---------------+drivers/iio/adc/Kconfig +11
-0@@ -249,6 +249,17 @@ config ENVELOPE_DETECTOR To compile this driver as a module, choose M here: the module will be called envelope-detector. +config EP93XX_ADC + tristate "Cirrus Logic EP93XX ADC driver" + depends on ARCH_EP93XX + help + Driver for the ADC module on the EP93XX series of SoC from Cirrus Logic. + It's recommended to switch on CONFIG_HIGH_RES_TIMERS option, in this + case driver will reduce its CPU usage by 90% in some use cases. + + To compile this driver as a module, choose M here: the module will be + called ep93xx_adc. + config EXYNOS_ADC tristate "Exynos ADC driver support" depends on ARCH_EXYNOS || ARCH_S3C24XX || ARCH_S3C64XX || (OF && COMPILE_TEST)drivers/iio/adc/Makefile +1
-0@@ -25,6 +25,7 @@ obj-$(CONFIG_CC10001_ADC) += cc10001_adc.o obj-$(CONFIG_CPCAP_ADC) += cpcap-adc.o obj-$(CONFIG_DA9150_GPADC) += da9150-gpadc.o obj-$(CONFIG_ENVELOPE_DETECTOR) += envelope-detector.o +obj-$(CONFIG_EP93XX_ADC) += ep93xx_adc.o obj-$(CONFIG_EXYNOS_ADC) += exynos_adc.o obj-$(CONFIG_FSL_MX25_ADC) += fsl-imx25-gcq.o obj-$(CONFIG_HI8435) += hi8435.odrivers/iio/adc/ep93xx_adc.c new file +260
-0@@ -0,0 +1,260 @@ +/* +* Driver for ADC module on the Cirrus Logic EP93xx series of SoCs +* +* Copyright (C) 2015 Alexander Sverdlin +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +* +* The driver uses polling to get the conversion status. According to EP93xx +* datasheets, reading ADCResult register starts the conversion, but user is also +* responsible for ensuring that delay between adjacent conversion triggers is +* long enough so that maximum allowed conversion rate is not exceeded. This +* basically renders IRQ mode unusable. +*/ + +#include <linux/clk.h> +#include <linux/delay.h> +#include <linux/device.h> +#include <linux/err.h> +#include <linux/iio/iio.h> +#include <linux/io.h> +#include <linux/irqflags.h> +#include <linux/module.h> +#include <linux/mutex.h> +#include <linux/platform_device.h> + +#define EP93XX_NUM_CHANNELS 8 + +/* +* This code could benefit from real HR Timers, but jiffy granularity would +* lower ADC conversion rate down to CONFIG_HZ, so we fallback to busy wait +* in such case. +* +* HR Timers-based version loads CPU only up to 10% during back to back ADC +* conversion, while busy wait-based version consumes whole CPU power. +*/ +#ifdef CONFIG_HIGH_RES_TIMERS +#define ep93xx_adc_delay (usmin, usmax) usleep_range(usmin, usmax) +#else +#define ep93xx_adc_delay (usmin, usmax) udelay(usmin) +#endif + +#define EP93XX_ADC_RESULT 0x08 +#define EP93XX_ADC_SDR BIT(31) +#define EP93XX_ADC_SWITCH 0x18 +#define EP93XX_ADC_SW_LOCK 0x20 +#define EP93XX_ADC_INT_EN 0x24 +#define EP93XX_ADC_RINTEN BIT(11) + +struct ep93xx_adc_priv { +struct clk *clk; +void __iomem *base; +int lastch; +struct mutex lock; +}; + +#define EP93XX_ADC_CH (index, dname, swcfg) { \ + .type = IIO_VOLTAGE, \ + .indexed = 1, \ + .channel = index, \ + .address = swcfg, \ + .datasheet_name = dname, \ + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \ + .info_mask_shared_by_all = BIT(IIO_CHAN_INFO_SCALE) | \ + BIT(IIO_CHAN_INFO_OFFSET), \ +} + +/* +* Numbering scheme for channels 0..4 is defined in EP9301 and EP9302 datasheets. +* EP9307, EP9312 and EP9312 have 3 channels more (total 8), but the numbering is +* not defined. So the last three are numbered randomly, let's say. +*/ +static const struct iio_chan_spec ep93xx_adc_channels[EP93XX_NUM_CHANNELS ] = { +EP93XX_ADC_CH (0 ,"YM" ,0x608 ), +EP93XX_ADC_CH (1 ,"SXP" ,0x680 ), +EP93XX_ADC_CH (2 ,"SXM" ,0x640 ), +EP93XX_ADC_CH (3 ,"SYP" ,0x620 ), +EP93XX_ADC_CH (4 ,"SYM" ,0x610 ), +EP93XX_ADC_CH (5 ,"XP" ,0x601 ), +EP93XX_ADC_CH (6 ,"XM" ,0x602 ), +EP93XX_ADC_CH (7 ,"YP" ,0x604 ), +}; + +static int ep93xx_read_raw (struct iio_dev *iiodev, +struct iio_chan_spec const *channel,int *value, +int *shift,long mask) +{ +struct ep93xx_adc_priv *priv =iio_priv (iiodev); +unsigned long timeout; +int ret; + +switch (mask) { +case IIO_CHAN_INFO_RAW : +mutex_lock (&priv->lock); +if (priv->lastch != channel->channel) { + priv->lastch = channel->channel; +/* +* Switch register is software-locked, unlocking must be +* immediately followed by write +*/ +local_irq_disable (); +writel_relaxed (0xAA , priv->base +EP93XX_ADC_SW_LOCK ); +writel_relaxed (channel->address, + priv->base +EP93XX_ADC_SWITCH ); +local_irq_enable (); +/* +* Settling delay depends on module clock and could be +* 2ms or 500us +*/ +ep93xx_adc_delay (2000 ,2000 ); + } +/* Start the conversion, eventually discarding old result */ +readl_relaxed (priv->base +EP93XX_ADC_RESULT ); +/* Ensure maximun conversion rate is not exceeded */ +ep93xx_adc_delay (DIV_ROUND_UP (1000000 ,925 ), +DIV_ROUND_UP (1000000 ,925 )); +/* At this point conversion must be completed, but anyway... */ + ret =IIO_VAL_INT ; + timeout = jiffies +msecs_to_jiffies (1 ) +1 ; +while (1 ) { +u32 t; + + t =readl_relaxed (priv->base +EP93XX_ADC_RESULT ); +if (t &EP93XX_ADC_SDR ) { +/* Sign extend lower 16 bits */ + *value = (s16 )t; +break ; + } + +if (time_after (jiffies, timeout)) { +dev_err (&iiodev->dev,"Conversion timeout\n" ); + ret = -ETIMEDOUT ; +break ; + } + +cpu_relax (); + } +mutex_unlock (&priv->lock); +return ret; + +case IIO_CHAN_INFO_OFFSET : +/* According to datasheet, range is -25000..25000 */ + *value =25000 ; +return IIO_VAL_INT ; + +case IIO_CHAN_INFO_SCALE : +/* Typical supply voltage is 3.3v */ + *value = (1ULL <<32 ) *3300 /50000 ; + *shift =32 ; +return IIO_VAL_FRACTIONAL_LOG2 ; + } + +return -EINVAL ; +} + +static const struct iio_info ep93xx_adc_info = { + .driver_module =THIS_MODULE , + .read_raw = ep93xx_read_raw, +}; + +static int ep93xx_adc_probe (struct platform_device *pdev) +{ +int ret; +struct iio_dev *iiodev; +struct ep93xx_adc_priv *priv; +struct clk *pclk; +struct resource *res; + + iiodev =devm_iio_device_alloc (&pdev->dev,sizeof (*priv)); +if (!iiodev) +return -ENOMEM ; + priv =iio_priv (iiodev); + + res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); +if (!res) { +dev_err (&pdev->dev,"Cannot obtain memory resource\n" ); +return -ENXIO ; + } + priv->base =devm_ioremap_resource (&pdev->dev, res); +if (IS_ERR (priv->base)) { +dev_err (&pdev->dev,"Cannot map memory resource\n" ); +return PTR_ERR (priv->base); + } + + iiodev->dev.parent = &pdev->dev; + iiodev->name =dev_name (&pdev->dev); + iiodev->modes =INDIO_DIRECT_MODE ; + iiodev->info = &ep93xx_adc_info; + iiodev->num_channels =ARRAY_SIZE (ep93xx_adc_channels); + iiodev->channels = ep93xx_adc_channels; + + priv->lastch =-1 ; +mutex_init (&priv->lock); + +platform_set_drvdata (pdev, iiodev); + + priv->clk =devm_clk_get (&pdev->dev,NULL ); +if (IS_ERR (priv->clk)) { +dev_err (&pdev->dev,"Cannot obtain clock\n" ); +return PTR_ERR (priv->clk); + } + + pclk =clk_get_parent (priv->clk); +if (!pclk) { +dev_warn (&pdev->dev,"Cannot obtain parent clock\n" ); + }else { +/* +* This is actually a place for improvement: +* EP93xx ADC supports two clock divisors -- 4 and 16, +* resulting in conversion rates 3750 and 925 samples per second +* respectively with 500uS or 2ms settling time respectively. +* One might find this interesting enough to be configurable. +*/ + ret =clk_set_rate (priv->clk,clk_get_rate (pclk) /16 ); +if (ret) +dev_warn (&pdev->dev,"Cannot set clock rate\n" ); +/* +* We can tolerate rate setting failure because the module should +* work in any case. +*/ + } + + ret =clk_enable (priv->clk); +if (ret) { +dev_err (&pdev->dev,"Cannot enable clock\n" ); +return ret; + } + + ret =iio_device_register (iiodev); +if (ret) +clk_disable (priv->clk); + +return ret; +} + +static int ep93xx_adc_remove (struct platform_device *pdev) +{ +struct iio_dev *iiodev =platform_get_drvdata (pdev); +struct ep93xx_adc_priv *priv =iio_priv (iiodev); + +iio_device_unregister (iiodev); +clk_disable (priv->clk); + +return 0 ; +} + +static struct platform_driver ep93xx_adc_driver = { + .driver = { + .name ="ep93xx-adc" , + }, + .probe = ep93xx_adc_probe, + .remove = ep93xx_adc_remove, +}; +module_platform_driver (ep93xx_adc_driver); + +MODULE_AUTHOR ("Alexander Sverdlin <[email protected]>" ); +MODULE_DESCRIPTION ("Cirrus Logic EP93XX ADC driver" ); +MODULE_LICENSE ("GPL" ); +MODULE_ALIAS ("platform:ep93xx-adc" );