These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / include / linux / usb / phy.h

diff --git a/kernel/include/linux/usb/phy.h b/kernel/include/linux/usb/phy.h
index bc91b5d..31a8068 100644 (file)
--- a/kernel/include/linux/usb/phy.h
+++ b/kernel/include/linux/usb/phy.h
@@ -63,7 +63,7 @@ enum usb_otg_state {
 struct usb_phy;
 struct usb_otg;
 
-/* for transceivers connected thru an ULPI interface, the user must
+/* for phys connected thru an ULPI interface, the user must
  * provide access ops
  */
 struct usb_phy_io_ops {
@@ -92,10 +92,10 @@ struct usb_phy {
        u16                     port_status;
        u16                     port_change;
 
-       /* to support controllers that have multiple transceivers */
+       /* to support controllers that have multiple phys */
        struct list_head        head;
 
-       /* initialize/shutdown the OTG controller */
+       /* initialize/shutdown the phy */
        int     (*init)(struct usb_phy *x);
        void    (*shutdown)(struct usb_phy *x);
 
@@ -106,7 +106,7 @@ struct usb_phy {
        int     (*set_power)(struct usb_phy *x,
                                unsigned mA);
 
-       /* Set transceiver into suspend mode */
+       /* Set phy into suspend mode */
        int     (*set_suspend)(struct usb_phy *x,
                                int suspend);
 
@@ -205,6 +205,8 @@ extern struct usb_phy *usb_get_phy_dev(struct device *dev, u8 index);
 extern struct usb_phy *devm_usb_get_phy_dev(struct device *dev, u8 index);
 extern struct usb_phy *devm_usb_get_phy_by_phandle(struct device *dev,
        const char *phandle, u8 index);
+extern struct usb_phy *devm_usb_get_phy_by_node(struct device *dev,
+       struct device_node *node, struct notifier_block *nb);
 extern void usb_put_phy(struct usb_phy *);
 extern void devm_usb_put_phy(struct device *dev, struct usb_phy *x);
 extern int usb_bind_phy(const char *dev_name, u8 index,
@@ -238,6 +240,12 @@ static inline struct usb_phy *devm_usb_get_phy_by_phandle(struct device *dev,
        return ERR_PTR(-ENXIO);
 }
 
+static inline struct usb_phy *devm_usb_get_phy_by_node(struct device *dev,
+       struct device_node *node, struct notifier_block *nb)
+{
+       return ERR_PTR(-ENXIO);
+}
+
 static inline void usb_put_phy(struct usb_phy *x)
 {
 }