From: "Patil, Rachna" <rachna@ti.com> To: <linux-doc@vger.kernel.org>, <devicetree-discuss@lists.ozlabs.org>, <linux-kernel@vger.kernel.org>, <linux-input@vger.kernel.org>, <linux-iio@vger.kernel.org> Cc: Rob Landley <rob@landley.net>, Grant Likely <grant.likely@secretlab.ca>, Rob Herring <rob.herring@calxeda.com>, Samuel Ortiz <sameo@linux.intel.com>, Dmitry Torokhov <dmitry.torokhov@gmail.com>, Dmitry Torokhov <dtor@mail.ru>, Jonathan Cameron <jic23@cam.ac.uk>, "Patil, Rachna" <rachna@ti.com> Subject: [PATCH RESEND 5/7] MFD: ti_am335x_tscadc: Add DT support Date: Wed, 7 Nov 2012 12:22:02 +0530 [thread overview] Message-ID: <1352271124-5513-6-git-send-email-rachna@ti.com> (raw) In-Reply-To: <1352271124-5513-1-git-send-email-rachna@ti.com> Make changes to add DT support in the MFD core driver. Signed-off-by: Patil, Rachna <rachna@ti.com> --- drivers/mfd/ti_am335x_tscadc.c | 28 +++++++++++++++++++++++----- 1 files changed, 23 insertions(+), 5 deletions(-) diff --git a/drivers/mfd/ti_am335x_tscadc.c b/drivers/mfd/ti_am335x_tscadc.c index 8ca3bf0..07b7788 100644 --- a/drivers/mfd/ti_am335x_tscadc.c +++ b/drivers/mfd/ti_am335x_tscadc.c @@ -22,6 +22,8 @@ #include <linux/regmap.h> #include <linux/mfd/core.h> #include <linux/pm_runtime.h> +#include <linux/of.h> +#include <linux/of_device.h> #include <linux/mfd/ti_am335x_tscadc.h> #include <linux/input/ti_am335x_tsc.h> @@ -64,20 +66,31 @@ static int __devinit ti_tscadc_probe(struct platform_device *pdev) struct resource *res; struct clk *clk; struct mfd_tscadc_board *pdata = pdev->dev.platform_data; + struct device_node *node = pdev->dev.of_node; struct mfd_cell *cell; int err, ctrl; int clk_value, clock_rate; - int tsc_wires, adc_channels = 0, total_channels; + int tsc_wires = 0, adc_channels = 0, total_channels; - if (!pdata) { + if (!pdata && !pdev->dev.of_node) { dev_err(&pdev->dev, "Could not find platform data\n"); return -EINVAL; } - if (pdata->adc_init) - adc_channels = pdata->adc_init->adc_channels; + if (pdev->dev.of_node) { + node = of_find_node_by_name(pdev->dev.of_node, "tsc"); + of_property_read_u32(node, "wires", &tsc_wires); + + node = of_find_node_by_name(pdev->dev.of_node, "adc"); + of_property_read_u32(node, "adc-channels", &adc_channels); + } else { + if (pdata->tsc_init) + tsc_wires = pdata->tsc_init->wires; + + if (pdata->adc_init) + adc_channels = pdata->adc_init->adc_channels; + } - tsc_wires = pdata->tsc_init->wires; total_channels = tsc_wires + adc_channels; if (total_channels > 8) { @@ -256,11 +269,16 @@ static const struct dev_pm_ops tscadc_pm_ops = { #define TSCADC_PM_OPS NULL #endif +static const struct of_device_id ti_tscadc_dt_ids[] = { + { .compatible = "ti,ti-tscadc", }, +}; + static struct platform_driver ti_tscadc_driver = { .driver = { .name = "ti_tscadc", .owner = THIS_MODULE, .pm = TSCADC_PM_OPS, + .of_match_table = of_match_ptr(ti_tscadc_dt_ids), }, .probe = ti_tscadc_probe, .remove = __devexit_p(ti_tscadc_remove), -- 1.7.0.4
WARNING: multiple messages have this Message-ID (diff)
From: "Patil, Rachna" <rachna-l0cyMroinI0@public.gmane.org> To: linux-doc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-input-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-iio-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: Rob Landley <rob-VoJi6FS/r0vR7s880joybQ@public.gmane.org>, Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org>, Rob Herring <rob.herring-bsGFqQB8/DxBDgjK7y7TUQ@public.gmane.org>, Samuel Ortiz <sameo-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>, Dmitry Torokhov <dmitry.torokhov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>, Dmitry Torokhov <dtor-JGs/UdohzUI@public.gmane.org>, Jonathan Cameron <jic23-KWPb1pKIrIJaa/9Udqfwiw@public.gmane.org>, "Patil, Rachna" <rachna-l0cyMroinI0@public.gmane.org> Subject: [PATCH RESEND 5/7] MFD: ti_am335x_tscadc: Add DT support Date: Wed, 7 Nov 2012 12:22:02 +0530 [thread overview] Message-ID: <1352271124-5513-6-git-send-email-rachna@ti.com> (raw) In-Reply-To: <1352271124-5513-1-git-send-email-rachna-l0cyMroinI0@public.gmane.org> Make changes to add DT support in the MFD core driver. Signed-off-by: Patil, Rachna <rachna-l0cyMroinI0@public.gmane.org> --- drivers/mfd/ti_am335x_tscadc.c | 28 +++++++++++++++++++++++----- 1 files changed, 23 insertions(+), 5 deletions(-) diff --git a/drivers/mfd/ti_am335x_tscadc.c b/drivers/mfd/ti_am335x_tscadc.c index 8ca3bf0..07b7788 100644 --- a/drivers/mfd/ti_am335x_tscadc.c +++ b/drivers/mfd/ti_am335x_tscadc.c @@ -22,6 +22,8 @@ #include <linux/regmap.h> #include <linux/mfd/core.h> #include <linux/pm_runtime.h> +#include <linux/of.h> +#include <linux/of_device.h> #include <linux/mfd/ti_am335x_tscadc.h> #include <linux/input/ti_am335x_tsc.h> @@ -64,20 +66,31 @@ static int __devinit ti_tscadc_probe(struct platform_device *pdev) struct resource *res; struct clk *clk; struct mfd_tscadc_board *pdata = pdev->dev.platform_data; + struct device_node *node = pdev->dev.of_node; struct mfd_cell *cell; int err, ctrl; int clk_value, clock_rate; - int tsc_wires, adc_channels = 0, total_channels; + int tsc_wires = 0, adc_channels = 0, total_channels; - if (!pdata) { + if (!pdata && !pdev->dev.of_node) { dev_err(&pdev->dev, "Could not find platform data\n"); return -EINVAL; } - if (pdata->adc_init) - adc_channels = pdata->adc_init->adc_channels; + if (pdev->dev.of_node) { + node = of_find_node_by_name(pdev->dev.of_node, "tsc"); + of_property_read_u32(node, "wires", &tsc_wires); + + node = of_find_node_by_name(pdev->dev.of_node, "adc"); + of_property_read_u32(node, "adc-channels", &adc_channels); + } else { + if (pdata->tsc_init) + tsc_wires = pdata->tsc_init->wires; + + if (pdata->adc_init) + adc_channels = pdata->adc_init->adc_channels; + } - tsc_wires = pdata->tsc_init->wires; total_channels = tsc_wires + adc_channels; if (total_channels > 8) { @@ -256,11 +269,16 @@ static const struct dev_pm_ops tscadc_pm_ops = { #define TSCADC_PM_OPS NULL #endif +static const struct of_device_id ti_tscadc_dt_ids[] = { + { .compatible = "ti,ti-tscadc", }, +}; + static struct platform_driver ti_tscadc_driver = { .driver = { .name = "ti_tscadc", .owner = THIS_MODULE, .pm = TSCADC_PM_OPS, + .of_match_table = of_match_ptr(ti_tscadc_dt_ids), }, .probe = ti_tscadc_probe, .remove = __devexit_p(ti_tscadc_remove), -- 1.7.0.4
next prev parent reply other threads:[~2012-11-07 7:07 UTC|newest] Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-11-07 6:51 [PATCH RESEND 0/7] MFD: ti_am335x_tscadc: DT support and TSC features addition Patil, Rachna 2012-11-07 6:51 ` Patil, Rachna 2012-11-07 6:51 ` [PATCH RESEND 1/7] input: ti_am335x_tsc: Step enable bits made configurable Patil, Rachna 2012-11-07 6:51 ` Patil, Rachna 2012-11-07 6:51 ` [PATCH RESEND 2/7] input: ti_am335x_tsc: Order of TSC wires, " Patil, Rachna 2012-11-07 6:51 ` Patil, Rachna 2012-11-07 6:52 ` [PATCH RESEND 3/7] input: ti_am335x_tsc: Add variance filter Patil, Rachna 2012-11-07 6:52 ` Patil, Rachna 2012-11-21 18:33 ` Dmitry Torokhov 2012-11-27 7:07 ` Patil, Rachna 2012-11-27 7:07 ` Patil, Rachna 2012-11-27 7:07 ` Patil, Rachna 2012-11-07 6:52 ` [PATCH RESEND 4/7] MFD: ti_am335x_tscadc: add device tree binding information Patil, Rachna 2012-11-07 6:52 ` Patil, Rachna 2012-11-07 6:52 ` Patil, Rachna [this message] 2012-11-07 6:52 ` [PATCH RESEND 5/7] MFD: ti_am335x_tscadc: Add DT support Patil, Rachna 2012-11-07 6:52 ` [PATCH RESEND 6/7] input: ti_am335x_tsc: " Patil, Rachna 2012-11-07 6:52 ` Patil, Rachna 2012-11-21 18:32 ` Dmitry Torokhov 2012-11-21 18:32 ` Dmitry Torokhov 2012-11-27 7:11 ` Patil, Rachna 2012-11-27 7:11 ` Patil, Rachna 2012-11-27 7:11 ` Patil, Rachna 2012-11-07 6:52 ` [PATCH RESEND 7/7] IIO: ti_am335x_adc: " Patil, Rachna 2012-11-07 6:52 ` Patil, Rachna 2012-11-16 10:33 ` [PATCH RESEND 0/7] MFD: ti_am335x_tscadc: DT support and TSC features addition Patil, Rachna 2012-11-16 10:33 ` Patil, Rachna 2012-11-21 17:00 ` Samuel Ortiz 2012-11-21 17:00 ` Samuel Ortiz 2012-11-21 17:00 ` Samuel Ortiz 2012-11-27 7:14 ` Patil, Rachna 2012-11-27 7:14 ` Patil, Rachna 2012-11-27 7:14 ` Patil, Rachna
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1352271124-5513-6-git-send-email-rachna@ti.com \ --to=rachna@ti.com \ --cc=devicetree-discuss@lists.ozlabs.org \ --cc=dmitry.torokhov@gmail.com \ --cc=dtor@mail.ru \ --cc=grant.likely@secretlab.ca \ --cc=jic23@cam.ac.uk \ --cc=linux-doc@vger.kernel.org \ --cc=linux-iio@vger.kernel.org \ --cc=linux-input@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=rob.herring@calxeda.com \ --cc=rob@landley.net \ --cc=sameo@linux.intel.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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.