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

Merge branch 'for-greg' of git://gitorious.org/usb/usb into usb-next 

* 'for-greg' of git://gitorious.org/usb/usb:
  usb: ehci-omap: Show fatal probing time errors to end user
  usb: musb: introduce api for dma code to check compatibility with usb request
  usb: musb: maintain three states for buffer mappings instead of two
  usb: musb: disable double buffering when it's broken
  usb: musb: hsdma: change back to use musb_read/writew
  usb: musb: core: fix IRQ check
  usb: musb: fix kernel panic during s2ram(v2)
parents 3ea3c9b5 3e434a86

drivers/usb/host/ehci-omap.c

+3 −3
Original line number Diff line number Diff line
@@ -796,7 +796,7 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev) 
	hcd = usb_create_hcd(&ehci_omap_hc_driver, &pdev->dev,

			dev_name(&pdev->dev));

	if (!hcd) {

		dev_dbg(&pdev->dev, "failed to create hcd with err %d\n", ret);

		dev_err(&pdev->dev, "failed to create hcd with err %d\n", ret);

		ret = -ENOMEM;

		goto err_create_hcd;

	}
@@ -864,7 +864,7 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev) 


	ret = omap_start_ehc(omap, hcd);

	if (ret) {

		dev_dbg(&pdev->dev, "failed to start ehci\n");

		dev_err(&pdev->dev, "failed to start ehci with err %d\n", ret);

		goto err_start;

	}
@@ -879,7 +879,7 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev) 


	ret = usb_add_hcd(hcd, irq, IRQF_DISABLED | IRQF_SHARED);

	if (ret) {

		dev_dbg(&pdev->dev, "failed to add hcd with err %d\n", ret);

		dev_err(&pdev->dev, "failed to add hcd with err %d\n", ret);

		goto err_add_hcd;

	}

drivers/usb/musb/blackfin.c

+1 −0
Original line number Diff line number Diff line
@@ -404,6 +404,7 @@ static int bfin_musb_init(struct musb *musb) 
		musb->xceiv->set_power = bfin_musb_set_power;



	musb->isr = blackfin_interrupt;

	musb->double_buffer_not_ok = true;



	return 0;

}

drivers/usb/musb/musb_core.c

+2 −8
Original line number Diff line number Diff line
@@ -128,12 +128,7 @@ MODULE_ALIAS("platform:" MUSB_DRIVER_NAME); 


static inline struct musb *dev_to_musb(struct device *dev)

{

#ifdef CONFIG_USB_MUSB_HDRC_HCD

	/* usbcore insists dev->driver_data is a "struct hcd *" */

	return hcd_to_musb(dev_get_drvdata(dev));

#else

	return dev_get_drvdata(dev);

#endif

}



/*-------------------------------------------------------------------------*/
@@ -1876,10 +1871,9 @@ allocate_instance(struct device *dev, 
	musb = kzalloc(sizeof *musb, GFP_KERNEL);

	if (!musb)

		return NULL;

	dev_set_drvdata(dev, musb);



#endif



	dev_set_drvdata(dev, musb);

	musb->mregs = mbase;

	musb->ctrl_base = mbase;

	musb->nIrq = -ENODEV;
@@ -2191,7 +2185,7 @@ static int __init musb_probe(struct platform_device *pdev) 
	void __iomem	*base;



	iomem = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!iomem || irq == 0)

	if (!iomem || irq <= 0)

		return -ENODEV;



	base = ioremap(iomem->start, resource_size(iomem));

drivers/usb/musb/musb_core.h

+12 −0
Original line number Diff line number Diff line
@@ -488,6 +488,18 @@ struct musb { 
	unsigned		set_address:1;

	unsigned		test_mode:1;

	unsigned		softconnect:1;

	/*

	 * FIXME: Remove this flag.

	 *

	 * This is only added to allow Blackfin to work

	 * with current driver. For some unknown reason

	 * Blackfin doesn't work with double buffering

	 * and that's enabled by default.

	 *

	 * We added this flag to forcefully disable double

	 * buffering until we get it working.

	 */

	unsigned                double_buffer_not_ok:1 __deprecated;



	u8			address;

	u8			test_mode_nr;

drivers/usb/musb/musb_dma.h

+3 −0
Original line number Diff line number Diff line
@@ -169,6 +169,9 @@ struct dma_controller { 
							dma_addr_t dma_addr,

							u32 length);

	int			(*channel_abort)(struct dma_channel *);

	int			(*is_compatible)(struct dma_channel *channel,

							u16 maxpacket,

							void *buf, u32 length);

};



/* called after channel_program(), may indicate a fault */

CRA Git | Maintained and supported by SUSTech CRA and CCSE