summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorKishon Vijay Abraham I <kishon@ti.com>2016-09-15 15:46:11 +0530
committerKishon Vijay Abraham I <kishon@ti.com>2016-09-15 16:45:20 +0530
commitcb9850d092f7d2c86662d71fbfe10685cbddda21 (patch)
tree77023cbc002680edbe3738f87dc9be413a8b8e68 /include/linux
parent81522637485dd6ec9de4279c9714d58f884b6091 (diff)
parentb78ea84a7d45b9e5ad2eee429a2140065a39d755 (diff)
Merge branch 'next' into resolution
Conflicts: drivers/extcon/extcon-adc-jack.c drivers/extcon/extcon-arizona.c drivers/extcon/extcon-gpio.c include/linux/extcon.h
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/extcon.h30
-rw-r--r--include/linux/phy/phy.h3
2 files changed, 32 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)
{
diff --git a/include/linux/phy/phy.h b/include/linux/phy/phy.h
index f08b67238b58..ee1bed7dbfc6 100644
--- a/include/linux/phy/phy.h
+++ b/include/linux/phy/phy.h
@@ -36,6 +36,7 @@ enum phy_mode {
* @power_on: powering on the phy
* @power_off: powering off the phy
* @set_mode: set the mode of the phy
+ * @reset: resetting the phy
* @owner: the module owner containing the ops
*/
struct phy_ops {
@@ -44,6 +45,7 @@ struct phy_ops {
int (*power_on)(struct phy *phy);
int (*power_off)(struct phy *phy);
int (*set_mode)(struct phy *phy, enum phy_mode mode);
+ int (*reset)(struct phy *phy);
struct module *owner;
};
@@ -136,6 +138,7 @@ int phy_exit(struct phy *phy);
int phy_power_on(struct phy *phy);
int phy_power_off(struct phy *phy);
int phy_set_mode(struct phy *phy, enum phy_mode mode);
+int phy_reset(struct phy *phy);
static inline int phy_get_bus_width(struct phy *phy)
{
return phy->attrs.bus_width;