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

Commit 7ff43535 authored by Eric Miao's avatar Eric Miao Committed by Russell King
Browse files

[ARM] pxa/zylonite: add support for USB OHCI 



Signed-off-by: default avatarEric Miao <eric.miao@marvell.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 0c392ed9

arch/arm/mach-pxa/zylonite.c

+17 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <mach/pxafb.h>

#include <mach/zylonite.h>

#include <mach/mmc.h>

#include <mach/ohci.h>

#include <mach/pxa27x_keypad.h>

#include <mach/pxa3xx_nand.h>
@@ -423,6 +424,21 @@ static void __init zylonite_init_nand(void) 
static inline void zylonite_init_nand(void) {}

#endif /* CONFIG_MTD_NAND_PXA3xx || CONFIG_MTD_NAND_PXA3xx_MODULE */



#if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)

static struct pxaohci_platform_data zylonite_ohci_info = {

	.port_mode	= PMM_PERPORT_MODE,

	.flags		= ENABLE_PORT1 | ENABLE_PORT2 |

			  POWER_CONTROL_LOW | POWER_SENSE_LOW,

};



static void __init zylonite_init_ohci(void)

{

	pxa_set_ohci_info(&zylonite_ohci_info);

}

#else

static inline void zylonite_init_ohci(void) {}

#endif /* CONFIG_USB_OHCI_HCD || CONFIG_USB_OHCI_HCD_MODULE */



static void __init zylonite_init(void)

{

	/* board-processor specific initialization */
@@ -443,6 +459,7 @@ static void __init zylonite_init(void) 
	zylonite_init_keypad();

	zylonite_init_nand();

	zylonite_init_leds();

	zylonite_init_ohci();

}



MACHINE_START(ZYLONITE, "PXA3xx Platform Development Kit (aka Zylonite)")

arch/arm/mach-pxa/zylonite_pxa300.c

+4 −0
Original line number Diff line number Diff line
@@ -119,6 +119,10 @@ static mfp_cfg_t common_mfp_cfg[] __initdata = { 
	GPIO13_MMC2_CLK,

	GPIO14_MMC2_CMD,



	/* USB Host */

	GPIO0_2_USBH_PEN,

	GPIO1_2_USBH_PWR,



	/* Standard I2C */

	GPIO21_I2C_SCL,

	GPIO22_I2C_SDA,

arch/arm/mach-pxa/zylonite_pxa320.c

+4 −0
Original line number Diff line number Diff line
@@ -123,6 +123,10 @@ static mfp_cfg_t mfp_cfg[] __initdata = { 
	GPIO28_MMC2_CLK,

	GPIO29_MMC2_CMD,



	/* USB Host */

	GPIO2_2_USBH_PEN,

	GPIO3_2_USBH_PWR,



	/* Debug LEDs */

	GPIO1_2_GPIO | MFP_LPM_DRIVE_HIGH,

	GPIO4_2_GPIO | MFP_LPM_DRIVE_HIGH,