UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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()
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJTKS+NAAoJEJzN3yze689T5loQAKsWrOEe71CbgfDMYKz8LKnR
 JI5jBJNXf5adotgDU5LD1IRwpysaBPotoIZSK6lQfmYF8/baNgV6vZH+eiGTDhQZ
 hjR2Pt9dqhv1IijIxeU4SujAdvGT97modvHLMjhA0+3jRWWDCRJni9ppHMwBcrLx
 PLR28jMi24NmmRlKFoHzn8THd/ByWXtZI/Q7FEny8EsrjPEYIkN1zGWw3CHZ/eZI
 uNnb3P0sgCYLAGJIFP88OEGYLwPe6ILGS3NIPjvTmMu7XzDKhg+F+qdYTs68yqEd
 p0Y7cw60MJtGgj9ZYHVdLjyEdtMX+MAAU0VSUwMpf3lvtXqFpX4hV0RNpdiuuu9x
 3Pxh5dcLy52t0Zun4+eC1OZq7j7c/Prkp/t0y/dkxmjWCAn1fkl3wdu5K67jyR6J
 gINvGFevapusHOT4rUWpPOGU9k8l5ZtAM51NSqJc8GIt7iFMgynu+NEsgYXAm0sH
 sgDLLWRdP1YFvLV8F6btAyGDJV32QbX3AIDFsVKzTT2wSOGP8VeY3WCozc/04R8R
 A0C6UfZK4ypBm1LR6ICg17Ujk823lSiK8I9vJPOM5PGOjcnasBODdXBlUR936O3P
 9Mg7pHX88da/mxOBVZfmgYJKX5FxYFemL8ISTyqGkSaLqXPqTZUKHmybIu3YJ+Cj
 PV4nmaXp6cdyc8aAYoYU
 =ecKh
 -----END PGP SIGNATURE-----

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()
This commit is contained in:
Greg Kroah-Hartman 2014-03-19 10:05:27 -07:00
parent a05f8f86e4 1ad94ffef2
commit 1b3fa22e02
9 changed files with 57 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/extcon/Kconfig
View File

@ -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

2
drivers/extcon/Makefile
View File

@ -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

42
drivers/extcon/extcon-class.c
View File

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

4
drivers/extcon/extcon-gpio.c
View File

@ -176,9 +176,7 @@ static int gpio_extcon_resume(struct device *dev)
}
#endif
static const struct dev_pm_ops gpio_extcon_pm_ops = {
SET_SYSTEM_SLEEP_PM_OPS(NULL, gpio_extcon_resume)
};
static SIMPLE_DEV_PM_OPS(gpio_extcon_pm_ops, NULL, gpio_extcon_resume);
static struct platform_driver gpio_extcon_driver = {
.probe = gpio_extcon_probe,

5
drivers/extcon/extcon-palmas.c
View File

@ -271,10 +271,7 @@ static int palmas_usb_resume(struct device *dev)
};
#endif
static const struct dev_pm_ops palmas_pm_ops = {
SET_SYSTEM_SLEEP_PM_OPS(palmas_usb_suspend,
palmas_usb_resume)
};
static SIMPLE_DEV_PM_OPS(palmas_pm_ops, palmas_usb_suspend, palmas_usb_resume);
static struct of_device_id of_palmas_match_tbl[] = {
{ .compatible = "ti,palmas-usb", },

64
drivers/extcon/of_extcon.c
View File

@ -1,64 +0,0 @@
/*
* 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;
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);

3
drivers/usb/dwc3/dwc3-omap.c
View File

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

12
include/linux/extcon.h
View File

@ -240,6 +240,12 @@ extern int extcon_register_notifier(struct extcon_dev *edev,
struct notifier_block *nb);
extern int extcon_unregister_notifier(struct extcon_dev *edev,
struct notifier_block *nb);
/*
* Following API get the extcon device from devicetree.
* This function use phandle of devicetree to get extcon device directly.
*/
extern struct extcon_dev *extcon_get_edev_by_phandle(struct device *dev, int index);
#else /* CONFIG_EXTCON */
static inline int extcon_dev_register(struct extcon_dev *edev)
{
@ -324,5 +330,11 @@ static inline int extcon_unregister_interest(struct extcon_specific_cable_nb
{
return 0;
}
static inline struct extcon_dev *extcon_get_edev_by_phandle(struct device *dev,
int index)
{
return ERR_PTR(-ENODEV);
}
#endif /* CONFIG_EXTCON */
#endif /* __LINUX_EXTCON_H__ */

31
include/linux/extcon/of_extcon.h
View File

@ -1,31 +0,0 @@
/*
* 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.
*/
#ifndef __LINUX_OF_EXTCON_H
#define __LINUX_OF_EXTCON_H
#include <linux/err.h>
#if IS_ENABLED(CONFIG_OF_EXTCON)
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 ERR_PTR(-ENOSYS);
}
#endif /* CONFIG_OF_EXTCON */
#endif /* __LINUX_OF_EXTCON_H */