diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2019-06-14 02:34:58 -0700 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2019-06-14 02:34:58 -0700 |
| commit | 4cd0bfd354fc6474690fa7445dad63b73a5e1016 (patch) | |
| tree | e5d59152ebb62736caea96cb4f71006f9e602530 /include | |
| parent | 88f608e5493864557347e80329292bb3ec2441dd (diff) | |
| parent | 17fd8dbacb926ced0864e3d7546b624adba68c7f (diff) | |
Merge 17fd8dbacb926ced0864e3d7546b624adba68c7f on remote branch
Change-Id: Ib1574fa4bdce72792c61765ce70a998d84b28428
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/usb/phy.h | 12 | ||||
| -rw-r--r-- | include/uapi/linux/virtio_ids.h | 2 |
2 files changed, 14 insertions, 0 deletions
diff --git a/include/linux/usb/phy.h b/include/linux/usb/phy.h index d25125402fda..f066d65ac3dd 100644 --- a/include/linux/usb/phy.h +++ b/include/linux/usb/phy.h @@ -126,6 +126,9 @@ struct usb_phy { /* reset the PHY clocks */ int (*reset)(struct usb_phy *x); + + /* return linestate with Idp_src (used for DCD with USB2 PHY) */ + int (*dpdm_with_idp_src)(struct usb_phy *x); }; /** @@ -209,6 +212,15 @@ usb_phy_reset(struct usb_phy *x) return 0; } +static inline int +usb_phy_dpdm_with_idp_src(struct usb_phy *x) +{ + if (x && x->dpdm_with_idp_src) + return x->dpdm_with_idp_src(x); + + return 0; +} + /* for usb host and peripheral controller drivers */ #if IS_ENABLED(CONFIG_USB_PHY) extern struct usb_phy *usb_get_phy(enum usb_phy_type type); diff --git a/include/uapi/linux/virtio_ids.h b/include/uapi/linux/virtio_ids.h index 3228d582234a..4914c3037a03 100644 --- a/include/uapi/linux/virtio_ids.h +++ b/include/uapi/linux/virtio_ids.h @@ -43,4 +43,6 @@ #define VIRTIO_ID_INPUT 18 /* virtio input */ #define VIRTIO_ID_VSOCK 19 /* virtio vsock transport */ +#define VIRTIO_ID_I2C 32 /* virtio i2c */ + #endif /* _LINUX_VIRTIO_IDS_H */ |