diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-01-09 09:41:58 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-01-09 09:41:58 -0800 |
| commit | 440893398a189d410cbc8a50ab7e1674a63b8501 (patch) | |
| tree | 24a3ce9746dad0ce7e397163945a803172744f07 /include/linux/phy/omap_control_phy.h | |
| parent | b3ee8bdcd243b8ae2143dda2cf9157bc9bfb26ea (diff) | |
| parent | 0bc09f9cdc589e0b54724096138996a00b19babb (diff) | |
Merge tag 'for-3.19-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy into usb-linus
Kishon writes:
misc fixes in PHY drivers
Diffstat (limited to 'include/linux/phy/omap_control_phy.h')
| -rw-r--r-- | include/linux/phy/omap_control_phy.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/phy/omap_control_phy.h b/include/linux/phy/omap_control_phy.h index e9e6cfbfbb5..eb7d4a135a9 100644 --- a/include/linux/phy/omap_control_phy.h +++ b/include/linux/phy/omap_control_phy.h @@ -66,7 +66,7 @@ enum omap_control_usb_mode { #define OMAP_CTRL_PIPE3_PHY_TX_RX_POWEROFF 0x0 #define OMAP_CTRL_PCIE_PCS_MASK 0xff -#define OMAP_CTRL_PCIE_PCS_DELAY_COUNT_SHIFT 0x8 +#define OMAP_CTRL_PCIE_PCS_DELAY_COUNT_SHIFT 16 #define OMAP_CTRL_USB2_PHY_PD BIT(28) @@ -79,7 +79,7 @@ enum omap_control_usb_mode { void omap_control_phy_power(struct device *dev, int on); void omap_control_usb_set_mode(struct device *dev, enum omap_control_usb_mode mode); -void omap_control_pcie_pcs(struct device *dev, u8 id, u8 delay); +void omap_control_pcie_pcs(struct device *dev, u8 delay); #else static inline void omap_control_phy_power(struct device *dev, int on) @@ -91,7 +91,7 @@ static inline void omap_control_usb_set_mode(struct device *dev, { } -static inline void omap_control_pcie_pcs(struct device *dev, u8 id, u8 delay) +static inline void omap_control_pcie_pcs(struct device *dev, u8 delay) { } #endif |