From: Kishon Vijay Abraham I <kishon@ti.com>
To: <kishon@ti.com>, <linux-kernel@vger.kernel.org>,
<linux-omap@vger.kernel.org>
Cc: <balbi@ti.com>
Subject: [PATCH v6] phy: omap-usb2: move omap_usb.h from linux/usb/ to linux/phy/
Date: Fri, 7 Mar 2014 22:18:08 +0530 [thread overview]
Message-ID: <1394210888-1587-1-git-send-email-kishon@ti.com> (raw)
In-Reply-To: <1393846695-14644-1-git-send-email-kishon@ti.com>
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>
---
Changes from v5:
fixes the following compilation error
drivers/usb/phy/phy-twl6030-usb.c:30:32:
fatal error: linux/usb/omap_usb.h: No such file or directory
drivers/phy/phy-omap-usb2.c | 2 +-
drivers/usb/phy/phy-twl6030-usb.c | 2 +-
include/linux/{usb => phy}/omap_usb.h | 3 ---
3 files changed, 2 insertions(+), 5 deletions(-)
rename include/linux/{usb => phy}/omap_usb.h (95%)
diff --git a/drivers/phy/phy-omap-usb2.c b/drivers/phy/phy-omap-usb2.c
index 705af5a..9c3f056 100644
--- a/drivers/phy/phy-omap-usb2.c
+++ b/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>
diff --git a/drivers/usb/phy/phy-twl6030-usb.c b/drivers/usb/phy/phy-twl6030-usb.c
index 214172b..04778cf 100644
--- a/drivers/usb/phy/phy-twl6030-usb.c
+++ b/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>
diff --git a/include/linux/usb/omap_usb.h b/include/linux/phy/omap_usb.h
similarity index 95%
rename from include/linux/usb/omap_usb.h
rename to include/linux/phy/omap_usb.h
index 6ae2936..19d343c3 100644
--- a/include/linux/usb/omap_usb.h
+++ b/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)
--
1.7.9.5
next prev parent reply other threads:[~2014-03-07 16:48 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-03 11:38 [PATCH v5 0/6] Make dwc3 use Generic PHY Framework Kishon Vijay Abraham I
2014-03-03 11:38 ` [PATCH v5 1/6] usb: dwc3: core: support optional PHYs Kishon Vijay Abraham I
2014-03-03 11:38 ` [PATCH v5 2/6] usb: dwc3: adapt dwc3 core to use Generic PHY Framework Kishon Vijay Abraham I
2014-03-05 14:43 ` Roger Quadros
2014-03-05 14:47 ` Kishon Vijay Abraham I
2014-03-05 15:24 ` Roger Quadros
2014-03-03 11:38 ` [PATCH v5 3/6] drivers: phy: usb3/pipe3: Adapt pipe3 driver to " Kishon Vijay Abraham I
2014-03-06 9:30 ` Kishon Vijay Abraham I
2014-03-03 11:38 ` [PATCH v5 4/6] usb: phy: omap-usb2: remove *set_suspend* callback from omap-usb2 Kishon Vijay Abraham I
2014-03-03 11:38 ` [PATCH v5 5/6] phy: omap-usb2: move omap_usb.h from linux/usb/ to linux/phy/ Kishon Vijay Abraham I
2014-03-03 11:38 ` [PATCH v5 6/6] arm/dts: added dt properties to adapt to the new phy framwork Kishon Vijay Abraham I
2014-03-05 12:42 ` Kishon Vijay Abraham I
2014-03-05 19:40 ` Tony Lindgren
2014-03-03 12:21 ` [PATCH v5 0/6] Make dwc3 use Generic PHY Framework Roger Quadros
2014-03-03 12:36 ` Kishon Vijay Abraham I
2014-03-03 16:40 ` Felipe Balbi
2014-03-04 13:31 ` Kishon Vijay Abraham I
2014-03-07 16:48 ` Kishon Vijay Abraham I [this message]
2014-03-07 16:50 ` [PATCH v6] phy: omap-usb2: move omap_usb.h from linux/usb/ to linux/phy/ Felipe Balbi
2014-03-07 17:39 ` Kishon Vijay Abraham I
2014-03-07 17:40 ` Felipe Balbi
2014-03-07 17:46 ` Kishon Vijay Abraham I
2014-03-07 18:08 ` Felipe Balbi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1394210888-1587-1-git-send-email-kishon@ti.com \
--to=kishon@ti.com \
--cc=balbi@ti.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®