diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-18 03:12:19 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-18 03:12:19 (GMT) |
| commit | 539669779a8e369912d86dc4048175cc47f20c33 (patch) | |
| tree | d3b9cd5659589783313ec5eda43f0196d24aea7f /drivers/phy/phy-samsung-usb2.h | |
| parent | 50bdb12388c520e93947fca3cabf233a77fefd42 (diff) | |
| parent | 0f8669e343982ac66f4420335777cb5456b8abb0 (diff) | |
| download | linux-539669779a8e369912d86dc4048175cc47f20c33.tar.xz | |
Merge tag 'phy-for-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy into usb-next
Kishon writes:
phy: for 4.4
*) Add new PHY driver for Broadcom's cygnus PCIe PHY
*) Add USB3 PHY driver for mediatek's SoCs
*) Add VBUS regulator support for Samsung's exynos PHY
*) Misc cleanup
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Diffstat (limited to 'drivers/phy/phy-samsung-usb2.h')
| -rw-r--r-- | drivers/phy/phy-samsung-usb2.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/phy/phy-samsung-usb2.h b/drivers/phy/phy-samsung-usb2.h index 44bead9..6563e7c 100644 --- a/drivers/phy/phy-samsung-usb2.h +++ b/drivers/phy/phy-samsung-usb2.h @@ -17,6 +17,7 @@ #include <linux/device.h> #include <linux/regmap.h> #include <linux/spinlock.h> +#include <linux/regulator/consumer.h> #define KHZ 1000 #define MHZ (KHZ * KHZ) @@ -37,6 +38,7 @@ struct samsung_usb2_phy_driver { const struct samsung_usb2_phy_config *cfg; struct clk *clk; struct clk *ref_clk; + struct regulator *vbus; unsigned long ref_rate; u32 ref_reg_val; struct device *dev; |