Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed378a52 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'usb-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb 

Pull USB merge for 3.4-rc1 from Greg KH:
 "Here's the big USB merge for the 3.4-rc1 merge window.

  Lots of gadget driver reworks here, driver updates, xhci changes, some
  new drivers added, usb-serial core reworking to fix some bugs, and
  other various minor things.

  There are some patches touching arch code, but they have all been
  acked by the various arch maintainers."

* tag 'usb-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (302 commits)
  net: qmi_wwan: add support for ZTE MF820D
  USB: option: add ZTE MF820D
  usb: gadget: f_fs: Remove lock is held before freeing checks
  USB: option: make interface blacklist work again
  usb/ub: deprecate & schedule for removal the "Low Performance USB Block" driver
  USB: ohci-pxa27x: add clk_prepare/clk_unprepare calls
  USB: use generic platform driver on ath79
  USB: EHCI: Add a generic platform device driver
  USB: OHCI: Add a generic platform device driver
  USB: ftdi_sio: new PID: LUMEL PD12
  USB: ftdi_sio: add support for FT-X series devices
  USB: serial: mos7840: Fixed MCS7820 device attach problem
  usb: Don't make USB_ARCH_HAS_{XHCI,OHCI,EHCI} depend on USB_SUPPORT.
  usb gadget: fix a section mismatch when compiling g_ffs with CONFIG_USB_FUNCTIONFS_ETH
  USB: ohci-nxp: Remove i2c_write(), use smbus
  USB: ohci-nxp: Support for LPC32xx
  USB: ohci-nxp: Rename symbols from pnx4008 to nxp
  USB: OHCI-HCD: Rename ohci-pnx4008 to ohci-nxp
  usb: gadget: Kconfig: fix typo for 'different'
  usb: dwc3: pci: fix another failure path in dwc3_pci_probe()
  ...
parents 843ec558 11207b6f

Documentation/ABI/testing/sysfs-bus-usb

+11 −0
Original line number Diff line number Diff line
@@ -182,3 +182,14 @@ Description: 
		USB2 hardware LPM is enabled for the device. Developer can

		write y/Y/1 or n/N/0 to the file to enable/disable the

		feature.



What:		/sys/bus/usb/devices/.../removable

Date:		February 2012

Contact:	Matthew Garrett <mjg@redhat.com>

Description:

		Some information about whether a given USB device is

		physically fixed to the platform can be inferred from a

		combination of hub decriptor bits and platform-specific data

		such as ACPI. This file will read either "removable" or

		"fixed" if the information is available, and "unknown"

		otherwise.
 
 No newline at end of file

Documentation/feature-removal-schedule.txt

+11 −0
Original line number Diff line number Diff line
@@ -524,3 +524,14 @@ Files: arch/arm/mach-at91/at91cap9.c 
Why:	The code is not actively maintained and platforms are now hard to find.

Who:	Nicolas Ferre <nicolas.ferre@atmel.com>

	Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>



----------------------------



What:	Low Performance USB Block driver ("CONFIG_BLK_DEV_UB")

When:	3.6

Why:	This driver provides support for USB storage devices like "USB

	sticks". As of now, it is deactivated in Debian, Fedora and

        Ubuntu. All current users can switch over to usb-storage

        (CONFIG_USB_STORAGE) which only drawback is the additional SCSI

        stack.

Who:	Sebastian Andrzej Siewior <sebastian@breakpoint.cc>

Documentation/i2c/instantiating-devices

+3 −3
Original line number Diff line number Diff line
@@ -87,11 +87,11 @@ it may have different addresses from one board to the next (manufacturer 
changing its design without notice). In this case, you can call

i2c_new_probed_device() instead of i2c_new_device().



Example (from the pnx4008 OHCI driver):

Example (from the nxp OHCI driver):



static const unsigned short normal_i2c[] = { 0x2c, 0x2d, I2C_CLIENT_END };



static int __devinit usb_hcd_pnx4008_probe(struct platform_device *pdev)

static int __devinit usb_hcd_nxp_probe(struct platform_device *pdev)

