From: Kishon Vijay Abraham I <kishon@ti.com>
To: <gregkh@linuxfoundation.org>, <kishon@ti.com>,
<linux-kernel@vger.kernel.org>
Subject: [PATCH 11/28] phy: omap-usb2: move omap_usb.h from linux/usb/ to linux/phy/
Date: Sat, 8 Mar 2014 14:59:12 +0530 [thread overview]
Message-ID: <1394270969-11851-12-git-send-email-kishon@ti.com> (raw)
In-Reply-To: <1394270969-11851-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>
---
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-08 9:29 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-08 9:29 [GIT PULL 00/28] PHY for 3.15 Kishon Vijay Abraham I
2014-03-08 9:29 ` [PATCH 01/28] usb: phy: twl4030-usb: Silence checkpatch warnings Kishon Vijay Abraham I
2014-03-08 9:29 ` [PATCH 02/28] usb: phy: twl4030-usb: Remove redundant semicolon Kishon Vijay Abraham I
2014-03-08 9:29 ` [PATCH 03/28] usb: phy: bcm-kona-usb2: Use PTR_ERR_OR_ZERO Kishon Vijay Abraham I
2014-03-08 9:29 ` [PATCH 04/28] phy: Select PHY_EXYNOS_MIPI_VIDEO by default for ARCH_EXYNOS Kishon Vijay Abraham I
2014-03-08 9:29 ` [PATCH 05/28] phy: Select PHY_EXYNOS_DP_VIDEO " Kishon Vijay Abraham I
2014-03-08 9:29 ` [PATCH 06/28] PHY: Exynos: Add Exynos5250 SATA PHY driver Kishon Vijay Abraham I
2014-03-08 9:29 ` [PATCH 07/28] PHY: sunxi: Add driver for sunxi usb phy Kishon Vijay Abraham I
2014-03-08 9:29 ` [PATCH 08/28] phy: mvebu-sata: prepare new Dove DT Kconfig variable Kishon Vijay Abraham I
2014-03-08 9:29 ` [PATCH 09/28] drivers: phy: usb3/pipe3: Adapt pipe3 driver to Generic PHY Framework Kishon Vijay Abraham I
2014-03-08 9:29 ` [PATCH 10/28] usb: phy: omap-usb2: remove *set_suspend* callback from omap-usb2 Kishon Vijay Abraham I
2014-03-08 9:29 ` Kishon Vijay Abraham I [this message]
2014-03-08 9:29 ` [PATCH 12/28] phy: core: Add an exported of_phy_get function Kishon Vijay Abraham I
2014-03-08 9:29 ` [PATCH 13/28] phy: core: Add devm_of_phy_get to phy-core Kishon Vijay Abraham I
2014-03-08 9:29 ` [PATCH 14/28] phy: Add new Exynos USB 2.0 PHY driver Kishon Vijay Abraham I
2014-03-08 9:29 ` [PATCH 15/28] phy: Add Exynos 5250 support to the " Kishon Vijay Abraham I
2014-03-08 9:29 ` [PATCH 16/28] phy: omap-usb2: Adapt phy-omap-usb2 for AM437x Kishon Vijay Abraham I
2014-03-08 9:29 ` [PATCH 17/28] phy: omap-usb2: Provide workaround for USB2PHY false disconnect Kishon Vijay Abraham I
2014-03-08 9:29 ` [PATCH 18/28] phy: omap-usb2: Add different compatible for OMAP5 Kishon Vijay Abraham I
2014-03-08 9:29 ` [PATCH 19/28] phy: rename struct omap_control_usb to struct omap_control_phy Kishon Vijay Abraham I
2014-03-08 9:29 ` [PATCH 20/28] phy: omap-control: update dra7 and am437 usb2 bindings Kishon Vijay Abraham I
2014-03-08 9:29 ` [PATCH 21/28] phy: ti-pipe3: cleanup clock handling Kishon Vijay Abraham I
2014-03-08 9:29 ` [PATCH 22/28] phy: ti-pipe3: Add SATA DPLL support Kishon Vijay Abraham I
2014-03-08 9:29 ` [PATCH 23/28] phy: ti-pipe3: Don't get 'wkupclk' and 'refclk' for SATA PHY Kishon Vijay Abraham I
2014-03-08 9:29 ` [PATCH 24/28] phy: ti-pipe3: streamline PHY operations Kishon Vijay Abraham I
2014-03-08 9:29 ` [PATCH 25/28] phy: ti-pipe3: Fix suspend/resume and module reload Kishon Vijay Abraham I
2014-03-08 9:29 ` [PATCH 26/28] phy: omap: Depend on OMAP_OCP2SCP bus driver Kishon Vijay Abraham I
2014-03-08 9:29 ` [PATCH 27/28] Documentation: Add APM X-Gene SoC 15Gbps Multi-purpose PHY driver binding documentation Kishon Vijay Abraham I
2014-03-08 9:29 ` [PATCH 28/28] PHY: add APM X-Gene SoC 15Gbps Multi-purpose PHY driver Kishon Vijay Abraham I
2014-03-08 16:42 ` [GIT PULL 00/28] PHY for 3.15 Greg KH
2014-03-09 7:35 ` Kishon Vijay Abraham I
2014-03-09 16:55 ` Greg KH
2014-03-09 7:27 ` [PATCH 16/28 v2] phy: omap-usb2: Adapt phy-omap-usb2 for AM437x Kishon Vijay Abraham I
2014-03-09 7:27 ` [PATCH 17/28 v2] phy: omap-usb2: Provide workaround for USB2PHY false disconnect Kishon Vijay Abraham I
2014-03-09 7:27 ` [PATCH 18/28 v2] phy: omap-usb2: Add different compatible for OMAP5 Kishon Vijay Abraham I
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=1394270969-11851-12-git-send-email-kishon@ti.com \
--to=kishon@ti.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@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®