diff options
| author | Olof Johansson <olof@lixom.net> | 2014-01-09 00:07:32 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-01-09 00:07:32 -0800 |
| commit | 64576e439709738c0f55ab60cdba0ad18d5aa24e (patch) | |
| tree | 031394615b00dacbcec5c9e4b99f4494992ce375 /include/linux/usb | |
| parent | 3d7e0207ced354d1647195f53bcc670f9756c649 (diff) | |
| parent | c0f8a48723d1e7ec48f65c72f880bc49edea9a4a (diff) | |
| download | lwn-64576e439709738c0f55ab60cdba0ad18d5aa24e.tar.gz lwn-64576e439709738c0f55ab60cdba0ad18d5aa24e.zip | |
Merge branch 'qcom/drivers' into next/drivers
* qcom/drivers:
tty: serial: Limit msm_serial_hs driver to platforms that use it
mmc: msm_sdcc: Limit driver to platforms that use it
usb: phy: msm: Move mach dependent code to platform data
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'include/linux/usb')
| -rw-r--r-- | include/linux/usb/msm_hsusb.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/usb/msm_hsusb.h b/include/linux/usb/msm_hsusb.h index 22a396c13f3a..32754835a39b 100644 --- a/include/linux/usb/msm_hsusb.h +++ b/include/linux/usb/msm_hsusb.h @@ -20,6 +20,7 @@ #include <linux/types.h> #include <linux/usb/otg.h> +#include <linux/clk.h> /** * Supported USB modes @@ -135,6 +136,8 @@ struct msm_otg_platform_data { enum msm_usb_phy_type phy_type; void (*setup_gpio)(enum usb_otg_state state); char *pclk_src_name; + int (*link_clk_reset)(struct clk *link_clk, bool assert); + int (*phy_clk_reset)(struct clk *phy_clk); }; /** |