Update extcon for 4.8
Detailed description for patchset: 1. Update the extcon-gpio.c driver - Use PM wakeirq APIs and support to check the state of external connector when wake-up from suspend state if the interrupt of external connector is not used as wakeup source. - Support for ACPI gpio interface 2. Remove deprecated extcon APIs using the legacy cable name - The extcon framework handle the external connector only by unique id instead of legacy cable name to prevent the problem. - Removed functions : extcon_get_cable_state() : extcon_set_cable_state() : extcon_register_interest() : extcon_unregister_interest() - It has the dependency on the axp288_charger.c driver. So, this pull request includes the 'ib-extcon-powersupply-4.8' immutable branch to protect the merge conflict. 3. Support the resource-managed function for extcon_register_notifier - Add the devm_extcon_register/unregister_notifier() funticon to handle the resource automatically by resource managed functions and split out the resource-managed function from extcon core to seprate file(devres.c). 4. Supprot the suspend/resume for extcon-adc-jack.c driver - Add the support the suspend/resume function to use extcon-adc-jack.c as wakeup source. 5. Fix the minor issue - Check the return value of find_cable_index_by_id() - Move the struct extcon_cable to extcon core from header file because it should be only handled on extcon core. - Add the missing of_node_put() after calling of_parse_phandle() to decrement the reference count. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJXe5H/AAoJEJzN3yze689TWO8QAKjVWz/xVSF1Dzjl5j4qwB4p 9yiX0kgkZc1IDGxVECsGjFWcAihEJ/0TZyswUYUt5Cyo8LBLUvTnNp40kWug2ozs KXruLIps344hd/YGH7JWptWubOUsxfbkrgI6YaI+r7OZih8bbnz2/p8G0cfl1vYf MC9zs1v31Fowk4A6P16fo4HTKPp1+LCZPLhVApxnB6A2chz4I5jwiI/qvjS6amRd gbM1cco5DveDkbBJKFs7GS12RcN2u+AcUWld65qCxltODFZkSTGV+AwRN78EnS4S RQEH8lWHXm6qDSiYswsf7s8w4SVBBZIV68GykI3MBzHR+vbH1j/5F+wPXcBQJyPy +nFFfd+/yXC6Nq5tr10UlKP4iFd5aBGkPYVWwjCeobCZvES3eNzDCvUiAP21pa0R KT2DpRHsx0mSNyQmk9lRvOW+dkYc6JichO7Seb7rrxgYNBwE+hHu0BoJRsKQzLQ6 e2DnoWeQ2H3XfaV979AUugyVzZe4XcL4M3YdSoMr9yGCQkCunFmN9BBstqK3H1XF uU8VlyaLhS3VrPewIAv903iG1H4gg2Cf1aDBFHSvkmOpNGOj5utDBhnSrEmJKKwI LcfM1I6BQWmZxcEQzHKL2Ubx4be4+JDM7w4HP78TqzXwo/qhCZGXRxfHCgycy2TM iGEzj/IEPlSWBzWJHZdg =YnJ3 -----END PGP SIGNATURE----- Merge tag 'extcon-next-for-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into char-misc-testing Chanwoo writes: Update extcot://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git tags/extcon-next-for-4.8 n for 4.8 Detailed description for patchset: 1. Update the extcon-gpio.c driver - Use PM wakeirq APIs and support to check the state of external connector when wake-up from suspend state if the interrupt of external connector is not used as wakeup source. - Support for ACPI gpio interface 2. Remove deprecated extcon APIs using the legacy cable name - The extcon framework handle the external connector only by unique id instead of legacy cable name to prevent the problem. - Removed functions : extcon_get_cable_state() : extcon_set_cable_state() : extcon_register_interest() : extcon_unregister_interest() - It has the dependency on the axp288_charger.c driver. So, this pull request includes the 'ib-extcon-powersupply-4.8' immutable branch to protect the merge conflict. 3. Support the resource-managed function for extcon_register_notifier - Add the devm_extcon_register/unregister_notifier() funticon to handle the resource automatically by resource managed functions and split out the resource-managed function from extcon core to seprate file(devres.c). 4. Supprot the suspend/resume for extcon-adc-jack.c driver - Add the support the suspend/resume function to use extcon-adc-jack.c as wakeup source. 5. Fix the minor issue - Check the return value of find_cable_index_by_id() - Move the struct extcon_cable to extcon core from header file because it should be only handled on extcon core. - Add the missing of_node_put() after calling of_parse_phandle() to decrement the reference count.
This commit is contained in:
Greg Kroah-Hartman
commit
7f96a82fde
9 changed files with 416 additions and 410 deletions
|
|
@ -126,42 +126,6 @@ struct extcon_dev {
|
|||
struct device_attribute *d_attrs_muex;
|
||||
};
|
||||
|
||||
/**
|
||||
* struct extcon_cable - An internal data for each cable of extcon device.
|
||||
* @edev: The extcon device
|
||||
* @cable_index: Index of this cable in the edev
|
||||
* @attr_g: Attribute group for the cable
|
||||
* @attr_name: "name" sysfs entry
|
||||
* @attr_state: "state" sysfs entry
|
||||
* @attrs: Array pointing to attr_name and attr_state for attr_g
|
||||
*/
|
||||
struct extcon_cable {
|
||||
struct extcon_dev *edev;
|
||||
int cable_index;
|
||||
|
||||
struct attribute_group attr_g;
|
||||
struct device_attribute attr_name;
|
||||
struct device_attribute attr_state;
|
||||
|
||||
struct attribute *attrs[3]; /* to be fed to attr_g.attrs */
|
||||
};
|
||||
|
||||
/**
|
||||
* struct extcon_specific_cable_nb - An internal data for
|
||||
* extcon_register_interest().
|
||||
* @user_nb: user provided notifier block for events from
|
||||
* a specific cable.
|
||||
* @cable_index: the target cable.
|
||||
* @edev: the target extcon device.
|
||||
* @previous_value: the saved previous event value.
|
||||
*/
|
||||
struct extcon_specific_cable_nb {
|
||||
struct notifier_block *user_nb;
|
||||
int cable_index;
|
||||
struct extcon_dev *edev;
|
||||
unsigned long previous_value;
|
||||
};
|
||||
|
||||
#if IS_ENABLED(CONFIG_EXTCON)
|
||||
|
||||
/*
|
||||
|
|
@ -201,29 +165,12 @@ extern int extcon_update_state(struct extcon_dev *edev, u32 mask, u32 state);
|
|||
|
||||
/*
|
||||
* get/set_cable_state access each bit of the 32b encoded state value.
|
||||
* They are used to access the status of each cable based on the cable_name.
|
||||
* They are used to access the status of each cable based on the cable id.
|
||||
*/
|
||||
extern int extcon_get_cable_state_(struct extcon_dev *edev, unsigned int id);
|
||||
extern int extcon_set_cable_state_(struct extcon_dev *edev, unsigned int id,
|
||||
bool cable_state);
|
||||
|
||||
extern int extcon_get_cable_state(struct extcon_dev *edev,
|
||||
const char *cable_name);
|
||||
extern int extcon_set_cable_state(struct extcon_dev *edev,
|
||||
const char *cable_name, bool cable_state);
|
||||
|
||||
/*
|
||||
* Following APIs are for notifiees (those who want to be notified)
|
||||
* to register a callback for events from a specific cable of the extcon.
|
||||
* Notifiees are the connected device drivers wanting to get notified by
|
||||
* a specific external port of a connection device.
|
||||
*/
|
||||
extern int extcon_register_interest(struct extcon_specific_cable_nb *obj,
|
||||
const char *extcon_name,
|
||||
const char *cable_name,
|
||||
struct notifier_block *nb);
|
||||
extern int extcon_unregister_interest(struct extcon_specific_cable_nb *nb);
|
||||
|
||||
/*
|
||||
* Following APIs are to monitor every action of a notifier.
|
||||
* Registrar gets notified for every external port of a connection device.
|
||||
|
|
@ -235,6 +182,12 @@ extern int extcon_register_notifier(struct extcon_dev *edev, unsigned int id,
|
|||
struct notifier_block *nb);
|
||||
extern int extcon_unregister_notifier(struct extcon_dev *edev, unsigned int id,
|
||||
struct notifier_block *nb);
|
||||
extern int devm_extcon_register_notifier(struct device *dev,
|
||||
struct extcon_dev *edev, unsigned int id,
|
||||
struct notifier_block *nb);
|
||||
extern void devm_extcon_unregister_notifier(struct device *dev,
|
||||
struct extcon_dev *edev, unsigned int id,
|
||||
struct notifier_block *nb);
|
||||
|
||||
/*
|
||||
* Following API get the extcon device from devicetree.
|
||||
|
|
@ -246,6 +199,7 @@ extern struct extcon_dev *extcon_get_edev_by_phandle(struct device *dev,
|
|||
/* Following API to get information of extcon device */
|
||||
extern const char *extcon_get_edev_name(struct extcon_dev *edev);
|
||||
|
||||
|
||||
#else /* CONFIG_EXTCON */
|
||||
static inline int extcon_dev_register(struct extcon_dev *edev)
|
||||
{
|
||||
|
|
@ -306,18 +260,6 @@ static inline int extcon_set_cable_state_(struct extcon_dev *edev,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static inline int extcon_get_cable_state(struct extcon_dev *edev,
|
||||
const char *cable_name)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline int extcon_set_cable_state(struct extcon_dev *edev,
|
||||
const char *cable_name, int state)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline struct extcon_dev *extcon_get_extcon_dev(const char *extcon_name)
|
||||
{
|
||||
return NULL;
|
||||
|
|
@ -337,19 +279,16 @@ static inline int extcon_unregister_notifier(struct extcon_dev *edev,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static inline int extcon_register_interest(struct extcon_specific_cable_nb *obj,
|
||||
const char *extcon_name,
|
||||
const char *cable_name,
|
||||
struct notifier_block *nb)
|
||||
static inline int devm_extcon_register_notifier(struct device *dev,
|
||||
struct extcon_dev *edev, unsigned int id,
|
||||
struct notifier_block *nb)
|
||||
{
|
||||
return 0;
|
||||
return -ENOSYS;
|
||||
}
|
||||
|
||||
static inline int extcon_unregister_interest(struct extcon_specific_cable_nb
|
||||
*obj)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
static inline void devm_extcon_unregister_notifier(struct device *dev,
|
||||
struct extcon_dev *edev, unsigned int id,
|
||||
struct notifier_block *nb) { }
|
||||
|
||||
static inline struct extcon_dev *extcon_get_edev_by_phandle(struct device *dev,
|
||||
int index)
|
||||
|
|
@ -357,4 +296,28 @@ static inline struct extcon_dev *extcon_get_edev_by_phandle(struct device *dev,
|
|||
return ERR_PTR(-ENODEV);
|
||||
}
|
||||
#endif /* CONFIG_EXTCON */
|
||||
|
||||
/*
|
||||
* Following structure and API are deprecated. EXTCON remains the function
|
||||
* definition to prevent the build break.
|
||||
*/
|
||||
struct extcon_specific_cable_nb {
|
||||
struct notifier_block *user_nb;
|
||||
int cable_index;
|
||||
struct extcon_dev *edev;
|
||||
unsigned long previous_value;
|
||||
};
|
||||
|
||||
static inline int extcon_register_interest(struct extcon_specific_cable_nb *obj,
|
||||
const char *extcon_name, const char *cable_name,
|
||||
struct notifier_block *nb)
|
||||
{
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
static inline int extcon_unregister_interest(struct extcon_specific_cable_nb
|
||||
*obj)
|
||||
{
|
||||
return -EINVAL;
|
||||
}
|
||||
#endif /* __LINUX_EXTCON_H__ */
|
||||
|
|
|
|||
|
|
@ -53,6 +53,7 @@ struct adc_jack_cond {
|
|||
* milli-seconds after the interrupt occurs. You may
|
||||
* describe such delays with @handling_delay_ms, which
|
||||
* is rounded-off by jiffies.
|
||||
* @wakeup_source: flag to wake up the system for extcon events.
|
||||
*/
|
||||
struct adc_jack_pdata {
|
||||
const char *name;
|
||||
|
|
@ -65,6 +66,7 @@ struct adc_jack_pdata {
|
|||
|
||||
unsigned long irq_flags;
|
||||
unsigned long handling_delay_ms; /* in ms */
|
||||
bool wakeup_source;
|
||||
};
|
||||
|
||||
#endif /* _EXTCON_ADC_JACK_H */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue