diff options
author | Kishon Vijay Abraham I <kishon@ti.com> | 2014-03-03 06:38:14 -0500 |
---|---|---|
committer | Kishon Vijay Abraham I <kishon@ti.com> | 2014-03-07 11:21:45 -0500 |
commit | 6284be23db6b32e17ef34d082386967350d10d1a (patch) | |
tree | 4bcc27e9b3aac037941362c0efc709bb16036e1a /include/linux/usb | |
parent | 8cf7651f7046aa4e20bb98c36bec3ddba48351f9 (diff) |
phy: omap-usb2: move omap_usb.h from linux/usb/ to linux/phy/
No functional change. Moved omap_usb.h from linux/usb/ to linux/phy/.
Also removed the unused members of struct omap_usb (after phy-omap-pipe3
started using it's own header file)
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Diffstat (limited to 'include/linux/usb')
-rw-r--r-- | include/linux/usb/omap_usb.h | 67 |
1 files changed, 0 insertions, 67 deletions
diff --git a/include/linux/usb/omap_usb.h b/include/linux/usb/omap_usb.h deleted file mode 100644 index 6ae29360e1d2..000000000000 --- a/include/linux/usb/omap_usb.h +++ /dev/null | |||
@@ -1,67 +0,0 @@ | |||
1 | /* | ||
2 | * omap_usb.h -- omap usb2 phy header file | ||
3 | * | ||
4 | * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com | ||
5 | * This program is free software; you can redistribute it and/or modify | ||
6 | * it under the terms of the GNU General Public License as published by | ||
7 | * the Free Software Foundation; either version 2 of the License, or | ||
8 | * (at your option) any later version. | ||
9 | * | ||
10 | * Author: Kishon Vijay Abraham I <kishon@ti.com> | ||
11 | * | ||
12 | * This program is distributed in the hope that it will be useful, | ||
13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
15 | * GNU General Public License for more details. | ||
16 | * | ||
17 | */ | ||
18 | |||
19 | #ifndef __DRIVERS_OMAP_USB2_H | ||
20 | #define __DRIVERS_OMAP_USB2_H | ||
21 | |||
22 | #include <linux/io.h> | ||
23 | #include <linux/usb/otg.h> | ||
24 | |||
25 | struct usb_dpll_params { | ||
26 | u16 m; | ||
27 | u8 n; | ||
28 | u8 freq:3; | ||
29 | u8 sd; | ||
30 | u32 mf; | ||
31 | }; | ||
32 | |||
33 | struct omap_usb { | ||
34 | struct usb_phy phy; | ||
35 | struct phy_companion *comparator; | ||
36 | void __iomem *pll_ctrl_base; | ||
37 | struct device *dev; | ||
38 | struct device *control_dev; | ||
39 | struct clk *wkupclk; | ||
40 | struct clk *sys_clk; | ||
41 | struct clk *optclk; | ||
42 | u8 is_suspended:1; | ||
43 | }; | ||
44 | |||
45 | #define phy_to_omapusb(x) container_of((x), struct omap_usb, phy) | ||
46 | |||
47 | #if defined(CONFIG_OMAP_USB2) || defined(CONFIG_OMAP_USB2_MODULE) | ||
48 | extern int omap_usb2_set_comparator(struct phy_companion *comparator); | ||
49 | #else | ||
50 | static inline int omap_usb2_set_comparator(struct phy_companion *comparator) | ||
51 | { | ||
52 | return -ENODEV; | ||
53 | } | ||
54 | #endif | ||
55 | |||
56 | static inline u32 omap_usb_readl(void __iomem *addr, unsigned offset) | ||
57 | { | ||
58 | return __raw_readl(addr + offset); | ||
59 | } | ||
60 | |||
61 | static inline void omap_usb_writel(void __iomem *addr, unsigned offset, | ||
62 | u32 data) | ||
63 | { | ||
64 | __raw_writel(data, addr + offset); | ||
65 | } | ||
66 | |||
67 | #endif /* __DRIVERS_OMAP_USB_H */ | ||