Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753284AbaBONbp (ORCPT ); Sat, 15 Feb 2014 08:31:45 -0500 Received: from mail-oa0-f44.google.com ([209.85.219.44]:35827 "EHLO mail-oa0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753153AbaBONbm (ORCPT ); Sat, 15 Feb 2014 08:31:42 -0500 MIME-Version: 1.0 In-Reply-To: <1392403586-30540-2-git-send-email-sre@debian.org> References: <20140214174040.GB26969@earth.universe> <1392403586-30540-1-git-send-email-sre@debian.org> <1392403586-30540-2-git-send-email-sre@debian.org> Date: Sat, 15 Feb 2014 14:31:41 +0100 Message-ID: Subject: Re: [RFCv1 2/4] mfd: twl4030-madc: Add DT support and convert to IIO framework From: Belisko Marek To: Sebastian Reichel Cc: Sebastian Reichel , Jonathan Cameron , Lee Jones , Samuel Ortiz , Lars-Peter Clausen , Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala , Grant Likely , LKML , "devicetree@vger.kernel.org" , linux-iio@vger.kernel.org Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Sebastian, On Fri, Feb 14, 2014 at 7:46 PM, Sebastian Reichel wrote: > This converts twl4030-madc module to use the Industrial IO ADC > framework and adds device tree support. > > Signed-off-by: Sebastian Reichel > --- > drivers/mfd/twl4030-madc.c | 121 ++++++++++++++++++++++++++++++++++++++++++--- > 1 file changed, 114 insertions(+), 7 deletions(-) > > diff --git a/drivers/mfd/twl4030-madc.c b/drivers/mfd/twl4030-madc.c > index 5458561..4da61c4 100644 > --- a/drivers/mfd/twl4030-madc.c > +++ b/drivers/mfd/twl4030-madc.c > @@ -47,6 +47,10 @@ > #include > #include > > +#include > +#include > +#include > + > /* > * struct twl4030_madc_data - a container for madc info > * @dev - pointer to device structure for madc > @@ -59,10 +63,72 @@ struct twl4030_madc_data { > struct device *dev; > struct mutex lock; /* mutex protecting this data structure */ > struct twl4030_madc_request requests[TWL4030_MADC_NUM_METHODS]; > + bool use_second_irq; > int imr; > int isr; > }; > > +static int twl4030_madc_read(struct iio_dev *iio_dev, > + const struct iio_chan_spec *chan, > + int *val, int *val2, long mask) > +{ > + struct twl4030_madc_data *madc = iio_priv(iio_dev); > + struct twl4030_madc_request req; > + int channel = chan->channel; > + int ret; > + > + req.method = madc->use_second_irq ? TWL4030_MADC_SW2 : TWL4030_MADC_SW1; > + > + req.channels = BIT(channel); > + req.active = 0; > + req.func_cb = NULL; > + req.raw = (mask & IIO_CHAN_INFO_PROCESSED) ? false : true; > + req.do_avg = (mask & IIO_CHAN_INFO_AVERAGE_RAW) ? true : false; > + > + ret = twl4030_madc_conversion(&req); > + if (ret < 0) > + return ret; > + > + *val = req.rbuf[channel]; > + > + return IIO_VAL_INT; > +} > + > +static const struct iio_info twl4030_madc_iio_info = { > + .read_raw = &twl4030_madc_read, > + .driver_module = THIS_MODULE, > +}; > + > +#define ADC_CHANNEL(_channel, _type, _name, _mask) { \ > + .type = _type, \ > + .scan_type = IIO_ST('u', 10, 16, 0), \ > + .channel = _channel, \ > + .info_mask_separate = _mask, \ > + .datasheet_name = _name, \ > + .indexed = 1, \ > +} > + > +static const struct iio_chan_spec twl4030_madc_iio_channels[] = { > + ADC_CHANNEL(0, IIO_VOLTAGE, "ADCIN0", BIT(IIO_CHAN_INFO_AVERAGE_RAW)), > + ADC_CHANNEL(1, IIO_TEMP, "ADCIN1", BIT(IIO_CHAN_INFO_PROCESSED) | > + BIT(IIO_CHAN_INFO_AVERAGE_RAW)), > + ADC_CHANNEL(2, IIO_VOLTAGE, "ADCIN2", BIT(IIO_CHAN_INFO_AVERAGE_RAW)), > + ADC_CHANNEL(3, IIO_VOLTAGE, "ADCIN3", BIT(IIO_CHAN_INFO_AVERAGE_RAW)), > + ADC_CHANNEL(4, IIO_VOLTAGE, "ADCIN4", BIT(IIO_CHAN_INFO_AVERAGE_RAW)), > + ADC_CHANNEL(5, IIO_VOLTAGE, "ADCIN5", BIT(IIO_CHAN_INFO_AVERAGE_RAW)), > + ADC_CHANNEL(6, IIO_VOLTAGE, "ADCIN6", BIT(IIO_CHAN_INFO_AVERAGE_RAW)), > + ADC_CHANNEL(7, IIO_VOLTAGE, "ADCIN7", BIT(IIO_CHAN_INFO_AVERAGE_RAW)), > + ADC_CHANNEL(8, IIO_VOLTAGE, "ADCIN8", BIT(IIO_CHAN_INFO_AVERAGE_RAW)), > + ADC_CHANNEL(9, IIO_VOLTAGE, "ADCIN9", BIT(IIO_CHAN_INFO_AVERAGE_RAW)), > + ADC_CHANNEL(10, IIO_CURRENT, "ADCIN10", BIT(IIO_CHAN_INFO_PROCESSED) | > + BIT(IIO_CHAN_INFO_AVERAGE_RAW)), > + ADC_CHANNEL(11, IIO_VOLTAGE, "ADCIN11", BIT(IIO_CHAN_INFO_AVERAGE_RAW)), > + ADC_CHANNEL(12, IIO_VOLTAGE, "ADCIN12", BIT(IIO_CHAN_INFO_AVERAGE_RAW)), > + ADC_CHANNEL(13, IIO_VOLTAGE, "ADCIN13", BIT(IIO_CHAN_INFO_AVERAGE_RAW)), > + ADC_CHANNEL(14, IIO_VOLTAGE, "ADCIN14", BIT(IIO_CHAN_INFO_AVERAGE_RAW)), > + ADC_CHANNEL(15, IIO_VOLTAGE, "ADCIN15", BIT(IIO_CHAN_INFO_AVERAGE_RAW)), > +}; > + > static struct twl4030_madc_data *twl4030_madc; > > struct twl4030_prescale_divider_ratios { > @@ -702,28 +768,49 @@ static int twl4030_madc_probe(struct platform_device *pdev) > { > struct twl4030_madc_data *madc; > struct twl4030_madc_platform_data *pdata = dev_get_platdata(&pdev->dev); > + struct device_node *np = pdev->dev.of_node; > int irq, ret; > u8 regval; > + struct iio_dev *iio_dev = NULL; > > - if (!pdata) { > + if (!pdata && !np) { > dev_err(&pdev->dev, "platform_data not available\n"); > return -EINVAL; > } > - madc = devm_kzalloc(&pdev->dev, sizeof(*madc), GFP_KERNEL); > - if (!madc) > + > + iio_dev = devm_iio_device_alloc(&pdev->dev, > + sizeof(struct twl4030_madc_data)); > + if (!iio_dev) { > + dev_err(&pdev->dev, "failed allocating iio device\n"); > return -ENOMEM; > + } > > + madc = iio_priv(iio_dev); > madc->dev = &pdev->dev; > > + iio_dev->name = dev_name(&pdev->dev); > + iio_dev->dev.parent = &pdev->dev; > + iio_dev->dev.of_node = pdev->dev.of_node; > + iio_dev->info = &twl4030_madc_iio_info; > + iio_dev->modes = INDIO_DIRECT_MODE; > + iio_dev->channels = twl4030_madc_iio_channels; > + iio_dev->num_channels = 16; > + > /* > * Phoenix provides 2 interrupt lines. The first one is connected to > * the OMAP. The other one can be connected to the other processor such > * as modem. Hence two separate ISR and IMR registers. > */ > - madc->imr = (pdata->irq_line == 1) ? > + if (pdata) > + madc->use_second_irq = pdata->irq_line != 1; > + else > + madc->use_second_irq = false; Can we add some property to use second IRQ also in DT? > + > + madc->imr = (madc->use_second_irq == 1) ? > TWL4030_MADC_IMR1 : TWL4030_MADC_IMR2; > - madc->isr = (pdata->irq_line == 1) ? > + madc->isr = (madc->use_second_irq == 1) ? > TWL4030_MADC_ISR1 : TWL4030_MADC_ISR2; > + > ret = twl4030_madc_set_power(madc, 1); > if (ret < 0) > return ret; > @@ -768,7 +855,7 @@ static int twl4030_madc_probe(struct platform_device *pdev) > } > } > > - platform_set_drvdata(pdev, madc); > + platform_set_drvdata(pdev, iio_dev); > mutex_init(&madc->lock); > > irq = platform_get_irq(pdev, 0); > @@ -780,7 +867,15 @@ static int twl4030_madc_probe(struct platform_device *pdev) > goto err_i2c; > } > twl4030_madc = madc; > + > + ret = iio_device_register(iio_dev); > + if (ret) { > + dev_dbg(&pdev->dev, "could not register iio device\n"); > + goto err_i2c; > + } > + > return 0; > + > err_i2c: > twl4030_madc_set_current_generator(madc, 0, 0); > err_current_generator: > @@ -790,20 +885,32 @@ err_current_generator: > > static int twl4030_madc_remove(struct platform_device *pdev) > { > - struct twl4030_madc_data *madc = platform_get_drvdata(pdev); > + struct iio_dev *iio_dev = platform_get_drvdata(pdev); > + struct twl4030_madc_data *madc = iio_priv(iio_dev); > > twl4030_madc_set_current_generator(madc, 0, 0); > twl4030_madc_set_power(madc, 0); > > + iio_device_unregister(iio_dev); > + > return 0; > } > > +#ifdef CONFIG_OF > +static const struct of_device_id twl_madc_of_match[] = { > + {.compatible = "ti,twl4030-madc", }, > + { }, > +}; > +MODULE_DEVICE_TABLE(of, twl_madc_of_match); > +#endif > + > static struct platform_driver twl4030_madc_driver = { > .probe = twl4030_madc_probe, > .remove = twl4030_madc_remove, > .driver = { > .name = "twl4030_madc", > .owner = THIS_MODULE, > + .of_match_table = of_match_ptr(twl_madc_of_match), > }, > }; > > -- > 1.8.5.3 > BR, marek -- as simple and primitive as possible ------------------------------------------------- Marek Belisko - OPEN-NANDRA Freelance Developer Ruska Nova Ves 219 | Presov, 08005 Slovak Republic Tel: +421 915 052 184 skype: marekwhite twitter: #opennandra web: http://open-nandra.com -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/