diff options
| author | Tony Lindgren <tony@atomide.com> | 2013-04-08 16:34:32 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2013-04-08 16:34:32 -0700 |
| commit | d05663a23f31a1baf25ab8894b8c3fb2a506aa6a (patch) | |
| tree | 6b40bb08676a2788b007482df65f6d21a4afe331 /include/linux | |
| parent | 07961ac7c0ee8b546658717034fe692fd12eefa9 (diff) | |
| parent | 1fac4fffa719a98ec1047eaece236244333c9afe (diff) | |
Merge branch 'for_3.10/dts' of git://git.kernel.org/pub/scm/linux/kernel/git/bcousson/linux-omap-dt into omap-for-v3.10/dt
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/usb/nop-usb-xceiv.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/usb/nop-usb-xceiv.h b/include/linux/usb/nop-usb-xceiv.h index 28884c717411..148d35171aac 100644 --- a/include/linux/usb/nop-usb-xceiv.h +++ b/include/linux/usb/nop-usb-xceiv.h @@ -5,6 +5,11 @@ struct nop_usb_xceiv_platform_data { enum usb_phy_type type; + unsigned long clk_rate; + + /* if set fails with -EPROBE_DEFER if can't get regulator */ + unsigned int needs_vcc:1; + unsigned int needs_reset:1; }; #if defined(CONFIG_NOP_USB_XCEIV) || (defined(CONFIG_NOP_USB_XCEIV_MODULE) && defined(MODULE)) |