Skip to contentSkip to conversation

iio: Minor cleanups to spear ADC driver

PATCH In review Jonathan Cameron 2 participants 18 messages Apr 5, 2014 – Apr 7, 2014

Subsystems (3)
Staging IIO Staging - industrial io
lore
Share & tools
lore

Jonathan Cameron

author maintainer
#0 lore raw

v3 cover iio: Minor cleanups to spear ADC driver

Note that Hartmut Knaack has highlighted some additional improvements to be made to this driver, but to keep things manageable I'm proposing the following initial set and second series to make the other changes and move the driver out of staging.

Changes since V1. Fixed the issues Harmuk Knaack pointed out in patch 4 by dropping the unused variables and ensure mask was as it should be.

Previous description:
This driver has been reasonably clean since it was first merged within the staging tree. If it had been submitted after the IIO core was outside of staging we might have taken it as is. I did a final review and the first 4 patches of this series rework various minor aspects of the driver.

Whilst it is a slow driver, the device tree matches at the lowest level seemed a little unwise so the largest rework is concerned with centralising that logic using a classic ops structure of function pointers. The other large change was to move to using the info_mask_shared_by_all approach to handle sampling frequency. This is something I am slowly propogating across the whole tree, but might as well be done whilst we are looking at this driver.

I don't have hardware and whilst I think these are all changes that are possible to easily verify by eye, a tested by would be most welcome!

Note this is the first driver I'm suggesting moving out of staging following Greg's entirely reasonable question of 'What's wrong with the stuff that is left?' Any help with this sort of final cleanup and move would be most welcome.

Jonathan

Jonathan Cameron (6):
staging:iio:adc:spear adc - prefix defines to avoid namespace clashes. staging:iio:adc:spear_adc drop initialization of unused scan_type staging:iio:adc:spear_adc use info_mask_shared_by_all for samp freq staging:iio:adc:spear rename device specific state structure to _state staging:iio:adc:spear rename iodev -> indio_dev to fit with current
convention
staging:iio:adc:spear rename spear_read_raw to spear_adc_read_raw

 drivers/staging/iio/adc/spear_adc.c | 313 ++++++++++++++++--------------------
 1 file changed, 141 insertions(+), 172 deletions(-)
Signature · 1 line
1.9.0
author maintainer
#1 lore raw

PATCH v3 1/6 staging:iio:adc:spear adc - prefix defines to avoid namespace clashes.

Signed-off-by Jonathan Cameron <[email protected]>
Acked-by Stefan Roese <[email protected]>
---
 drivers/staging/iio/adc/spear_adc.c | 73 ++++++++++++++++++-------------------
 1 file changed, 36 insertions(+), 37 deletions(-)
drivers/staging/iio/adc/spear_adc.c +36 -37
index 970d9ed..49293f9 100644
@@ -22,39 +22,36 @@
 #include <linux/iio/iio.h>
 #include <linux/iio/sysfs.h>
 
-/*
- * SPEAR registers definitions
- */
-
-#define SCAN_RATE_LO(x)		((x) & 0xFFFF)
-#define SCAN_RATE_HI(x)		(((x) >> 0x10) & 0xFFFF)
-#define CLK_LOW(x)		(((x) & 0xf) << 0)
-#define CLK_HIGH(x)		(((x) & 0xf) << 4)
+/* SPEAR registers definitions */
+#define SPEAR600_ADC_SCAN_RATE_LO(x)	((x) & 0xFFFF)
+#define SPEAR600_ADC_SCAN_RATE_HI(x)	(((x) >> 0x10) & 0xFFFF)
+#define SPEAR_ADC_CLK_LOW(x)		(((x) & 0xf) << 0)
+#define SPEAR_ADC_CLK_HIGH(x)		(((x) & 0xf) << 4)
 
 /* Bit definitions for SPEAR_ADC_STATUS */
-#define START_CONVERSION	(1 << 0)
-#define CHANNEL_NUM(x)		((x) << 1)
-#define ADC_ENABLE		(1 << 4)
-#define AVG_SAMPLE(x)		((x) << 5)
-#define VREF_INTERNAL		(1 << 9)
+#define SPEAR_ADC_STATUS_START_CONVERSION	(1 << 0)
+#define SPEAR_ADC_STATUS_CHANNEL_NUM(x)		((x) << 1)
+#define SPEAR_ADC_STATUS_ADC_ENABLE		(1 << 4)
+#define SPEAR_ADC_STATUS_AVG_SAMPLE(x)		((x) << 5)
+#define SPEAR_ADC_STATUS_VREF_INTERNAL		(1 << 9)
 
-#define DATA_MASK		0x03ff
-#define DATA_BITS		10
+#define SPEAR_ADC_DATA_MASK		0x03ff
+#define SPEAR_ADC_DATA_BITS		10
 
-#define MOD_NAME "spear-adc"
+#define SPEAR_ADC_MOD_NAME "spear-adc"
 
-#define ADC_CHANNEL_NUM		8
+#define SPEAR_ADC_CHANNEL_NUM		8
 
