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

Commit 1b3fa22e authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'extcon-next-for-3.15' of... 

Merge tag 'extcon-next-for-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into char-misc-next

Chanwoo writes:

Update extcon for v3.15

This patchset fix minor issue.

The extcon-palmas/gpio use SIMPLE_DEV_PM_OPS macro instead of legacy method.
OF helper function of extcon move in extcon core to remove separate of_extcon.c
and change the name of OF helper function as following because previous function
name is complicated and ambiguous naming.
- of_extcon_get_extcon_dev() -> extcon_get_edev_by_phandle()
parents a05f8f86 1ad94ffe

drivers/extcon/Kconfig

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




comment "Extcon Device Drivers"

comment "Extcon Device Drivers"





config OF_EXTCON

	def_tristate y

	depends on OF



config EXTCON_GPIO

config EXTCON_GPIO

	tristate "GPIO extcon support"

	tristate "GPIO extcon support"

	depends on GPIOLIB

	depends on GPIOLIB

drivers/extcon/Makefile

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

# Makefile for external connector class (extcon) devices

#

#





obj-$(CONFIG_OF_EXTCON)		+= of_extcon.o



obj-$(CONFIG_EXTCON)		+= extcon-class.o

obj-$(CONFIG_EXTCON)		+= extcon-class.o

obj-$(CONFIG_EXTCON_GPIO)	+= extcon-gpio.o

obj-$(CONFIG_EXTCON_GPIO)	+= extcon-gpio.o

obj-$(CONFIG_EXTCON_ADC_JACK)	+= extcon-adc-jack.o

obj-$(CONFIG_EXTCON_ADC_JACK)	+= extcon-adc-jack.o

drivers/extcon/extcon-class.c

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

#include <linux/extcon.h>

#include <linux/slab.h>

#include <linux/slab.h>

#include <linux/sysfs.h>

#include <linux/sysfs.h>

#include <linux/of.h>





/*

/*

 * extcon_cable_name suggests the standard cable names for commonly used

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

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)

static int __init extcon_class_init(void)

{

{

	return create_extcon_class();

	return create_extcon_class();

drivers/extcon/extcon-gpio.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -176,9 +176,7 @@ static int gpio_extcon_resume(struct device *dev) 
}

}

#endif

#endif





static const struct dev_pm_ops gpio_extcon_pm_ops = {

static SIMPLE_DEV_PM_OPS(gpio_extcon_pm_ops, NULL, gpio_extcon_resume);

	SET_SYSTEM_SLEEP_PM_OPS(NULL, gpio_extcon_resume)

};





static struct platform_driver gpio_extcon_driver = {

static struct platform_driver gpio_extcon_driver = {

	.probe		= gpio_extcon_probe,

	.probe		= gpio_extcon_probe,

drivers/extcon/extcon-palmas.c

+1 −4
Original line number Original line Diff line number Diff line
@@ -271,10 +271,7 @@ static int palmas_usb_resume(struct device *dev) 
};

};

#endif

#endif





static const struct dev_pm_ops palmas_pm_ops = {

static SIMPLE_DEV_PM_OPS(palmas_pm_ops, palmas_usb_suspend, palmas_usb_resume);

	SET_SYSTEM_SLEEP_PM_OPS(palmas_usb_suspend,

				palmas_usb_resume)

};





static struct of_device_id of_palmas_match_tbl[] = {

static struct of_device_id of_palmas_match_tbl[] = {

	{ .compatible = "ti,palmas-usb", },

	{ .compatible = "ti,palmas-usb", },