浏览代码

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>
Kishon Vijay Abraham I 11 年之前
父节点
当前提交
6284be23db
共有 3 个文件被更改,包括 2 次插入5 次删除
  1. 1 1
      drivers/phy/phy-omap-usb2.c
  2. 1 1
      drivers/usb/phy/phy-twl6030-usb.c
  3. 0 3
      include/linux/phy/omap_usb.h

+ 1 - 1
drivers/phy/phy-omap-usb2.c

@@ -21,7 +21,7 @@
 #include <linux/slab.h>
 #include <linux/of.h>
 #include <linux/io.h>
-#include <linux/usb/omap_usb.h>
+#include <linux/phy/omap_usb.h>
 #include <linux/usb/phy_companion.h>
 #include <linux/clk.h>
 #include <linux/err.h>

+ 1 - 1
drivers/usb/phy/phy-twl6030-usb.c

@@ -27,7 +27,7 @@
 #include <linux/io.h>
 #include <linux/usb/musb-omap.h>
 #include <linux/usb/phy_companion.h>
-#include <linux/usb/omap_usb.h>
+#include <linux/phy/omap_usb.h>
 #include <linux/i2c/twl.h>
 #include <linux/regulator/consumer.h>
 #include <linux/err.h>

+ 0 - 3
include/linux/usb/omap_usb.h → include/linux/phy/omap_usb.h

@@ -33,13 +33,10 @@ struct usb_dpll_params {
 struct omap_usb {
 	struct usb_phy		phy;
 	struct phy_companion	*comparator;
-	void __iomem		*pll_ctrl_base;
 	struct device		*dev;
 	struct device		*control_dev;
 	struct clk		*wkupclk;
-	struct clk		*sys_clk;
 	struct clk		*optclk;
-	u8			is_suspended:1;
 };
 
 #define	phy_to_omapusb(x)	container_of((x), struct omap_usb, phy)