Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ad94ffe authored by Chanwoo Choi's avatar Chanwoo Choi
Browse files

extcon: Move OF helper function to extcon core and change function name 



This patch move simply OF helper function to extcon core and change function
name as following:
- of_extcon_get_extcon_dev() -> extcon_get_edev_by_phandle()

Signed-off-by: default avatarChanwoo Choi <cw00.choi@samsung.com>
Acked-by: default avatarFelipe Balbi <balbi@ti.com>
parent ca488241

drivers/extcon/Kconfig

+0 −4
Original line number Diff line number Diff line
@@ -14,10 +14,6 @@ if EXTCON 


comment "Extcon Device Drivers"



config OF_EXTCON

	def_tristate y

	depends on OF



config EXTCON_GPIO

	tristate "GPIO extcon support"

	depends on GPIOLIB

drivers/extcon/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -2,8 +2,6 @@ 
# Makefile for external connector class (extcon) devices

#



obj-$(CONFIG_OF_EXTCON)		+= 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

drivers/extcon/extcon-class.c

+42 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include <linux/extcon.h>

#include <linux/slab.h>

#include <linux/sysfs.h>

#include <linux/of.h>



/*

 * extcon_cable_name suggests the standard cable names for commonly used
@@ -818,6 +819,47 @@ void extcon_dev_unregister(struct extcon_dev *edev) 
}

EXPORT_SYMBOL_GPL(extcon_dev_unregister);



#ifdef CONFIG_OF

/*

 * extcon_get_edev_by_phandle - Get the extcon device from devicetree

 * @dev - instance to the given device

 * @index - index into list of extcon_dev

 *

 * return the instance of extcon device

 */

struct extcon_dev *extcon_get_edev_by_phandle(struct device *dev, int index)

{

	struct device_node *node;

	struct extcon_dev *edev;



	if (!dev->of_node) {

		dev_err(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_err(dev, "failed to get phandle in %s node\n",

			dev->of_node->full_name);

		return ERR_PTR(-ENODEV);

	}



	edev = extcon_get_extcon_dev(node->name);

	if (!edev) {

		dev_err(dev, "unable to get extcon device : %s\n", node->name);

		return ERR_PTR(-ENODEV);

	}



	return edev;

}

#else

struct extcon_dev *extcon_get_edev_by_phandle(struct device *dev, int index)

{

	return ERR_PTR(-ENOSYS);

}

#endif /* CONFIG_OF */

EXPORT_SYMBOL_GPL(extcon_get_edev_by_phandle);



static int __init extcon_class_init(void)

{

	return create_extcon_class();

drivers/extcon/of_extcon.c

deleted100644 → 0
+0 −56
Original line number Diff line number Diff line 
/*

 * OF helpers for External connector (extcon) framework

 *

 * Copyright (C) 2013 Texas Instruments, Inc.

 * Kishon Vijay Abraham I <kishon@ti.com>

 *

 * Copyright (C) 2013 Samsung Electronics

 * Chanwoo Choi <cw00.choi@samsung.com>

 *

 * 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/err.h>

#include <linux/extcon.h>

#include <linux/of.h>

#include <linux/of_platform.h>

#include <linux/extcon/of_extcon.h>



/*

 * of_extcon_get_extcon_dev - Get the name of extcon device from devicetree

 * @dev - instance to the given device

 * @index - index into list of extcon_dev

 *

 * return the instance of extcon device

 */

struct extcon_dev *of_extcon_get_extcon_dev(struct device *dev, int index)

{

	struct device_node *node;

	struct extcon_dev *edev;



	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);

	}



	edev = extcon_get_extcon_dev(node->name);

	if (!edev) {

		dev_dbg(dev, "unable to get extcon device : %s\n", node->name);

		return ERR_PTR(-ENODEV);

	}



	return edev;

}

EXPORT_SYMBOL_GPL(of_extcon_get_extcon_dev);

drivers/usb/dwc3/dwc3-omap.c

+1 −2
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 
#include <linux/of.h>

#include <linux/of_platform.h>

#include <linux/extcon.h>

#include <linux/extcon/of_extcon.h>

#include <linux/regulator/consumer.h>



#include <linux/usb/otg.h>
@@ -522,7 +521,7 @@ static int dwc3_omap_probe(struct platform_device *pdev) 
	dwc3_omap_enable_irqs(omap);



	if (of_property_read_bool(node, "extcon")) {

		edev = of_extcon_get_extcon_dev(dev, 0);

		edev = extcon_get_edev_by_phandle(dev, 0);

		if (IS_ERR(edev)) {

			dev_vdbg(dev, "couldn't get extcon device\n");

			ret = -EPROBE_DEFER;