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

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

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6

parents 0356dbb7 c8dd7709

Documentation/DocBook/usb.tmpl

+1 −0
Original line number Diff line number Diff line
@@ -253,6 +253,7 @@ 
!Edrivers/usb/core/urb.c

!Edrivers/usb/core/message.c

!Edrivers/usb/core/file.c

!Edrivers/usb/core/driver.c

!Edrivers/usb/core/usb.c

!Edrivers/usb/core/hub.c

    </chapter>

MAINTAINERS

+7 −1
Original line number Diff line number Diff line
@@ -2640,6 +2640,12 @@ L: linux-usb-users@lists.sourceforge.net 
L:	linux-usb-devel@lists.sourceforge.net

S:	Maintained



USB ISP116X DRIVER

P:	Olav Kongas

M:	ok@artecdesign.ee

L:	linux-usb-devel@lists.sourceforge.net

S:	Maintained



USB KAWASAKI LSI DRIVER

P:	Oliver Neukum

M:	oliver@neukum.name
@@ -2651,7 +2657,7 @@ USB MASS STORAGE DRIVER 
P:	Matthew Dharm

M:	mdharm-usb@one-eyed-alien.net

L:	linux-usb-users@lists.sourceforge.net

L:	linux-usb-devel@lists.sourceforge.net

L:	usb-storage@lists.one-eyed-alien.net

S:	Maintained

W:	http://www.one-eyed-alien.net/~mdharm/linux-usb/

arch/arm/mach-pxa/mainstone.c

+21 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 
#include <asm/arch/pxafb.h>

#include <asm/arch/mmc.h>

#include <asm/arch/irda.h>

#include <asm/arch/ohci.h>



#include "generic.h"
@@ -393,6 +394,25 @@ static struct platform_device *platform_devices[] __initdata = { 
	&mst_flash_device[1],

};



static int mainstone_ohci_init(struct device *dev)

{

	/* setup Port1 GPIO pin. */

	pxa_gpio_mode( 88 | GPIO_ALT_FN_1_IN);	/* USBHPWR1 */

	pxa_gpio_mode( 89 | GPIO_ALT_FN_2_OUT);	/* USBHPEN1 */



	/* Set the Power Control Polarity Low and Power Sense

	   Polarity Low to active low. */

	UHCHR = (UHCHR | UHCHR_PCPL | UHCHR_PSPL) &

		~(UHCHR_SSEP1 | UHCHR_SSEP2 | UHCHR_SSEP3 | UHCHR_SSE);



	return 0;

}



static struct pxaohci_platform_data mainstone_ohci_platform_data = {

	.port_mode	= PMM_PERPORT_MODE,

	.init		= mainstone_ohci_init,

};



static void __init mainstone_init(void)

{

	int SW7 = 0;  /* FIXME: get from SCR (Mst doc section 3.2.1.1) */
@@ -424,6 +444,7 @@ static void __init mainstone_init(void) 


	pxa_set_mci_info(&mainstone_mci_platform_data);

	pxa_set_ficp_info(&mainstone_ficp_platform_data);

	pxa_set_ohci_info(&mainstone_ohci_platform_data);

}

arch/arm/mach-pxa/pxa27x.c

+6 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <asm/hardware.h>

#include <asm/irq.h>

#include <asm/arch/pxa-regs.h>

#include <asm/arch/ohci.h>



#include "generic.h"
@@ -194,6 +195,11 @@ static struct platform_device ohci_device = { 
	.resource       = pxa27x_ohci_resources,

};



void __init pxa_set_ohci_info(struct pxaohci_platform_data *info)

{

	ohci_device.dev.platform_data = info;

}



static struct platform_device *devices[] __initdata = {

	&ohci_device,

};

drivers/block/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -358,7 +358,8 @@ config BLK_DEV_UB 
	  This driver supports certain USB attached storage devices

	  such as flash keys.



	  Warning: Enabling this cripples the usb-storage driver.

	  If you enable this driver, it is recommended to avoid conflicts

	  with usb-storage by enabling USB_LIBUSUAL.



	  If unsure, say N.