diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-09-15 15:59:30 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-09-15 15:59:30 +0200 |
| commit | 48ab6f5360cf1a251ce71a193d1c2c74dc5c13f6 (patch) | |
| tree | f08f28657668a89df46cf9c474a44af03f9f23d0 /include/linux/extcon.h | |
| parent | MAINTAINERS: add tree entry for USB Serial (diff) | |
| parent | Merge branch 'next' into resolution (diff) | |
| download | wireguard-linux-48ab6f5360cf1a251ce71a193d1c2c74dc5c13f6.tar.xz wireguard-linux-48ab6f5360cf1a251ce71a193d1c2c74dc5c13f6.zip | |
Merge tag 'phy-for-4.9-updated_v1' of git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy into usb-testing
Kishon writes:
phy: for 4.9 (with extcon merge resolution)
updated tag for 4.9 based on usb-next along with extcon merge
resolution
phy updates includes:
*) phy driver for USB 3.0 PHY on Northstar
*) phy driver for Rockchip usb2phy
*) phy driver for the Rockchip SoC internal PCIe PHY
*) phy driver for USB Type-C PHY on rk3399
*) phy_reset() API
*) support for Allwinner A64 usb phy, usb2 phy in r8a7796
*) Fixes in twl4030-usb, tegra phy, sun4i-usb phy, da8xx-usb phy
and omap-usb2 phy
*) other misc cleanups
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Diffstat (limited to 'include/linux/extcon.h')
| -rw-r--r-- | include/linux/extcon.h | 30 |
1 files changed, 29 insertions, 1 deletions
diff --git a/include/linux/extcon.h b/include/linux/extcon.h index 5c35f9d1822c..2b9f15156115 100644 --- a/include/linux/extcon.h +++ b/include/linux/extcon.h @@ -249,7 +249,6 @@ extern int extcon_set_state(struct extcon_dev *edev, unsigned int id, bool cable_state); extern int extcon_set_state_sync(struct extcon_dev *edev, unsigned int id, bool cable_state); - /* * Synchronize the state and property data for a specific external connector. */ @@ -359,10 +358,27 @@ static inline int extcon_set_state_sync(struct extcon_dev *edev, unsigned int id } static inline int extcon_sync(struct extcon_dev *edev, unsigned int id) +<<<<<<< HEAD +======= +{ + return 0; +} + +static inline int extcon_get_property(struct extcon_dev *edev, unsigned int id, + unsigned int prop, + union extcon_property_value *prop_val) +{ + return 0; +} +static inline int extcon_set_property(struct extcon_dev *edev, unsigned int id, + unsigned int prop, + union extcon_property_value prop_val) +>>>>>>> next { return 0; } +<<<<<<< HEAD static inline int extcon_get_property(struct extcon_dev *edev, unsigned int id, unsigned int prop, union extcon_property_value *prop_val) @@ -371,24 +387,36 @@ static inline int extcon_get_property(struct extcon_dev *edev, unsigned int id, } static inline int extcon_set_property(struct extcon_dev *edev, unsigned int id, unsigned int prop, +======= +static inline int extcon_set_property_sync(struct extcon_dev *edev, + unsigned int id, unsigned int prop, +>>>>>>> next union extcon_property_value prop_val) { return 0; } +<<<<<<< HEAD static inline int extcon_set_property_sync(struct extcon_dev *edev, unsigned int id, unsigned int prop, union extcon_property_value prop_val) +======= +static inline int extcon_get_property_capability(struct extcon_dev *edev, + unsigned int id, unsigned int prop) +>>>>>>> next { return 0; } +<<<<<<< HEAD static inline int extcon_get_property_capability(struct extcon_dev *edev, unsigned int id, unsigned int prop) { return 0; } +======= +>>>>>>> next static inline int extcon_set_property_capability(struct extcon_dev *edev, unsigned int id, unsigned int prop) { |