phy: Move ULPI phy header out of drivers to include path

Although ULPI phy is currently being used by tusb1210,
there can be other consumers too in future. So move this
to the includes path for phy.

Signed-off-by: Vivek Gautam <vivek.gautam@codeaurora.org>
Cc: Stephen Boyd <stephen.boyd@linaro.org>
Cc: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Cc: Kishon Vijay Abraham I <kishon@ti.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
Cc: linux-omap@vger.kernel.org
Cc: linux-usb@vger.kernel.org
Acked-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>

diff --git a/drivers/phy/phy-tusb1210.c b/drivers/phy/phy-tusb1210.c
index 4f6d5e71507d1c5989326fbeece2597593b39f2f..bb3fb031c478da13fc070c49701b926b7dc1ed17 100644 (file)
--- a/drivers/phy/phy-tusb1210.c
+++ b/drivers/phy/phy-tusb1210.c
@@ -12,8 +12,7 @@
 #include <linux/module.h>
 #include <linux/ulpi/driver.h>
 #include <linux/gpio/consumer.h>
-
-#include "ulpi_phy.h"
+#include <linux/phy/ulpi_phy.h>
 
 #define TUSB1210_VENDOR_SPECIFIC2              0x80
 #define TUSB1210_VENDOR_SPECIFIC2_IHSTX_SHIFT  0

diff --git a/drivers/phy/ulpi_phy.h b/drivers/phy/ulpi_phy.h
deleted file mode 100644 (file)
index f2ebe49..0000000
--- a/drivers/phy/ulpi_phy.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#include <linux/phy/phy.h>
-
-/**
- * Helper that registers PHY for a ULPI device and adds a lookup for binding it
- * and it's controller, which is always the parent.
- */
-static inline struct phy
-*ulpi_phy_create(struct ulpi *ulpi, const struct phy_ops *ops)
-{
-       struct phy *phy;
-       int ret;
-
-       phy = phy_create(&ulpi->dev, NULL, ops);
-       if (IS_ERR(phy))
-               return phy;
-
-       ret = phy_create_lookup(phy, "usb2-phy", dev_name(ulpi->dev.parent));
-       if (ret) {
-               phy_destroy(phy);
-               return ERR_PTR(ret);
-       }
-
-       return phy;
-}
-
-/* Remove a PHY that was created with ulpi_phy_create() and it's lookup. */
-static inline void ulpi_phy_destroy(struct ulpi *ulpi, struct phy *phy)
-{
-       phy_remove_lookup(phy, "usb2-phy", dev_name(ulpi->dev.parent));
-       phy_destroy(phy);
-}

diff --git a/include/linux/phy/ulpi_phy.h b/include/linux/phy/ulpi_phy.h
new file mode 100644 (file)
index 0000000..f2ebe49
--- /dev/null
+++ b/include/linux/phy/ulpi_phy.h
@@ -0,0 +1,31 @@
+#include <linux/phy/phy.h>
+
+/**
+ * Helper that registers PHY for a ULPI device and adds a lookup for binding it
+ * and it's controller, which is always the parent.
+ */
+static inline struct phy
+*ulpi_phy_create(struct ulpi *ulpi, const struct phy_ops *ops)
+{
+       struct phy *phy;
+       int ret;
+
+       phy = phy_create(&ulpi->dev, NULL, ops);
+       if (IS_ERR(phy))
+               return phy;
+
+       ret = phy_create_lookup(phy, "usb2-phy", dev_name(ulpi->dev.parent));
+       if (ret) {
+               phy_destroy(phy);
+               return ERR_PTR(ret);
+       }
+
+       return phy;
+}
+
+/* Remove a PHY that was created with ulpi_phy_create() and it's lookup. */
+static inline void ulpi_phy_destroy(struct ulpi *ulpi, struct phy *phy)
+{
+       phy_remove_lookup(phy, "usb2-phy", dev_name(ulpi->dev.parent));
+       phy_destroy(phy);
+}