-#define CLK_MIN			2500000
-#define CLK_MAX			20000000
+#define SPEAR_ADC_CLK_MIN			2500000
+#define SPEAR_ADC_CLK_MAX			20000000
 
 struct adc_regs_spear3xx {
 	u32 status;
 	u32 average;
 	u32 scan_rate;
 	u32 clk;	/* Not avail for 1340 & 1310 */
-	u32 ch_ctrl[ADC_CHANNEL_NUM];
-	u32 ch_data[ADC_CHANNEL_NUM];
+	u32 ch_ctrl[SPEAR_ADC_CHANNEL_NUM];
+	u32 ch_data[SPEAR_ADC_CHANNEL_NUM];
 };
 
 struct chan_data {

@@ -66,8 +63,8 @@ struct adc_regs_spear6xx {
 	u32 status;
 	u32 pad[2];
 	u32 clk;
-	u32 ch_ctrl[ADC_CHANNEL_NUM];
-	struct chan_data ch_data[ADC_CHANNEL_NUM];
+	u32 ch_ctrl[SPEAR_ADC_CHANNEL_NUM];
+	struct chan_data ch_data[SPEAR_ADC_CHANNEL_NUM];
 	u32 scan_rate_lo;
 	u32 scan_rate_hi;
 	struct chan_data average;

@@ -106,7 +103,7 @@ static void spear_adc_set_clk(struct spear_adc_info *info, u32 val)
 	clk_high = count - clk_low;
 	info->current_clk = apb_clk / count;
 
-	__raw_writel(CLK_LOW(clk_low) | CLK_HIGH(clk_high),
+	__raw_writel(SPEAR_ADC_CLK_LOW(clk_low) | SPEAR_ADC_CLK_HIGH(clk_high),
 		     &info->adc_base_spear6xx->clk);
 }
 

@@ -120,19 +117,19 @@ static u32 spear_adc_get_average(struct spear_adc_info *info)
 {
 	if (of_device_is_compatible(info->np, "st,spear600-adc")) {
 		return __raw_readl(&info->adc_base_spear6xx->average.msb) &
-			DATA_MASK;
+			SPEAR_ADC_DATA_MASK;
 	} else {
 		return __raw_readl(&info->adc_base_spear3xx->average) &
-			DATA_MASK;
+			SPEAR_ADC_DATA_MASK;
 	}
 }
 
 static void spear_adc_set_scanrate(struct spear_adc_info *info, u32 rate)
 {
 	if (of_device_is_compatible(info->np, "st,spear600-adc")) {
-		__raw_writel(SCAN_RATE_LO(rate),
+		__raw_writel(SPEAR600_ADC_SCAN_RATE_LO(rate),
 			     &info->adc_base_spear6xx->scan_rate_lo);
-		__raw_writel(SCAN_RATE_HI(rate),
+		__raw_writel(SPEAR600_ADC_SCAN_RATE_HI(rate),
 			     &info->adc_base_spear6xx->scan_rate_hi);
 	} else {
 		__raw_writel(rate, &info->adc_base_spear3xx->scan_rate);

@@ -152,11 +149,12 @@ static int spear_read_raw(struct iio_dev *indio_dev,
 	case IIO_CHAN_INFO_RAW:
 		mutex_lock(&indio_dev->mlock);
 
-		status = CHANNEL_NUM(chan->channel) |
-			AVG_SAMPLE(info->avg_samples) |
-			START_CONVERSION | ADC_ENABLE;
+		status = SPEAR_ADC_STATUS_CHANNEL_NUM(chan->channel) |
+			SPEAR_ADC_STATUS_AVG_SAMPLE(info->avg_samples) |
+			SPEAR_ADC_STATUS_START_CONVERSION |
+			SPEAR_ADC_STATUS_ADC_ENABLE;
 		if (info->vref_external == 0)
-			status |= VREF_INTERNAL;
+			status |= SPEAR_ADC_STATUS_VREF_INTERNAL;
 
 		spear_adc_set_status(info, status);
 		wait_for_completion(&info->completion); /* set by ISR */

@@ -168,7 +166,7 @@ static int spear_read_raw(struct iio_dev *indio_dev,
 
 	case IIO_CHAN_INFO_SCALE:
 		*val = info->vref_external;
-		*val2 = DATA_BITS;
+		*val2 = SPEAR_ADC_DATA_BITS;
 		return IIO_VAL_FRACTIONAL_LOG2;
 	}
 

@@ -253,7 +251,7 @@ static ssize_t spear_adc_write_frequency(struct device *dev,
 
 	mutex_lock(&indio_dev->mlock);
 
-	if ((lval < CLK_MIN) || (lval > CLK_MAX)) {
+	if ((lval < SPEAR_ADC_CLK_MIN) || (lval > SPEAR_ADC_CLK_MAX)) {
 		ret = -EINVAL;
 		goto out;
 	}

@@ -339,7 +337,8 @@ static int spear_adc_probe(struct platform_device *pdev)
 		goto errout3;
 	}
 
-	ret = devm_request_irq(dev, irq, spear_adc_isr, 0, MOD_NAME, info);
+	ret = devm_request_irq(dev, irq, spear_adc_isr, 0, SPEAR_ADC_MOD_NAME,
+			       info);
 	if (ret < 0) {
 		dev_err(dev, "failed requesting interrupt\n");
 		goto errout3;

@@ -370,7 +369,7 @@ static int spear_adc_probe(struct platform_device *pdev)
 
 	init_completion(&info->completion);
 
-	iodev->name = MOD_NAME;
+	iodev->name = SPEAR_ADC_MOD_NAME;
 	iodev->dev.parent = dev;
 	iodev->info = &spear_adc_iio_info;
 	iodev->modes = INDIO_DIRECT_MODE;

@@ -419,7 +418,7 @@ static struct platform_driver spear_adc_driver = {
 	.probe		= spear_adc_probe,
 	.remove		= spear_adc_remove,
 	.driver		= {
-		.name	= MOD_NAME,
+		.name	= SPEAR_ADC_MOD_NAME,
 		.owner	= THIS_MODULE,
 		.of_match_table = of_match_ptr(spear_adc_dt_ids),
 	},
Signature · 1 line
1.9.0
author maintainer Applied
#3 lore raw

Re: [PATCH 1/6] staging:iio:adc:spear adc - prefix defines to avoid namespace clashes.

Quoted 4 lines · Hartmut Knaack
Quoted 2 lines · Jonathan Cameron
Signed-off-by Jonathan Cameron <[email protected]>
Acked-by Stefan Roese <[email protected]>
Acked-by Hartmut Knaack <[email protected]>

Thanks, applied to the togreg branch of iio.git - initially pushed out as testing for the autobuilders to play.

Quoted 10 lines
Quoted 4 lines
---
  drivers/staging/iio/adc/spear_adc.c | 73 ++++++++++++++++++-------------------
  1 file changed, 36 insertions(+), 37 deletions(-)

--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

author maintainer
#4 lore raw

PATCH v3 2/6 staging:iio:adc:spear_adc drop initialization of unused scan_type

In reply to Jonathan Cameron

As the driver does not support the buffered interfaces of IIO this is not used.

Signed-off-by Jonathan Cameron <[email protected]>
Acked-by Stefan Roese <[email protected]>
---
 drivers/staging/iio/adc/spear_adc.c | 4 ----
 1 file changed, 4 deletions(-)
drivers/staging/iio/adc/spear_adc.c +0 -4
index 49293f9..c4e928b 100644
@@ -179,10 +179,6 @@ static int spear_read_raw(struct iio_dev *indio_dev,
 	.info_mask_separate = BIT(IIO_CHAN_INFO_RAW),	\
 	.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE),	\
 	.channel = idx,					\
-	.scan_type = {					\
-		.sign = 'u',				\
-		.storagebits = 16,			\
-	},						\
 }
 
 static const struct iio_chan_spec spear_adc_iio_channels[] = {
Signature · 1 line
1.9.0
#5 lore raw

Re: [PATCH 2/6] staging:iio:adc:spear_adc drop initialization of unused scan_type

Quoted 2 lines · Jonathan Cameron

As the driver does not support the buffered interfaces of IIO this is not used.

I trust you in this one, but I can't assess it right now with my limited IIO-buffer background knowledge. So, regard it as a silent ack, to not hold you back.

Quoted 22 lines
Signed-off-by Jonathan Cameron <[email protected]>
Acked-by Stefan Roese <[email protected]>
---
 drivers/staging/iio/adc/spear_adc.c | 4 ----
 1 file changed, 4 deletions(-)
drivers/staging/iio/adc/spear_adc.c +0 -4
index 49293f9..c4e928b 100644
@@ -179,10 +179,6 @@ static int spear_read_raw(struct iio_dev *indio_dev,
 	.info_mask_separate = BIT(IIO_CHAN_INFO_RAW),	\
 	.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE),	\
 	.channel = idx,					\
-	.scan_type = {					\
-		.sign = 'u',				\
-		.storagebits = 16,			\
-	},						\
 }
 
 static const struct iio_chan_spec spear_adc_iio_channels[] = {
author maintainer Applied
#6 lore raw

Re: [PATCH 2/6] staging:iio:adc:spear_adc drop initialization of unused scan_type

Quoted 8 lines · Hartmut Knaack
Quoted 2 lines · Jonathan Cameron

As the driver does not support the buffered interfaces of IIO this is not used.

I trust you in this one, but I can't assess it right now with my limited IIO-buffer background knowledge. So, regard it as a silent ack, to not hold you back.>>

Quoted 2 lines
Signed-off-by Jonathan Cameron <[email protected]>
Acked-by Stefan Roese <[email protected]>

Thanks,

Applied to the togreg branch of iio.git

Quoted 25 lines
Quoted 9 lines
---
  drivers/staging/iio/adc/spear_adc.c | 4 ----
  1 file changed, 4 deletions(-)
drivers/staging/iio/adc/spear_adc.c +0 -0
index 49293f9..c4e928b 100644

drivers/staging/iio/adc/spear_adc.c static int spear_read_raw(struct iio_dev *indio_dev, · line 184

Quoted 10 lines
drivers/staging/iio/adc/spear_adc.c +0 -4
@@ -179,10 +179,6 @@ static int spear_read_raw(struct iio_dev *indio_dev,
  	.info_mask_separate = BIT(IIO_CHAN_INFO_RAW),	\
  	.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE),	\
  	.channel = idx,					\
-	.scan_type = {					\
-		.sign = 'u',				\
-		.storagebits = 16,			\
-	},						\
  }
 
  static const struct iio_chan_spec spear_adc_iio_channels[] = {

--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

author maintainer
#7 lore raw

PATCH v3 3/6 staging:iio:adc:spear_adc use info_mask_shared_by_all for samp freq

In reply to Jonathan Cameron

Using the core support makes this element available to in kernel users as well as to userspace under exactly the same interface as before. The intent is to move all sampling frequency control to this approach throughout IIO.

Drop unused clk_high and clk_low whilst we are at it.

Signed-off-by Jonathan Cameron <[email protected]>
Acked-by Stefan Roese <[email protected]>
---
 drivers/staging/iio/adc/spear_adc.c | 92 +++++++++++++------------------------
 1 file changed, 33 insertions(+), 59 deletions(-)
drivers/staging/iio/adc/spear_adc.c +33 -59
index c4e928b..44a129f 100644
@@ -168,16 +168,48 @@ static int spear_read_raw(struct iio_dev *indio_dev,
 		*val = info->vref_external;
 		*val2 = SPEAR_ADC_DATA_BITS;
 		return IIO_VAL_FRACTIONAL_LOG2;
+	case IIO_CHAN_INFO_SAMP_FREQ:
+		*val = info->current_clk;
+		return IIO_VAL_INT;
 	}
 
 	return -EINVAL;
 }
 
+static int spear_adc_write_raw(struct iio_dev *indio_dev,
+			       struct iio_chan_spec const *chan,
+			       int val,
+			       int val2,
+			       long mask)
+{
+	struct spear_adc_info *info = iio_priv(indio_dev);
+	int ret = 0;
+
+	if (mask != IIO_CHAN_INFO_SAMP_FREQ)
+		return -EINVAL;
+
+	mutex_lock(&indio_dev->mlock);
+
+	if ((val < SPEAR_ADC_CLK_MIN) ||
+		(val > SPEAR_ADC_CLK_MAX) ||
+		(val2 != 0)) {
+		ret = -EINVAL;
+		goto out;
+	}
+
+	spear_adc_set_clk(info, val);
+
+out:
+	mutex_unlock(&indio_dev->mlock);
+	return ret;
+}
+
 #define SPEAR_ADC_CHAN(idx) {				\
 	.type = IIO_VOLTAGE,				\
 	.indexed = 1,					\
 	.info_mask_separate = BIT(IIO_CHAN_INFO_RAW),	\
 	.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE),	\
+	.info_mask_shared_by_all = BIT(IIO_CHAN_INFO_SAMP_FREQ),\
 	.channel = idx,					\
 }
 

@@ -219,67 +251,9 @@ static int spear_adc_configure(struct spear_adc_info *info)
 	return 0;
 }
 
-static ssize_t spear_adc_read_frequency(struct device *dev,
-					struct device_attribute *attr,
-					char *buf)
-{
-	struct iio_dev *indio_dev = dev_to_iio_dev(dev);
-	struct spear_adc_info *info = iio_priv(indio_dev);
-
-	return sprintf(buf, "%d\n", info->current_clk);
-}
-
-static ssize_t spear_adc_write_frequency(struct device *dev,
-					 struct device_attribute *attr,
-					 const char *buf,
-					 size_t len)
-{
-	struct iio_dev *indio_dev = dev_to_iio_dev(dev);
-	struct spear_adc_info *info = iio_priv(indio_dev);
-	u32 clk_high, clk_low, count;
-	u32 apb_clk = clk_get_rate(info->clk);
-	unsigned long lval;
-	int ret;
-
-	ret = kstrtoul(buf, 10, &lval);
-	if (ret)
-		return ret;
-
-	mutex_lock(&indio_dev->mlock);
-
-	if ((lval < SPEAR_ADC_CLK_MIN) || (lval > SPEAR_ADC_CLK_MAX)) {
-		ret = -EINVAL;
-		goto out;
-	}
-
-	count = (apb_clk + lval - 1) / lval;
-	clk_low = count / 2;
-	clk_high = count - clk_low;
-	info->current_clk = apb_clk / count;
-	spear_adc_set_clk(info, lval);
-
-out:
-	mutex_unlock(&indio_dev->mlock);
-
-	return ret ? ret : len;
-}
-
-static IIO_DEV_ATTR_SAMP_FREQ(S_IWUSR | S_IRUGO,
-			      spear_adc_read_frequency,
-			      spear_adc_write_frequency);
-
-static struct attribute *spear_attributes[] = {
-	&iio_dev_attr_sampling_frequency.dev_attr.attr,
-	NULL
-};
-
-static const struct attribute_group spear_attribute_group = {
-	.attrs = spear_attributes,
-};
-
 static const struct iio_info spear_adc_iio_info = {
 	.read_raw = &spear_read_raw,
-	.attrs = &spear_attribute_group,
+	.write_raw = &spear_adc_write_raw,
 	.driver_module = THIS_MODULE,
 };
Signature · 1 line
1.9.0
Acked-by on v3 3/6
#8 lore raw

Re: [PATCH 3/6] staging:iio:adc:spear_adc use info_mask_shared_by_all for samp freq

Quoted 9 lines · Jonathan Cameron

Using the core support makes this element available to in kernel users as well as to userspace under exactly the same interface as before. The intent is to move all sampling frequency control to this approach throughout IIO.

Drop unused clk_high and clk_low whilst we are at it.

Signed-off-by Jonathan Cameron <[email protected]>
Acked-by Stefan Roese <[email protected]>
Acked-by Hartmut Knaack <[email protected]>
Quoted 4 lines
---
 drivers/staging/iio/adc/spear_adc.c | 92 +++++++++++++------------------------
 1 file changed, 33 insertions(+), 59 deletions(-)
author maintainer Applied
#9 lore raw

Re: [PATCH 3/6] staging:iio:adc:spear_adc use info_mask_shared_by_all for samp freq

Quoted 11 lines · Hartmut Knaack
Quoted 9 lines · Jonathan Cameron

Using the core support makes this element available to in kernel users as well as to userspace under exactly the same interface as before. The intent is to move all sampling frequency control to this approach throughout IIO.

Drop unused clk_high and clk_low whilst we are at it.

Signed-off-by Jonathan Cameron <[email protected]>
Acked-by Stefan Roese <[email protected]>
Acked-by Hartmut Knaack <[email protected]>

Applied to the togreg branch of iio.git

Thanks,

Quoted 10 lines
Quoted 4 lines
---
  drivers/staging/iio/adc/spear_adc.c | 92 +++++++++++++------------------------
  1 file changed, 33 insertions(+), 59 deletions(-)

--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

author maintainer
#10 lore raw

PATCH v3 4/6 staging:iio:adc:spear rename device specific state structure to _state

In reply to Jonathan Cameron

Also rename instances of it to st. This brings the driver inline with the conventions of IIO and avoids some naming confusion with some IIO structures which also use the _info postfix.

Signed-off-by Jonathan Cameron <[email protected]>
---
 drivers/staging/iio/adc/spear_adc.c | 126 ++++++++++++++++++------------------
 1 file changed, 63 insertions(+), 63 deletions(-)
drivers/staging/iio/adc/spear_adc.c +63 -63
index 44a129f..3003e89 100644
@@ -70,7 +70,7 @@ struct adc_regs_spear6xx {
 	struct chan_data average;
 };
 
-struct spear_adc_info {
+struct spear_adc_state {
 	struct device_node *np;
 	struct adc_regs_spear3xx __iomem *adc_base_spear3xx;
 	struct adc_regs_spear6xx __iomem *adc_base_spear6xx;

@@ -88,51 +88,51 @@ struct spear_adc_info {
  * static inline functions, because of different register offsets
  * on different SoC variants (SPEAr300 vs SPEAr600 etc).
  */
-static void spear_adc_set_status(struct spear_adc_info *info, u32 val)
+static void spear_adc_set_status(struct spear_adc_state *st, u32 val)
 {
-	__raw_writel(val, &info->adc_base_spear6xx->status);
+	__raw_writel(val, &st->adc_base_spear6xx->status);
 }
 
-static void spear_adc_set_clk(struct spear_adc_info *info, u32 val)
+static void spear_adc_set_clk(struct spear_adc_state *st, u32 val)
 {
 	u32 clk_high, clk_low, count;
-	u32 apb_clk = clk_get_rate(info->clk);
+	u32 apb_clk = clk_get_rate(st->clk);
 
 	count = (apb_clk + val - 1) / val;
 	clk_low = count / 2;
 	clk_high = count - clk_low;
-	info->current_clk = apb_clk / count;
+	st->current_clk = apb_clk / count;
 
 	__raw_writel(SPEAR_ADC_CLK_LOW(clk_low) | SPEAR_ADC_CLK_HIGH(clk_high),
-		     &info->adc_base_spear6xx->clk);
+		     &st->adc_base_spear6xx->clk);
 }
 
-static void spear_adc_set_ctrl(struct spear_adc_info *info, int n,
+static void spear_adc_set_ctrl(struct spear_adc_state *st, int n,
 			       u32 val)
 {
-	__raw_writel(val, &info->adc_base_spear6xx->ch_ctrl[n]);
+	__raw_writel(val, &st->adc_base_spear6xx->ch_ctrl[n]);
 }
 
-static u32 spear_adc_get_average(struct spear_adc_info *info)
+static u32 spear_adc_get_average(struct spear_adc_state *st)
 {
-	if (of_device_is_compatible(info->np, "st,spear600-adc")) {
-		return __raw_readl(&info->adc_base_spear6xx->average.msb) &
+	if (of_device_is_compatible(st->np, "st,spear600-adc")) {
+		return __raw_readl(&st->adc_base_spear6xx->average.msb) &
 			SPEAR_ADC_DATA_MASK;
 	} else {
-		return __raw_readl(&info->adc_base_spear3xx->average) &
+		return __raw_readl(&st->adc_base_spear3xx->average) &
 			SPEAR_ADC_DATA_MASK;
 	}
 }
 
-static void spear_adc_set_scanrate(struct spear_adc_info *info, u32 rate)
+static void spear_adc_set_scanrate(struct spear_adc_state *st, u32 rate)
 {
-	if (of_device_is_compatible(info->np, "st,spear600-adc")) {
+	if (of_device_is_compatible(st->np, "st,spear600-adc")) {
 		__raw_writel(SPEAR600_ADC_SCAN_RATE_LO(rate),
-			     &info->adc_base_spear6xx->scan_rate_lo);
+			     &st->adc_base_spear6xx->scan_rate_lo);
 		__raw_writel(SPEAR600_ADC_SCAN_RATE_HI(rate),
-			     &info->adc_base_spear6xx->scan_rate_hi);
+			     &st->adc_base_spear6xx->scan_rate_hi);
 	} else {
-		__raw_writel(rate, &info->adc_base_spear3xx->scan_rate);
+		__raw_writel(rate, &st->adc_base_spear3xx->scan_rate);
 	}
 }
 

@@ -142,7 +142,7 @@ static int spear_read_raw(struct iio_dev *indio_dev,
 			  int *val2,
 			  long mask)
 {
-	struct spear_adc_info *info = iio_priv(indio_dev);
+	struct spear_adc_state *st = iio_priv(indio_dev);
 	u32 status;
 
 	switch (mask) {

@@ -150,26 +150,26 @@ static int spear_read_raw(struct iio_dev *indio_dev,
 		mutex_lock(&indio_dev->mlock);
 
 		status = SPEAR_ADC_STATUS_CHANNEL_NUM(chan->channel) |
-			SPEAR_ADC_STATUS_AVG_SAMPLE(info->avg_samples) |
+			SPEAR_ADC_STATUS_AVG_SAMPLE(st->avg_samples) |
 			SPEAR_ADC_STATUS_START_CONVERSION |
 			SPEAR_ADC_STATUS_ADC_ENABLE;
-		if (info->vref_external == 0)
+		if (st->vref_external == 0)
 			status |= SPEAR_ADC_STATUS_VREF_INTERNAL;
 
-		spear_adc_set_status(info, status);
-		wait_for_completion(&info->completion); /* set by ISR */
-		*val = info->value;
+		spear_adc_set_status(st, status);
+		wait_for_completion(&st->completion); /* set by ISR */
+		*val = st->value;
 
 		mutex_unlock(&indio_dev->mlock);
 
 		return IIO_VAL_INT;
 
 	case IIO_CHAN_INFO_SCALE:
-		*val = info->vref_external;
+		*val = st->vref_external;
 		*val2 = SPEAR_ADC_DATA_BITS;
 		return IIO_VAL_FRACTIONAL_LOG2;
 	case IIO_CHAN_INFO_SAMP_FREQ:
-		*val = info->current_clk;
+		*val = st->current_clk;
 		return IIO_VAL_INT;
 	}
 

@@ -182,7 +182,7 @@ static int spear_adc_write_raw(struct iio_dev *indio_dev,
 			       int val2,
 			       long mask)
 {
-	struct spear_adc_info *info = iio_priv(indio_dev);
+	struct spear_adc_state *st = iio_priv(indio_dev);
 	int ret = 0;
 
 	if (mask != IIO_CHAN_INFO_SAMP_FREQ)

@@ -197,7 +197,7 @@ static int spear_adc_write_raw(struct iio_dev *indio_dev,
 		goto out;
 	}
 
-	spear_adc_set_clk(info, val);
+	spear_adc_set_clk(st, val);
 
 out:
 	mutex_unlock(&indio_dev->mlock);

@@ -226,32 +226,32 @@ static const struct iio_chan_spec spear_adc_iio_channels[] = {
 
 static irqreturn_t spear_adc_isr(int irq, void *dev_id)
 {
-	struct spear_adc_info *info = (struct spear_adc_info *)dev_id;
+	struct spear_adc_state *st = (struct spear_adc_state *)dev_id;
 
 	/* Read value to clear IRQ */
-	info->value = spear_adc_get_average(info);
-	complete(&info->completion);
+	st->value = spear_adc_get_average(st);
+	complete(&st->completion);
 
 	return IRQ_HANDLED;
 }
 
-static int spear_adc_configure(struct spear_adc_info *info)
+static int spear_adc_configure(struct spear_adc_state *st)
 {
 	int i;
 
 	/* Reset ADC core */
-	spear_adc_set_status(info, 0);
-	__raw_writel(0, &info->adc_base_spear6xx->clk);
+	spear_adc_set_status(st, 0);
+	__raw_writel(0, &st->adc_base_spear6xx->clk);
 	for (i = 0; i < 8; i++)
-		spear_adc_set_ctrl(info, i, 0);
-	spear_adc_set_scanrate(info, 0);
+		spear_adc_set_ctrl(st, i, 0);
+	spear_adc_set_scanrate(st, 0);
 
-	spear_adc_set_clk(info, info->sampling_freq);
+	spear_adc_set_clk(st, st->sampling_freq);
 
 	return 0;
 }
 
-static const struct iio_info spear_adc_iio_info = {
+static const struct iio_info spear_adc_info = {
 	.read_raw = &spear_read_raw,
 	.write_raw = &spear_adc_write_raw,
 	.driver_module = THIS_MODULE,

@@ -261,40 +261,40 @@ static int spear_adc_probe(struct platform_device *pdev)
 {
 	struct device_node *np = pdev->dev.of_node;
 	struct device *dev = &pdev->dev;
-	struct spear_adc_info *info;
+	struct spear_adc_state *st;
 	struct iio_dev *iodev = NULL;
 	int ret = -ENODEV;
 	int irq;
 
-	iodev = devm_iio_device_alloc(dev, sizeof(struct spear_adc_info));
+	iodev = devm_iio_device_alloc(dev, sizeof(struct spear_adc_state));
 	if (!iodev) {
 		dev_err(dev, "failed allocating iio device\n");
 		return -ENOMEM;
 	}
 
-	info = iio_priv(iodev);
-	info->np = np;
+	st = iio_priv(iodev);
+	st->np = np;
 
 	/*
 	 * SPEAr600 has a different register layout than other SPEAr SoC's
 	 * (e.g. SPEAr3xx). Let's provide two register base addresses
 	 * to support multi-arch kernels.
 	 */
-	info->adc_base_spear6xx = of_iomap(np, 0);
-	if (!info->adc_base_spear6xx) {
+	st->adc_base_spear6xx = of_iomap(np, 0);
+	if (!st->adc_base_spear6xx) {
 		dev_err(dev, "failed mapping memory\n");
 		return -ENOMEM;
 	}
-	info->adc_base_spear3xx =
-		(struct adc_regs_spear3xx __iomem *)info->adc_base_spear6xx;
+	st->adc_base_spear3xx =
+		(struct adc_regs_spear3xx __iomem *)st->adc_base_spear6xx;
 
-	info->clk = clk_get(dev, NULL);
-	if (IS_ERR(info->clk)) {
+	st->clk = clk_get(dev, NULL);
+	if (IS_ERR(st->clk)) {
 		dev_err(dev, "failed getting clock\n");
 		goto errout1;
 	}
 
-	ret = clk_prepare_enable(info->clk);
+	ret = clk_prepare_enable(st->clk);
 	if (ret) {
 		dev_err(dev, "failed enabling clock\n");
 		goto errout2;

@@ -308,14 +308,14 @@ static int spear_adc_probe(struct platform_device *pdev)
 	}
 
 	ret = devm_request_irq(dev, irq, spear_adc_isr, 0, SPEAR_ADC_MOD_NAME,
-			       info);
+			       st);
 	if (ret < 0) {
 		dev_err(dev, "failed requesting interrupt\n");
 		goto errout3;
 	}
 
 	if (of_property_read_u32(np, "sampling-frequency",
-				 &info->sampling_freq)) {
+				 &st->sampling_freq)) {
 		dev_err(dev, "sampling-frequency missing in DT\n");
 		ret = -EINVAL;
 		goto errout3;

@@ -325,23 +325,23 @@ static int spear_adc_probe(struct platform_device *pdev)
 	 * Optional avg_samples defaults to 0, resulting in single data
 	 * conversion
 	 */
-	of_property_read_u32(np, "average-samples", &info->avg_samples);
+	of_property_read_u32(np, "average-samples", &st->avg_samples);
 
 	/*
 	 * Optional vref_external defaults to 0, resulting in internal vref
 	 * selection
 	 */
-	of_property_read_u32(np, "vref-external", &info->vref_external);
+	of_property_read_u32(np, "vref-external", &st->vref_external);
 
-	spear_adc_configure(info);
+	spear_adc_configure(st);
 
 	platform_set_drvdata(pdev, iodev);
 
-	init_completion(&info->completion);
+	init_completion(&st->completion);
 
 	iodev->name = SPEAR_ADC_MOD_NAME;
 	iodev->dev.parent = dev;
-	iodev->info = &spear_adc_iio_info;
+	iodev->info = &spear_adc_info;
 	iodev->modes = INDIO_DIRECT_MODE;
 	iodev->channels = spear_adc_iio_channels;
 	iodev->num_channels = ARRAY_SIZE(spear_adc_iio_channels);

@@ -355,23 +355,23 @@ static int spear_adc_probe(struct platform_device *pdev)
 	return 0;
 
 errout3:
-	clk_disable_unprepare(info->clk);
+	clk_disable_unprepare(st->clk);
 errout2:
-	clk_put(info->clk);
+	clk_put(st->clk);
 errout1:
-	iounmap(info->adc_base_spear6xx);
+	iounmap(st->adc_base_spear6xx);
 	return ret;
 }
 
 static int spear_adc_remove(struct platform_device *pdev)
 {
 	struct iio_dev *iodev = platform_get_drvdata(pdev);
-	struct spear_adc_info *info = iio_priv(iodev);
+	struct spear_adc_state *st = iio_priv(iodev);
 
 	iio_device_unregister(iodev);
-	clk_disable_unprepare(info->clk);
-	clk_put(info->clk);
-	iounmap(info->adc_base_spear6xx);
+	clk_disable_unprepare(st->clk);
+	clk_put(st->clk);
+	iounmap(st->adc_base_spear6xx);
 
 	return 0;
 }
Signature · 1 line
1.9.0
Acked-by on v3 4/6
#11 lore raw

Re: [PATCH 4/6] staging:iio:adc:spear rename device specific state structure to _state

Quoted 5 lines · Jonathan Cameron

Also rename instances of it to st. This brings the driver inline with the conventions of IIO and avoids some naming confusion with some IIO structures which also use the _info postfix.

Signed-off-by Jonathan Cameron <[email protected]>
Acked-by Hartmut Knaack <[email protected]>
Quoted 4 lines
---
 drivers/staging/iio/adc/spear_adc.c | 126 ++++++++++++++++++------------------
 1 file changed, 63 insertions(+), 63 deletions(-)
author maintainer Applied
#12 lore raw

Re: [PATCH 4/6] staging:iio:adc:spear rename device specific state structure to _state

Quoted 7 lines · Hartmut Knaack
Quoted 5 lines · Jonathan Cameron

Also rename instances of it to st. This brings the driver inline with the conventions of IIO and avoids some naming confusion with some IIO structures which also use the _info postfix.

Signed-off-by Jonathan Cameron <[email protected]>
Acked-by Hartmut Knaack <[email protected]>

Applied to the togreg branch of iio.git

Thanks

Quoted 10 lines
Quoted 4 lines
---
  drivers/staging/iio/adc/spear_adc.c | 126 ++++++++++++++++++------------------
  1 file changed, 63 insertions(+), 63 deletions(-)

--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

author maintainer
#13 lore raw

PATCH v3 5/6 staging:iio:adc:spear rename iodev -> indio_dev to fit with current convention

In reply to Jonathan Cameron

How we ended up with indio_dev is a mystery, but we have so in the interests of consistency, move this driver over to that convention.

Signed-off-by Jonathan Cameron <[email protected]>
---
 drivers/staging/iio/adc/spear_adc.c | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)
drivers/staging/iio/adc/spear_adc.c +15 -15
index 3003e89..52c26a6 100644
@@ -262,17 +262,17 @@ static int spear_adc_probe(struct platform_device *pdev)
 	struct device_node *np = pdev->dev.of_node;
 	struct device *dev = &pdev->dev;
 	struct spear_adc_state *st;
-	struct iio_dev *iodev = NULL;
+	struct iio_dev *indio_dev = NULL;
 	int ret = -ENODEV;
 	int irq;
 
-	iodev = devm_iio_device_alloc(dev, sizeof(struct spear_adc_state));
-	if (!iodev) {
+	indio_dev = devm_iio_device_alloc(dev, sizeof(struct spear_adc_state));
+	if (!indio_dev) {
 		dev_err(dev, "failed allocating iio device\n");
 		return -ENOMEM;
 	}
 
-	st = iio_priv(iodev);
+	st = iio_priv(indio_dev);
 	st->np = np;
 
 	/*

@@ -335,18 +335,18 @@ static int spear_adc_probe(struct platform_device *pdev)
 
 	spear_adc_configure(st);
 
-	platform_set_drvdata(pdev, iodev);
+	platform_set_drvdata(pdev, indio_dev);
 
 	init_completion(&st->completion);
 
-	iodev->name = SPEAR_ADC_MOD_NAME;
-	iodev->dev.parent = dev;
-	iodev->info = &spear_adc_info;
-	iodev->modes = INDIO_DIRECT_MODE;
-	iodev->channels = spear_adc_iio_channels;
-	iodev->num_channels = ARRAY_SIZE(spear_adc_iio_channels);
+	indio_dev->name = SPEAR_ADC_MOD_NAME;
+	indio_dev->dev.parent = dev;
+	indio_dev->info = &spear_adc_info;
+	indio_dev->modes = INDIO_DIRECT_MODE;
+	indio_dev->channels = spear_adc_iio_channels;
+	indio_dev->num_channels = ARRAY_SIZE(spear_adc_iio_channels);
 
-	ret = iio_device_register(iodev);
+	ret = iio_device_register(indio_dev);
 	if (ret)
 		goto errout3;
 

@@ -365,10 +365,10 @@ errout1:
 
 static int spear_adc_remove(struct platform_device *pdev)
 {
-	struct iio_dev *iodev = platform_get_drvdata(pdev);
-	struct spear_adc_state *st = iio_priv(iodev);
+	struct iio_dev *indio_dev = platform_get_drvdata(pdev);
+	struct spear_adc_state *st = iio_priv(indio_dev);
 
-	iio_device_unregister(iodev);
+	iio_device_unregister(indio_dev);
 	clk_disable_unprepare(st->clk);
 	clk_put(st->clk);
 	iounmap(st->adc_base_spear6xx);
Signature · 1 line
1.9.0
Acked-by on v3 5/6
#14 lore raw

Re: [PATCH 5/6] staging:iio:adc:spear rename iodev -> indio_dev to fit with current convention

Quoted 4 lines · Jonathan Cameron

How we ended up with indio_dev is a mystery, but we have so in the interests of consistency, move this driver over to that convention.

Signed-off-by Jonathan Cameron <[email protected]>
Acked-by Hartmut Knaack <[email protected]>
Quoted 4 lines
---
 drivers/staging/iio/adc/spear_adc.c | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)
author maintainer
#15 lore raw

PATCH v3 6/6 staging:iio:adc:spear rename spear_read_raw to spear_adc_read_raw

In reply to Jonathan Cameron

This brings it inline with all the other prefix usage in the driver.

Signed-off-by Jonathan Cameron <[email protected]>
---
 drivers/staging/iio/adc/spear_adc.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/staging/iio/adc/spear_adc.c +5 -5
index 52c26a6..a6ad9de 100644
@@ -136,11 +136,11 @@ static void spear_adc_set_scanrate(struct spear_adc_state *st, u32 rate)
 	}
 }
 
-static int spear_read_raw(struct iio_dev *indio_dev,
-			  struct iio_chan_spec const *chan,
-			  int *val,
-			  int *val2,
-			  long mask)
+static int spear_adc_read_raw(struct iio_dev *indio_dev,
+			      struct iio_chan_spec const *chan,
+			      int *val,
+			      int *val2,
+			      long mask)
 {
 	struct spear_adc_state *st = iio_priv(indio_dev);
 	u32 status;
Signature · 1 line
1.9.0
author maintainer
#17 lore raw

Re: [PATCH 6/6] staging:iio:adc:spear rename spear_read_raw to spear_adc_read_raw

Quoted 5 lines · Hartmut Knaack
Quoted 3 lines · Jonathan Cameron

This brings it inline with all the other prefix usage in the driver.

Signed-off-by Jonathan Cameron <[email protected]>
Acked-by Hartmut Knaack <[email protected]>

Hmm, I think something went wrong with the original patch. The users of this function weren't updated. I've fixed that as it was trivial and taken the view that the ack assumed I wasn't an idiot ;)

Applied with fix to the togreg branch of iio.git

Thanks,

Jonathan

Quoted 10 lines
Quoted 4 lines
---
  drivers/staging/iio/adc/spear_adc.c | 10 +++++-----
  1 file changed, 5 insertions(+), 5 deletions(-)

--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html