Commit 6489c611 authored by Philipp Zabel's avatar Philipp Zabel Committed by Eric Miao
Browse files

[ARM] pxa/magician: Enable pxa27x_udc and gpio_vbus 



This patch depends on otg_transceiver support in pxa27x_udc
(which is queued via linux-usb) to work.
It compiles also without it.

Signed-off-by: default avatarPhilipp Zabel <philipp.zabel@gmail.com>
Signed-off-by: default avatarEric Miao <eric.miao@marvell.com>
parent 51c10bbc

arch/arm/configs/magician_defconfig

+47 −9
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.29-rc2

# Sat Jan 17 17:47:17 2009

# Linux kernel version: 2.6.29-rc3

# Fri Jan 30 12:42:03 2009

#

CONFIG_ARM=y

CONFIG_HAVE_PWM=y
@@ -44,6 +44,15 @@ CONFIG_SYSVIPC_SYSCTL=y 
# CONFIG_BSD_PROCESS_ACCT is not set

# CONFIG_TASKSTATS is not set

# CONFIG_AUDIT is not set



#

# RCU Subsystem

#

CONFIG_CLASSIC_RCU=y

# CONFIG_TREE_RCU is not set

# CONFIG_PREEMPT_RCU is not set

# CONFIG_TREE_RCU_TRACE is not set

# CONFIG_PREEMPT_RCU_TRACE is not set

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_LOG_BUF_SHIFT=16
@@ -114,11 +123,6 @@ CONFIG_IOSCHED_NOOP=y 
# CONFIG_DEFAULT_CFQ is not set

CONFIG_DEFAULT_NOOP=y

CONFIG_DEFAULT_IOSCHED="noop"

CONFIG_CLASSIC_RCU=y

# CONFIG_TREE_RCU is not set

# CONFIG_PREEMPT_RCU is not set

# CONFIG_TREE_RCU_TRACE is not set

# CONFIG_PREEMPT_RCU_TRACE is not set

CONFIG_FREEZER=y



#
@@ -993,6 +997,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y 
# CONFIG_USB_R8A66597_HCD is not set

# CONFIG_USB_HWA_HCD is not set

# CONFIG_USB_MUSB_HDRC is not set

# CONFIG_USB_GADGET_MUSB_HDRC is not set



#

# USB Device Class drivers
@@ -1044,12 +1049,45 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y 
# CONFIG_USB_IOWARRIOR is not set

# CONFIG_USB_ISIGHTFW is not set

# CONFIG_USB_VST is not set

# CONFIG_USB_GADGET is not set

CONFIG_USB_GADGET=y

# CONFIG_USB_GADGET_DEBUG is not set

# CONFIG_USB_GADGET_DEBUG_FILES is not set

CONFIG_USB_GADGET_VBUS_DRAW=500

CONFIG_USB_GADGET_SELECTED=y

# CONFIG_USB_GADGET_AT91 is not set

# CONFIG_USB_GADGET_ATMEL_USBA is not set

# CONFIG_USB_GADGET_FSL_USB2 is not set

# CONFIG_USB_GADGET_LH7A40X is not set

# CONFIG_USB_GADGET_OMAP is not set

# CONFIG_USB_GADGET_PXA25X is not set

CONFIG_USB_GADGET_PXA27X=y

CONFIG_USB_PXA27X=y

# CONFIG_USB_GADGET_S3C2410 is not set

# CONFIG_USB_GADGET_IMX is not set

# CONFIG_USB_GADGET_M66592 is not set

# CONFIG_USB_GADGET_AMD5536UDC is not set

# CONFIG_USB_GADGET_FSL_QE is not set

# CONFIG_USB_GADGET_CI13XXX is not set

# CONFIG_USB_GADGET_NET2280 is not set

# CONFIG_USB_GADGET_GOKU is not set

# CONFIG_USB_GADGET_DUMMY_HCD is not set

# CONFIG_USB_GADGET_DUALSPEED is not set

# CONFIG_USB_ZERO is not set

CONFIG_USB_ETH=m

# CONFIG_USB_ETH_RNDIS is not set

CONFIG_USB_GADGETFS=m

CONFIG_USB_FILE_STORAGE=m

# CONFIG_USB_FILE_STORAGE_TEST is not set

CONFIG_USB_G_SERIAL=m

# CONFIG_USB_MIDI_GADGET is not set

# CONFIG_USB_G_PRINTER is not set

CONFIG_USB_CDC_COMPOSITE=m



#

# OTG and related infrastructure

#

# CONFIG_USB_GPIO_VBUS is not set

CONFIG_USB_OTG_UTILS=y

CONFIG_USB_GPIO_VBUS=y

CONFIG_MMC=y

# CONFIG_MMC_DEBUG is not set

# CONFIG_MMC_UNSAFE_RESUME is not set

arch/arm/mach-pxa/include/mach/magician.h

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ 
#define IRQ_MAGICIAN_SD		(IRQ_BOARD_START + 0)

#define IRQ_MAGICIAN_EP		(IRQ_BOARD_START + 1)

#define IRQ_MAGICIAN_BT		(IRQ_BOARD_START + 2)

#define IRQ_MAGICIAN_AC		(IRQ_BOARD_START + 3)

#define IRQ_MAGICIAN_VBUS	(IRQ_BOARD_START + 3)



/*

 * CPLD EGPIOs

arch/arm/mach-pxa/magician.c

+31 −4
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/mtd/physmap.h>

#include <linux/pda_power.h>

#include <linux/pwm_backlight.h>

#include <linux/usb/gpio_vbus.h>



#include <mach/hardware.h>

#include <asm/mach-types.h>
@@ -524,6 +525,31 @@ static struct platform_device pasic3 = { 
	},

};



/*

 * USB "Transceiver"

 */



static struct resource gpio_vbus_resource = {

	.flags = IORESOURCE_IRQ,

	.start = IRQ_MAGICIAN_VBUS,

	.end   = IRQ_MAGICIAN_VBUS,

};



static struct gpio_vbus_mach_info gpio_vbus_info = {

	.gpio_pullup = GPIO27_MAGICIAN_USBC_PUEN,

	.gpio_vbus   = EGPIO_MAGICIAN_CABLE_STATE_USB,

};



static struct platform_device gpio_vbus = {

	.name          = "gpio-vbus",

	.id            = -1,

	.num_resources = 1,

	.resource      = &gpio_vbus_resource,

	.dev = {

		.platform_data = &gpio_vbus_info,

	},

};



/*

 * External power

 */
@@ -601,14 +627,14 @@ static struct resource power_supply_resources[] = { 
	[0] = {

		.name  = "ac",

		.flags = IORESOURCE_IRQ,

		.start = IRQ_MAGICIAN_AC,

		.end   = IRQ_MAGICIAN_AC,

		.start = IRQ_MAGICIAN_VBUS,

		.end   = IRQ_MAGICIAN_VBUS,

	},

	[1] = {

		.name  = "usb",

		.flags = IORESOURCE_IRQ,

		.start = IRQ_MAGICIAN_AC,

		.end   = IRQ_MAGICIAN_AC,

		.start = IRQ_MAGICIAN_VBUS,

		.end   = IRQ_MAGICIAN_VBUS,

	},

};
@@ -732,6 +758,7 @@ static struct platform_device *devices[] __initdata = { 
	&egpio,

	&backlight,

	&pasic3,

	&gpio_vbus,

	&power_supply,

	&strataflash,

	&leds_gpio,

CRA Git | Maintained and supported by SUSTech CRA and CCSE