On Fri, Jul 26, 2013 at 10:15:54PM +0200, Sebastian Andrzej Siewior wrote:
The nop driver isn't a do-nothing-stub but supports a couple functions
like clock on/off or is able to use a voltage regulator. This patch
simply renames the driver to generic since it is easy possible to
extend it by a simple function istead of writing a complete driver.
Signed-off-by: Sebastian Andrzej Siewior bige...@linutronix.de
to me, this is great but I need Tony's Ack for it. Let's Cc Tony and
linux-omap
---
arch/arm/mach-omap2/board-omap3beagle.c | 2 +-
arch/arm/mach-omap2/board-omap3evm.c | 2 +-
arch/arm/mach-omap2/board-omap3pandora.c | 2 +-
arch/arm/mach-omap2/usb-host.c | 8 +++---
drivers/usb/dwc3/dwc3-exynos.c | 6 ++--
drivers/usb/dwc3/dwc3-pci.c | 6 ++--
drivers/usb/phy/Makefile | 2 +-
drivers/usb/phy/{phy-nop.c = phy-generic.c} | 42
++--
include/linux/usb/nop-usb-xceiv.h| 2 +-
9 files changed, 36 insertions(+), 36 deletions(-)
rename drivers/usb/phy/{phy-nop.c = phy-generic.c} (84%)
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c
b/arch/arm/mach-omap2/board-omap3beagle.c
index 04c1165..f595b23 100644
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@ -279,7 +279,7 @@ static struct regulator_consumer_supply
beagle_vsim_supply[] = {
static struct gpio_led gpio_leds[];
/* PHY's VCC regulator might be added later, so flag that we need it */
-static struct nop_usb_xceiv_platform_data hsusb2_phy_data = {
+static struct usb_phy_gen_xceiv_platform_data hsusb2_phy_data = {
.needs_vcc = true,
};
diff --git a/arch/arm/mach-omap2/board-omap3evm.c
b/arch/arm/mach-omap2/board-omap3evm.c
index 8c02626..5d98ef0 100644
--- a/arch/arm/mach-omap2/board-omap3evm.c
+++ b/arch/arm/mach-omap2/board-omap3evm.c
@@ -468,7 +468,7 @@ struct wl12xx_platform_data omap3evm_wlan_data __initdata
= {
static struct regulator_consumer_supply omap3evm_vaux2_supplies[] = {
REGULATOR_SUPPLY(VDD_CSIPHY1, omap3isp),/* OMAP ISP */
REGULATOR_SUPPLY(VDD_CSIPHY2, omap3isp),/* OMAP ISP */
- REGULATOR_SUPPLY(vcc, nop_usb_xceiv.2), /* hsusb port 2 */
+ REGULATOR_SUPPLY(vcc, usb_phy_gen_xceiv.2), /* hsusb port 2 */
REGULATOR_SUPPLY(vaux2, NULL),
};
diff --git a/arch/arm/mach-omap2/board-omap3pandora.c
b/arch/arm/mach-omap2/board-omap3pandora.c
index b1547a0..d2b455e 100644
--- a/arch/arm/mach-omap2/board-omap3pandora.c
+++ b/arch/arm/mach-omap2/board-omap3pandora.c
@@ -352,7 +352,7 @@ static struct regulator_consumer_supply
pandora_vcc_lcd_supply[] = {
};
static struct regulator_consumer_supply pandora_usb_phy_supply[] = {
- REGULATOR_SUPPLY(vcc, nop_usb_xceiv.2), /* hsusb port 2 */
+ REGULATOR_SUPPLY(vcc, usb_phy_gen_xceiv.2), /* hsusb port 2 */
};
/* ads7846 on SPI and 2 nub controllers on I2C */
diff --git a/arch/arm/mach-omap2/usb-host.c b/arch/arm/mach-omap2/usb-host.c
index 2eb19d4..b54bd06 100644
--- a/arch/arm/mach-omap2/usb-host.c
+++ b/arch/arm/mach-omap2/usb-host.c
@@ -349,7 +349,7 @@ static struct fixed_voltage_config hsusb_reg_config = {
/* .init_data filled later */
};
-static const char *nop_name = nop_usb_xceiv; /* NOP PHY driver */
+static const char *nop_name = usb_phy_gen_xceiv; /* NOP PHY driver */
static const char *reg_name = reg-fixed-voltage; /* Regulator driver */
/**
@@ -460,9 +460,9 @@ int usbhs_init_phys(struct usbhs_phy_data *phy, int
num_phys)
pdevinfo.name = nop_name;
pdevinfo.id = phy-port;
pdevinfo.data = phy-platform_data;
- pdevinfo.size_data = sizeof(struct nop_usb_xceiv_platform_data);
-
- scnprintf(phy_id, MAX_STR, nop_usb_xceiv.%d,
+ pdevinfo.size_data =
+ sizeof(struct usb_phy_gen_xceiv_platform_data);
+ scnprintf(phy_id, MAX_STR, usb_phy_gen_xceiv.%d,
phy-port);
pdev = platform_device_register_full(pdevinfo);
if (IS_ERR(pdev)) {
diff --git a/drivers/usb/dwc3/dwc3-exynos.c b/drivers/usb/dwc3/dwc3-exynos.c
index 9a8a5e1..1a83fb3 100644
--- a/drivers/usb/dwc3/dwc3-exynos.c
+++ b/drivers/usb/dwc3/dwc3-exynos.c
@@ -38,13 +38,13 @@ struct dwc3_exynos {
static int dwc3_exynos_register_phys(struct dwc3_exynos *exynos)
{
- struct nop_usb_xceiv_platform_data pdata;
+ struct usb_phy_gen_xceiv_platform_data pdata;
struct platform_device *pdev;
int ret;
memset(pdata, 0x00, sizeof(pdata));
- pdev = platform_device_alloc(nop_usb_xceiv, PLATFORM_DEVID_AUTO);
+ pdev = platform_device_alloc(usb_phy_gen_xceiv, PLATFORM_DEVID_AUTO);
if (!pdev)
return -ENOMEM;
@@ -55,7 +55,7 @@ static int