{

	(...)

	struct i2c_adapter *i2c_adap;
@@ -100,7 +100,7 @@ static int __devinit usb_hcd_pnx4008_probe(struct platform_device *pdev) 
	(...)

	i2c_adap = i2c_get_adapter(2);

	memset(&i2c_info, 0, sizeof(struct i2c_board_info));

	strlcpy(i2c_info.type, "isp1301_pnx", I2C_NAME_SIZE);

	strlcpy(i2c_info.type, "isp1301_nxp", I2C_NAME_SIZE);

	isp1301_i2c_client = i2c_new_probed_device(i2c_adap, &i2c_info,

						   normal_i2c, NULL);

	i2c_put_adapter(i2c_adap);

arch/arm/mach-imx/mx31moboard-devboard.c

+15 −9
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ static int devboard_usbh1_hw_init(struct platform_device *pdev) 
#define USBH1_VBUSEN_B	IOMUX_TO_GPIO(MX31_PIN_NFRE_B)

#define USBH1_MODE	IOMUX_TO_GPIO(MX31_PIN_NFALE)



static int devboard_isp1105_init(struct otg_transceiver *otg)

static int devboard_isp1105_init(struct usb_phy *otg)

{

	int ret = gpio_request(USBH1_MODE, "usbh1-mode");

	if (ret)
@@ -177,7 +177,7 @@ static int devboard_isp1105_init(struct otg_transceiver *otg) 
}





static int devboard_isp1105_set_vbus(struct otg_transceiver *otg, bool on)

static int devboard_isp1105_set_vbus(struct usb_otg *otg, bool on)

{

	if (on)

		gpio_set_value(USBH1_VBUSEN_B, 0);
@@ -194,18 +194,24 @@ static struct mxc_usbh_platform_data usbh1_pdata __initdata = { 


static int __init devboard_usbh1_init(void)

{

	struct otg_transceiver *otg;

	struct usb_phy *phy;

	struct platform_device *pdev;



	otg = kzalloc(sizeof(*otg), GFP_KERNEL);

	if (!otg)

	phy = kzalloc(sizeof(*phy), GFP_KERNEL);

	if (!phy)

		return -ENOMEM;



	otg->label	= "ISP1105";

	otg->init	= devboard_isp1105_init;

	otg->set_vbus	= devboard_isp1105_set_vbus;

	phy->otg = kzalloc(sizeof(struct usb_otg), GFP_KERNEL);

	if (!phy->otg) {

		kfree(phy);

		return -ENOMEM;

	}



	phy->label	= "ISP1105";

	phy->init	= devboard_isp1105_init;

	phy->otg->set_vbus	= devboard_isp1105_set_vbus;



	usbh1_pdata.otg = otg;

	usbh1_pdata.otg = phy;



	pdev = imx31_add_mxc_ehci_hs(1, &usbh1_pdata);

	if (IS_ERR(pdev))

arch/arm/mach-imx/mx31moboard-marxbot.c

+15 −9
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ static int marxbot_usbh1_hw_init(struct platform_device *pdev) 
#define USBH1_VBUSEN_B	IOMUX_TO_GPIO(MX31_PIN_NFRE_B)

#define USBH1_MODE	IOMUX_TO_GPIO(MX31_PIN_NFALE)



static int marxbot_isp1105_init(struct otg_transceiver *otg)

static int marxbot_isp1105_init(struct usb_phy *otg)

{

	int ret = gpio_request(USBH1_MODE, "usbh1-mode");

	if (ret)
@@ -291,7 +291,7 @@ static int marxbot_isp1105_init(struct otg_transceiver *otg) 
}





static int marxbot_isp1105_set_vbus(struct otg_transceiver *otg, bool on)

static int marxbot_isp1105_set_vbus(struct usb_otg *otg, bool on)

{

	if (on)

		gpio_set_value(USBH1_VBUSEN_B, 0);
@@ -308,18 +308,24 @@ static struct mxc_usbh_platform_data usbh1_pdata __initdata = { 


static int __init marxbot_usbh1_init(void)

{

	struct otg_transceiver *otg;

	struct usb_phy *phy;

	struct platform_device *pdev;



	otg = kzalloc(sizeof(*otg), GFP_KERNEL);

	if (!otg)

	phy = kzalloc(sizeof(*phy), GFP_KERNEL);

	if (!phy)

		return -ENOMEM;



	otg->label	= "ISP1105";

	otg->init	= marxbot_isp1105_init;

	otg->set_vbus	= marxbot_isp1105_set_vbus;

	phy->otg = kzalloc(sizeof(struct usb_otg), GFP_KERNEL);

	if (!phy->otg) {

		kfree(phy);

		return -ENOMEM;

	}



	phy->label	= "ISP1105";

	phy->init	= marxbot_isp1105_init;

	phy->otg->set_vbus	= marxbot_isp1105_set_vbus;



	usbh1_pdata.otg = otg;

	usbh1_pdata.otg = phy;



	pdev = imx31_add_mxc_ehci_hs(1, &usbh1_pdata);

	if (IS_ERR(pdev))