From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754685Ab3ARKsH (ORCPT ); Fri, 18 Jan 2013 05:48:07 -0500 Received: from devils.ext.ti.com ([198.47.26.153]:51128 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751704Ab3ARKsC (ORCPT ); Fri, 18 Jan 2013 05:48:02 -0500 From: "Patil, Rachna" To: , , , , , , CC: Samuel Ortiz , Dmitry Torokhov , Dmitry Torokhov , Rob Herring , Jonathan Cameron , Tony Lindgren , Benit Cousson , Grant Likely , Rob Landley , Russell King , "Patil, Rachna" Subject: [PATCH v3 7/8] IIO: ti_am335x_adc: Add DT support Date: Fri, 18 Jan 2013 16:18:49 +0530 Message-ID: X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: "Patil, Rachna" Add DT support for client ADC driver. Signed-off-by: Patil, Rachna --- drivers/iio/adc/ti_am335x_adc.c | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/drivers/iio/adc/ti_am335x_adc.c b/drivers/iio/adc/ti_am335x_adc.c index cd030e1..81ca8e5 100644 --- a/drivers/iio/adc/ti_am335x_adc.c +++ b/drivers/iio/adc/ti_am335x_adc.c @@ -22,6 +22,8 @@ #include #include #include +#include +#include #include #include @@ -141,11 +143,12 @@ static int tiadc_probe(struct platform_device *pdev) struct iio_dev *indio_dev; struct tiadc_device *adc_dev; struct ti_tscadc_dev *tscadc_dev = pdev->dev.platform_data; - struct mfd_tscadc_board *pdata; + struct mfd_tscadc_board *pdata = tscadc_dev->dev->platform_data; + struct device_node *node = tscadc_dev->dev->of_node; int err; + u32 val32; - pdata = tscadc_dev->dev->platform_data; - if (!pdata || !pdata->adc_init) { + if (!pdata && !node) { dev_err(&pdev->dev, "Could not find platform data\n"); return -EINVAL; } @@ -159,7 +162,22 @@ static int tiadc_probe(struct platform_device *pdev) adc_dev = iio_priv(indio_dev); adc_dev->mfd_tscadc = tscadc_dev; - adc_dev->channels = pdata->adc_init->adc_channels; + + if (pdata) + adc_dev->channels = pdata->adc_init->adc_channels; + else { + node = of_find_node_by_name(node, "adc"); + if (!node) + return -EINVAL; + else { + err = of_property_read_u32(node, + "adc-channels", &val32); + if (err < 0) + goto err_free_device; + else + adc_dev->channels = val32; + } + } indio_dev->dev.parent = &pdev->dev; indio_dev->name = dev_name(&pdev->dev); -- 1.7.9.5