Commit a4d8e93c authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'usb-for-v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next 



Felipe writes:

usb: patches for v4.4 merge window

This pull request is large with a total of 136 non-merge
commits. Because of its size, we will only describe the big things in
broad terms.

Many will be happy to know that dwc3 is now almost twice as fast after
some profiling and speed improvements. Also in dwc3, John Youn from
Synopsys added support for their new DWC USB3.1 IP Core and the HAPS
platform which can be used to validate it.

A series of patches from Robert Baldyga cleaned up uses of
ep->driver_data as a flag for "claimed endpoint" in favor of the new
ep->claimed flag.

Sudip Mukherjee fixed a ton of really old problems on the amd5536udc
driver. That should make a few people happy.

Heikki Krogerus worked on converting dwc3 to the unified device property
interface.

Together with these, there's a ton of non-critical fixes, typos and
stuff like that.

Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parents ffa23666 81e9d14a

Documentation/devicetree/bindings/usb/dwc3.txt

+5 −0
Original line number Diff line number Diff line
@@ -35,11 +35,16 @@ Optional properties: 
			LTSSM during USB3 Compliance mode.

 - snps,dis_u3_susphy_quirk: when set core will disable USB3 suspend phy.

 - snps,dis_u2_susphy_quirk: when set core will disable USB2 suspend phy.

 - snps,dis_enblslpm_quirk: when set clears the enblslpm in GUSB2PHYCFG,

			disabling the suspend signal to the PHY.

 - snps,is-utmi-l1-suspend: true when DWC3 asserts output signal

			utmi_l1_suspend_n, false when asserts utmi_sleep_n

 - snps,hird-threshold: HIRD threshold

 - snps,hsphy_interface: High-Speed PHY interface selection between "utmi" for

   UTMI+ and "ulpi" for ULPI when the DWC_USB3_HSPHY_INTERFACE has value 3.

 - snps,quirk-frame-length-adjustment: Value for GFLADJ_30MHZ field of GFLADJ

	register for post-silicon frame length adjustment when the

	fladj_30mhz_sdbnd signal is invalid or incorrect.



This is usually a subnode to DWC3 glue to which it is connected.

arch/arm/mach-s3c64xx/mach-crag6410.c

+2 −2
Original line number Diff line number Diff line
@@ -809,7 +809,7 @@ static const struct gpio_led_platform_data gpio_leds_pdata = { 
	.num_leds = ARRAY_SIZE(gpio_leds),

};



static struct s3c_hsotg_plat crag6410_hsotg_pdata;

static struct dwc2_hsotg_plat crag6410_hsotg_pdata;



static void __init crag6410_machine_init(void)

{
@@ -835,7 +835,7 @@ static void __init crag6410_machine_init(void) 
	s3c_i2c0_set_platdata(&i2c0_pdata);

	s3c_i2c1_set_platdata(&i2c1_pdata);

	s3c_fb_set_platdata(&crag6410_lcd_pdata);

	s3c_hsotg_set_platdata(&crag6410_hsotg_pdata);

	dwc2_hsotg_set_platdata(&crag6410_hsotg_pdata);



	i2c_register_board_info(0, i2c_devs0, ARRAY_SIZE(i2c_devs0));

	i2c_register_board_info(1, i2c_devs1, ARRAY_SIZE(i2c_devs1));

arch/arm/mach-s3c64xx/mach-smartq.c

+2 −2
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ static struct s3c_hwmon_pdata smartq_hwmon_pdata __initdata = { 
	},

};



static struct s3c_hsotg_plat smartq_hsotg_pdata;

static struct dwc2_hsotg_plat smartq_hsotg_pdata;



static int __init smartq_lcd_setup_gpio(void)

{
@@ -382,7 +382,7 @@ void __init smartq_map_io(void) 
void __init smartq_machine_init(void)

{

	s3c_i2c0_set_platdata(NULL);

	s3c_hsotg_set_platdata(&smartq_hsotg_pdata);

	dwc2_hsotg_set_platdata(&smartq_hsotg_pdata);

	s3c_hwmon_set_platdata(&smartq_hwmon_pdata);

	s3c_sdhci1_set_platdata(&smartq_internal_hsmmc_pdata);

	s3c_sdhci2_set_platdata(&smartq_internal_hsmmc_pdata);

arch/arm/mach-s3c64xx/mach-smdk6410.c

+2 −2
Original line number Diff line number Diff line
@@ -628,7 +628,7 @@ static struct platform_pwm_backlight_data smdk6410_bl_data = { 
	.enable_gpio = -1,

};



static struct s3c_hsotg_plat smdk6410_hsotg_pdata;

static struct dwc2_hsotg_plat smdk6410_hsotg_pdata;



static void __init smdk6410_map_io(void)

{
@@ -659,7 +659,7 @@ static void __init smdk6410_machine_init(void) 
	s3c_i2c0_set_platdata(NULL);

	s3c_i2c1_set_platdata(NULL);

	s3c_fb_set_platdata(&smdk6410_lcd_pdata);

	s3c_hsotg_set_platdata(&smdk6410_hsotg_pdata);

	dwc2_hsotg_set_platdata(&smdk6410_hsotg_pdata);



	samsung_keypad_set_platdata(&smdk6410_keypad_data);

arch/arm/plat-samsung/devs.c

+3 −3
Original line number Diff line number Diff line
@@ -1042,11 +1042,11 @@ struct platform_device s3c_device_usb_hsotg = { 
	},

};



void __init s3c_hsotg_set_platdata(struct s3c_hsotg_plat *pd)

void __init dwc2_hsotg_set_platdata(struct dwc2_hsotg_plat *pd)

{

	struct s3c_hsotg_plat *npd;

	struct dwc2_hsotg_plat *npd;



	npd = s3c_set_platdata(pd, sizeof(struct s3c_hsotg_plat),

	npd = s3c_set_platdata(pd, sizeof(struct dwc2_hsotg_plat),

			&s3c_device_usb_hsotg);



	if (!npd->phy_init)

CRA Git | Maintained and supported by SUSTech CRA and CCSE