On Wed, Jun 12, 2013 at 7:09 AM, Chanwoo Choi <cw00.choi@xxxxxxxxxxx> wrote: > From: Kishon Vijay Abraham I <kishon@xxxxxx> > > Added an API of_extcon_get_extcon_dev() to be used by drivers to get > extcon device in the case of dt boot (this can be used instead of > extcon_get_extcon_dev()). > > Signed-off-by: Kishon Vijay Abraham I <kishon@xxxxxx> > Signed-off-by: Chanwoo Choi <cw00.choi@xxxxxxxxxxx> > Signed-off-by: Myungjoo Ham <myungjoo.ham@xxxxxxxxxxx> > --- > drivers/extcon/Makefile | 3 +++ > drivers/extcon/of-extcon.c | 56 ++++++++++++++++++++++++++++++++++++++++ > include/linux/extcon/of-extcon.h | 30 +++++++++++++++++++++ > 3 files changed, 89 insertions(+) > create mode 100644 drivers/extcon/of-extcon.c > create mode 100644 include/linux/extcon/of-extcon.h > > diff --git a/drivers/extcon/Makefile b/drivers/extcon/Makefile > index 540e2c3..39cdf95 100644 > --- a/drivers/extcon/Makefile > +++ b/drivers/extcon/Makefile > @@ -2,9 +2,12 @@ > # Makefile for external connector class (extcon) devices > # > > +obj-$(CONFIG_OF) += of-extcon.o > + > obj-$(CONFIG_EXTCON) += extcon-class.o > obj-$(CONFIG_EXTCON_GPIO) += extcon-gpio.o > obj-$(CONFIG_EXTCON_ADC_JACK) += extcon-adc-jack.o > + > obj-$(CONFIG_EXTCON_MAX77693) += extcon-max77693.o > obj-$(CONFIG_EXTCON_MAX8997) += extcon-max8997.o > obj-$(CONFIG_EXTCON_ARIZONA) += extcon-arizona.o > diff --git a/drivers/extcon/of-extcon.c b/drivers/extcon/of-extcon.c > new file mode 100644 > index 0000000..29f82b4 > --- /dev/null > +++ b/drivers/extcon/of-extcon.c > @@ -0,0 +1,56 @@ > +/* > + * OF helpers for External connector (extcon) framework > + * > + * Copyright (C) 2013 Texas Instruments, Inc. > + * Kishon Vijay Abraham I <kishon@xxxxxx> > + * > + * Copyright (C) 2013 Samsung Electronics > + * Chanwoo Choi <cw00.choi@xxxxxxxxxxx> > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License as published by > + * the Free Software Foundation; either version 2 of the License, or > + * (at your option) any later version. > + */ > + > +#include <linux/module.h> > +#include <linux/slab.h> > +#include <linux/extcon.h> > +#include <linux/of.h> > +#include <linux/of_platform.h> > +#include <linux/extcon/of-extcon.h> > + > +struct extcon_dev *of_extcon_get_extcon_dev(struct device *dev, int index) Can this be simpler name? of_extcon_get_dev or something like that? > +{ > + struct device_node *node; > + struct extcon_dev *edev; > + struct platform_device *extcon_parent_dev; > + > + if (!dev->of_node) { > + dev_dbg(dev, "device does not have a device node entry\n"); > + return ERR_PTR(-EINVAL); > + } > + > + node = of_parse_phandle(dev->of_node, "extcon", index); > + if (!node) { > + dev_dbg(dev, "failed to get phandle in %s node\n", > + dev->of_node->full_name); > + return ERR_PTR(-ENODEV); > + } > + > + extcon_parent_dev = of_find_device_by_node(node); > + if (!extcon_parent_dev) { > + dev_dbg(dev, "unable to find device by node\n"); > + return ERR_PTR(-EPROBE_DEFER); > + } > + > + edev = extcon_get_extcon_dev(dev_name(&extcon_parent_dev->dev)); > + if (!edev) { > + dev_dbg(dev, "unable to get extcon device : %s\n", > + dev_name(&extcon_parent_dev->dev)); > + return ERR_PTR(-ENODEV); > + } > + > + return edev; > +} > +EXPORT_SYMBOL_GPL(of_extcon_get_extcon_dev); > diff --git a/include/linux/extcon/of-extcon.h b/include/linux/extcon/of-extcon.h > new file mode 100644 > index 0000000..77d01ba > --- /dev/null > +++ b/include/linux/extcon/of-extcon.h > @@ -0,0 +1,30 @@ > +/* > + * OF helpers for External connector (extcon) framework > + * > + * Copyright (C) 2013 Texas Instruments, Inc. > + * Kishon Vijay Abraham I <kishon@xxxxxx> > + * > + * Copyright (C) 2013 Samsung Electronics > + * Chanwoo Choi <cw00.choi@xxxxxxxxxxx> > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License as published by > + * the Free Software Foundation; either version 2 of the License, or > + * (at your option) any later version. > + */ > + > +#ifndef __LINUX_OF_EXTCON_H > +#define __LINUX_OF_EXTCON_H > + > +#if defined(CONFIG_OF) > +extern struct extcon_dev > + *of_extcon_get_extcon_dev(struct device *dev, int index); > +#else > +static inline struct extcon_dev > + *of_extcon_get_extcon_dev(struct device *dev, int index); > +{ > + return NULL; > +} > +#endif /* CONFIG_OF */ > + > +#endif /* __LINUX_OF_EXTCON_H */ > -- > 1.8.0 > -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html