From: Heikki Krogerus <heikki.krogerus@linux.intel.com>
To: Kishon Vijay Abraham I <kishon@ti.com>
Cc: Vivek Gautam <gautam.vivek@samsung.com>,
linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org,
andrew.kim@intel.com
Subject: [PATCHv5 4/7] arm: omap3: twl: remove usb phy init data
Date: Wed, 19 Nov 2014 17:28:20 +0200 [thread overview]
Message-ID: <1416410903-162369-5-git-send-email-heikki.krogerus@linux.intel.com> (raw)
In-Reply-To: <1416410903-162369-1-git-send-email-heikki.krogerus@linux.intel.com>
The driver does no use it any more.
Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
---
arch/arm/mach-omap2/twl-common.c | 12 +-----------
include/linux/i2c/twl.h | 2 --
2 files changed, 1 insertion(+), 13 deletions(-)
diff --git a/arch/arm/mach-omap2/twl-common.c b/arch/arm/mach-omap2/twl-common.c
index b0d54da..4457e73 100644
--- a/arch/arm/mach-omap2/twl-common.c
+++ b/arch/arm/mach-omap2/twl-common.c
@@ -91,18 +91,8 @@ void __init omap_pmic_late_init(void)
}
#if defined(CONFIG_ARCH_OMAP3)
-struct phy_consumer consumers[] = {
- PHY_CONSUMER("musb-hdrc.0", "usb"),
-};
-
-struct phy_init_data init_data = {
- .consumers = consumers,
- .num_consumers = ARRAY_SIZE(consumers),
-};
-
static struct twl4030_usb_data omap3_usb_pdata = {
- .usb_mode = T2_USB_MODE_ULPI,
- .init_data = &init_data,
+ .usb_mode = T2_USB_MODE_ULPI,
};
static int omap3_batt_table[] = {
diff --git a/include/linux/i2c/twl.h b/include/linux/i2c/twl.h
index 8cfb50f..0bc03f1 100644
--- a/include/linux/i2c/twl.h
+++ b/include/linux/i2c/twl.h
@@ -26,7 +26,6 @@
#define __TWL_H_
#include <linux/types.h>
-#include <linux/phy/phy.h>
#include <linux/input/matrix_keypad.h>
/*
@@ -634,7 +633,6 @@ enum twl4030_usb_mode {
struct twl4030_usb_data {
enum twl4030_usb_mode usb_mode;
unsigned long features;
- struct phy_init_data *init_data;
int (*phy_init)(struct device *dev);
int (*phy_exit)(struct device *dev);
--
2.1.3
next prev parent reply other threads:[~2014-11-19 15:28 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-19 15:28 [PATCHv5 0/7] phy: simplified phy lookup Heikki Krogerus
2014-11-19 15:28 ` [PATCHv5 1/7] phy: safer to_phy() macro Heikki Krogerus
2014-11-19 15:28 ` [PATCHv5 2/7] phy: improved lookup method Heikki Krogerus
2014-11-19 15:28 ` [PATCHv5 3/7] phy: twl4030: use the new " Heikki Krogerus
2014-11-19 15:28 ` Heikki Krogerus [this message]
2014-11-20 9:15 ` [PATCHv5 4/7] arm: omap3: twl: remove usb phy init data Kishon Vijay Abraham I
2014-12-03 5:41 ` [PATCH] " Kishon Vijay Abraham I
2014-12-03 16:17 ` Greg KH
2014-11-19 15:28 ` [PATCHv5 5/7] phy: remove the old lookup method Heikki Krogerus
2014-11-19 15:28 ` [PATCHv5 6/7] base: platform: name the device already during allocation Heikki Krogerus
2014-11-20 9:21 ` Kishon Vijay Abraham I
2015-02-02 12:12 ` Vivek Gautam
2014-11-19 15:28 ` [PATCHv5 7/7] usb: dwc3: host: convey the PHYs to xhci Heikki Krogerus
2014-11-20 11:29 ` [PATCHv5 0/7] phy: simplified phy lookup Vivek Gautam
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=1416410903-162369-5-git-send-email-heikki.krogerus@linux.intel.com \
--to=heikki.krogerus@linux.intel.com \
--cc=andrew.kim@intel.com \
--cc=gautam.vivek@samsung.com \
--cc=kishon@ti.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@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;
as well as URLs for NNTP newsgroup(s).