diff options
Diffstat (limited to 'include/linux/extcon.h')
| -rw-r--r-- | include/linux/extcon.h | 43 |
1 files changed, 41 insertions, 2 deletions
diff --git a/include/linux/extcon.h b/include/linux/extcon.h index b34d1ae9011f..2b9f15156115 100644 --- a/include/linux/extcon.h +++ b/include/linux/extcon.h @@ -133,9 +133,20 @@ #define EXTCON_PROP_JACK_MAX 100 #define EXTCON_PROP_JACK_CNT (EXTCON_PROP_JACK_MAX - EXTCON_PROP_JACK_MIN + 1) +/* + * Properties of EXTCON_TYPE_DISP. + * + * - EXTCON_PROP_DISP_HPD (Hot Plug Detect) + * @type: integer (intval) + * @value: 0 (no hpd) or 1 (hpd) + * @default: 0 (no hpd) + * + */ +#define EXTCON_PROP_DISP_HPD 150 + /* Properties of EXTCON_TYPE_DISP. */ #define EXTCON_PROP_DISP_MIN 150 -#define EXTCON_PROP_DISP_MAX 150 +#define EXTCON_PROP_DISP_MAX 151 #define EXTCON_PROP_DISP_CNT (EXTCON_PROP_DISP_MAX - EXTCON_PROP_DISP_MIN + 1) /* @@ -238,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. */ @@ -348,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) @@ -360,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) { |