| Message ID | 95b67a12e2b6ea6a9c7e17b0069ec7c9fc6f719c.1320173573.git.marvin24@gmx.de |
|---|---|
| State | Awaiting Upstream, archived |
| Headers | show |
Marc Dietrich wrote at Tuesday, November 01, 2011 2:37 PM: > This adds device tree support to the nvec driver. By using this method > it is no longer necessary to specify platform data through a board > file. Acked-by: Stephen Warren <swarren@nvidia.com>
On Tue, Nov 01, 2011 at 03:36:31PM -0700, Stephen Warren wrote: > Marc Dietrich wrote at Tuesday, November 01, 2011 2:37 PM: > > This adds device tree support to the nvec driver. By using this method > > it is no longer necessary to specify platform data through a board > > file. > > Acked-by: Stephen Warren <swarren@nvidia.com> Acked-by: Olof Johansson <olof@lixom.net> Greg, this one can go through the staging tree. We'll pick up the other pieces of the series through the tegra soc tree. -Olof -- To unsubscribe from this list: send the line "unsubscribe linux-tegra" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Nov 09, 2011 at 11:11:44AM -0800, Olof Johansson wrote: > On Tue, Nov 01, 2011 at 03:36:31PM -0700, Stephen Warren wrote: > > Marc Dietrich wrote at Tuesday, November 01, 2011 2:37 PM: > > > This adds device tree support to the nvec driver. By using this method > > > it is no longer necessary to specify platform data through a board > > > file. > > > > Acked-by: Stephen Warren <swarren@nvidia.com> > > Acked-by: Olof Johansson <olof@lixom.net> > > Greg, this one can go through the staging tree. We'll pick up the other pieces > of the series through the tegra soc tree. Ok, will do. greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-tegra" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Am Mittwoch, 9. November 2011, 11:57:55 schrieb Greg KH: > On Wed, Nov 09, 2011 at 11:11:44AM -0800, Olof Johansson wrote: > > On Tue, Nov 01, 2011 at 03:36:31PM -0700, Stephen Warren wrote: > > > Marc Dietrich wrote at Tuesday, November 01, 2011 2:37 PM: > > > > This adds device tree support to the nvec driver. By using this method > > > > it is no longer necessary to specify platform data through a board > > > > file. > > > > > > Acked-by: Stephen Warren <swarren@nvidia.com> > > > > Acked-by: Olof Johansson <olof@lixom.net> > > > > Greg, this one can go through the staging tree. We'll pick up the other pieces > > of the series through the tegra soc tree. > > Ok, will do. > > greg k-h Ping. Greg, it seems that this patch is still not in staging. Please apply http://patchwork.ozlabs.org/patch/123140/ Thanks Marc -- To unsubscribe from this list: send the line "unsubscribe linux-tegra" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/Documentation/devicetree/bindings/nvec/nvec_nvidia.txt b/Documentation/devicetree/bindings/nvec/nvec_nvidia.txt new file mode 100644 index 0000000..5aeee53 --- /dev/null +++ b/Documentation/devicetree/bindings/nvec/nvec_nvidia.txt @@ -0,0 +1,9 @@ +NVIDIA compliant embedded controller + +Required properties: +- compatible : should be "nvidia,nvec". +- reg : the iomem of the i2c slave controller +- interrupts : the interrupt line of the i2c slave controller +- clock-frequency : the frequency of the i2c bus +- gpios : the gpio used for ec request +- slave-addr: the i2c address of the slave controller diff --git a/drivers/staging/nvec/nvec.c b/drivers/staging/nvec/nvec.c index e06b867..fafdfa2 100644 --- a/drivers/staging/nvec/nvec.c +++ b/drivers/staging/nvec/nvec.c @@ -27,6 +27,8 @@ #include <linux/interrupt.h> #include <linux/io.h> #include <linux/irq.h> +#include <linux/of.h> +#include <linux/of_gpio.h> #include <linux/list.h> #include <linux/mfd/core.h> #include <linux/mutex.h> @@ -727,8 +729,24 @@ static int __devinit tegra_nvec_probe(struct platform_device *pdev) } platform_set_drvdata(pdev, nvec); nvec->dev = &pdev->dev; - nvec->gpio = pdata->gpio; - nvec->i2c_addr = pdata->i2c_addr; + + if (pdata) { + nvec->gpio = pdata->gpio; + nvec->i2c_addr = pdata->i2c_addr; + } else if (nvec->dev->of_node) { + nvec->gpio = of_get_named_gpio(nvec->dev->of_node, "request-gpios", 0); + if (nvec->gpio < 0) { + dev_err(&pdev->dev, "no gpio specified"); + goto failed; + } + if (of_property_read_u32(nvec->dev->of_node, "slave-addr", &nvec->i2c_addr)) { + dev_err(&pdev->dev, "no i2c address specified"); + goto failed; + } + } else { + dev_err(&pdev->dev, "no platform data\n"); + goto failed; + } res = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (!res) { @@ -893,6 +911,13 @@ static int tegra_nvec_resume(struct platform_device *pdev) #define tegra_nvec_resume NULL #endif +/* Match table for of_platform binding */ +static const struct of_device_id nvidia_nvec_of_match[] __devinitconst = { + { .compatible = "nvidia,nvec", }, + {}, +}; +MODULE_DEVICE_TABLE(of, nvidia_nvec_of_match); + static struct platform_driver nvec_device_driver = { .probe = tegra_nvec_probe, .remove = __devexit_p(tegra_nvec_remove), @@ -901,6 +926,7 @@ static struct platform_driver nvec_device_driver = { .driver = { .name = "nvec", .owner = THIS_MODULE, + .of_match_table = nvidia_nvec_of_match, } };
This adds device tree support to the nvec driver. By using this method it is no longer necessary to specify platform data through a board file. Cc: devel@driverdev.osuosl.org Cc: Greg KH <gregkh@suse.de> Cc: Julian Andres Klode <jak@jak-linux.org> Cc: Grant Likely <grant.likely@secretlab.ca> Signed-off-by: Marc Dietrich <marvin24@gmx.de> --- .../devicetree/bindings/nvec/nvec_nvidia.txt | 9 ++++++ drivers/staging/nvec/nvec.c | 30 ++++++++++++++++++- 2 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 Documentation/devicetree/bindings/nvec/nvec_nvidia.txt