Commit 9e5f9c8a authored by Felipe Balbi's avatar Felipe Balbi
Browse files

Merge branch 'nop-phy-rename' into next 



Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>

Conflicts:
	drivers/usb/phy/phy-generic.c
parents d07f4a82 3fa4d734

arch/arm/mach-omap2/board-omap3beagle.c

+2 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
#include <linux/mtd/nand.h>

#include <linux/mmc/host.h>

#include <linux/usb/phy.h>

#include <linux/usb/nop-usb-xceiv.h>

#include <linux/usb/usb_phy_gen_xceiv.h>



#include <linux/regulator/machine.h>

#include <linux/i2c/twl.h>
@@ -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,

};

arch/arm/mach-omap2/board-omap3evm.c

+2 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
#include <linux/i2c/twl.h>

#include <linux/usb/otg.h>

#include <linux/usb/musb.h>

#include <linux/usb/nop-usb-xceiv.h>

#include <linux/usb/usb_phy_gen_xceiv.h>

#include <linux/smsc911x.h>



#include <linux/wl12xx.h>
@@ -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),

};

arch/arm/mach-omap2/board-omap3pandora.c

+1 −1
Original line number Diff line number Diff line
@@ -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 */

arch/arm/mach-omap2/usb-host.c

+5 −5
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
#include <linux/io.h>

#include <linux/gpio.h>

#include <linux/usb/phy.h>

#include <linux/usb/nop-usb-xceiv.h>

#include <linux/usb/usb_phy_gen_xceiv.h>



#include "soc.h"

#include "omap_device.h"
@@ -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)) {

drivers/usb/dwc3/dwc3-exynos.c

+4 −4
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
#include <linux/dma-mapping.h>

#include <linux/clk.h>

#include <linux/usb/otg.h>

#include <linux/usb/nop-usb-xceiv.h>

#include <linux/usb/usb_phy_gen_xceiv.h>

#include <linux/of.h>

#include <linux/of_platform.h>
@@ -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 dwc3_exynos_register_phys(struct dwc3_exynos *exynos) 
	if (ret)

		goto err1;



	pdev = platform_device_alloc("nop_usb_xceiv", PLATFORM_DEVID_AUTO);

	pdev = platform_device_alloc("usb_phy_gen_xceiv", PLATFORM_DEVID_AUTO);

	if (!pdev) {

		ret = -ENOMEM;

		goto err1;