iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ARM: pxa: fix inconsistent CONFIG_USB_PXA27X

Browse Source 
Since CONFIG_USB_GADGET_PXA27X and other macros are renamed to
CONFIG_USB_PXA27X. Update them in arch/arm/mach-pxa and arch/arm/configs
to keep consistent.

Cc: stable@kernel.org
Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Acked-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
This commit is contained in:
Haojian Zhuang 2011-11-10 07:13:07 +08:00 committed by Eric Miao
parent 1ea6b8f489
commit c0a39151a4
11 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/configs/ezx_defconfig
View File

@ -287,7 +287,7 @@ CONFIG_USB=y
# CONFIG_USB_DEVICE_CLASS is not set # CONFIG_USB_DEVICE_CLASS is not set
CONFIG_USB_OHCI_HCD=y CONFIG_USB_OHCI_HCD=y
CONFIG_USB_GADGET=y CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_PXA27X=y CONFIG_USB_PXA27X=y
CONFIG_USB_ETH=m CONFIG_USB_ETH=m
# CONFIG_USB_ETH_RNDIS is not set # CONFIG_USB_ETH_RNDIS is not set
CONFIG_MMC=y CONFIG_MMC=y

2
arch/arm/configs/imote2_defconfig
View File

@ -263,7 +263,7 @@ CONFIG_USB=y
# CONFIG_USB_DEVICE_CLASS is not set # CONFIG_USB_DEVICE_CLASS is not set
CONFIG_USB_OHCI_HCD=y CONFIG_USB_OHCI_HCD=y
CONFIG_USB_GADGET=y CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_PXA27X=y CONFIG_USB_PXA27X=y
CONFIG_USB_ETH=m CONFIG_USB_ETH=m
# CONFIG_USB_ETH_RNDIS is not set # CONFIG_USB_ETH_RNDIS is not set
CONFIG_MMC=y CONFIG_MMC=y

2
arch/arm/configs/magician_defconfig
View File

@ -132,7 +132,7 @@ CONFIG_USB_MON=m
CONFIG_USB_OHCI_HCD=y CONFIG_USB_OHCI_HCD=y
CONFIG_USB_GADGET=y CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_VBUS_DRAW=500 CONFIG_USB_GADGET_VBUS_DRAW=500
CONFIG_USB_GADGET_PXA27X=y CONFIG_USB_PXA27X=y
CONFIG_USB_ETH=m CONFIG_USB_ETH=m
# CONFIG_USB_ETH_RNDIS is not set # CONFIG_USB_ETH_RNDIS is not set
CONFIG_USB_GADGETFS=m CONFIG_USB_GADGETFS=m

2
arch/arm/configs/zeus_defconfig
View File

@ -140,7 +140,7 @@ CONFIG_USB_SERIAL=m
CONFIG_USB_SERIAL_GENERIC=y CONFIG_USB_SERIAL_GENERIC=y
CONFIG_USB_SERIAL_MCT_U232=m CONFIG_USB_SERIAL_MCT_U232=m
CONFIG_USB_GADGET=m CONFIG_USB_GADGET=m
CONFIG_USB_GADGET_PXA27X=y CONFIG_USB_PXA27X=y
CONFIG_USB_ETH=m CONFIG_USB_ETH=m
CONFIG_USB_GADGETFS=m CONFIG_USB_GADGETFS=m
CONFIG_USB_FILE_STORAGE=m CONFIG_USB_FILE_STORAGE=m

2
arch/arm/mach-pxa/balloon3.c
View File

@ -307,7 +307,7 @@ static inline void balloon3_mmc_init(void) {}
/****************************************************************************** /******************************************************************************
* USB Gadget * USB Gadget
******************************************************************************/ ******************************************************************************/
#if defined(CONFIG_USB_GADGET_PXA27X)||defined(CONFIG_USB_GADGET_PXA27X_MODULE) #if defined(CONFIG_USB_PXA27X)||defined(CONFIG_USB_PXA27X_MODULE)
static void balloon3_udc_command(int cmd) static void balloon3_udc_command(int cmd)
{ {
if (cmd == PXA2XX_UDC_CMD_CONNECT) if (cmd == PXA2XX_UDC_CMD_CONNECT)

2
arch/arm/mach-pxa/colibri-pxa320.c
View File

@ -146,7 +146,7 @@ static void __init colibri_pxa320_init_eth(void)
static inline void __init colibri_pxa320_init_eth(void) {} static inline void __init colibri_pxa320_init_eth(void) {}
#endif /* CONFIG_AX88796 */ #endif /* CONFIG_AX88796 */
#if defined(CONFIG_USB_GADGET_PXA27X)||defined(CONFIG_USB_GADGET_PXA27X_MODULE) #if defined(CONFIG_USB_PXA27X)||defined(CONFIG_USB_PXA27X_MODULE)
static struct gpio_vbus_mach_info colibri_pxa320_gpio_vbus_info = { static struct gpio_vbus_mach_info colibri_pxa320_gpio_vbus_info = {
.gpio_vbus = mfp_to_gpio(MFP_PIN_GPIO96), .gpio_vbus = mfp_to_gpio(MFP_PIN_GPIO96),
.gpio_pullup = -1, .gpio_pullup = -1,

2
arch/arm/mach-pxa/gumstix.c
View File

@ -106,7 +106,7 @@ static void __init gumstix_mmc_init(void)
} }
#endif #endif
#ifdef CONFIG_USB_GADGET_PXA25X #ifdef CONFIG_USB_PXA25X
static struct gpio_vbus_mach_info gumstix_udc_info = { static struct gpio_vbus_mach_info gumstix_udc_info = {
.gpio_vbus = GPIO_GUMSTIX_USB_GPIOn, .gpio_vbus = GPIO_GUMSTIX_USB_GPIOn,
.gpio_pullup = GPIO_GUMSTIX_USB_GPIOx, .gpio_pullup = GPIO_GUMSTIX_USB_GPIOx,

4
arch/arm/mach-pxa/include/mach/palm27x.h
View File

@ -37,8 +37,8 @@ extern void __init palm27x_lcd_init(int power,
#define palm27x_lcd_init(power, mode) do {} while (0) #define palm27x_lcd_init(power, mode) do {} while (0)
#endif #endif
#if defined(CONFIG_USB_GADGET_PXA27X) || \ #if defined(CONFIG_USB_PXA27X) || \
defined(CONFIG_USB_GADGET_PXA27X_MODULE) defined(CONFIG_USB_PXA27X_MODULE)
extern void __init palm27x_udc_init(int vbus, int pullup, extern void __init palm27x_udc_init(int vbus, int pullup,
int vbus_inverted); int vbus_inverted);
#else #else

4
arch/arm/mach-pxa/palm27x.c
View File

@ -164,8 +164,8 @@ void __init palm27x_lcd_init(int power, struct pxafb_mode_info *mode)
/****************************************************************************** /******************************************************************************
* USB Gadget * USB Gadget
******************************************************************************/ ******************************************************************************/
#if defined(CONFIG_USB_GADGET_PXA27X) || \ #if defined(CONFIG_USB_PXA27X) || \
defined(CONFIG_USB_GADGET_PXA27X_MODULE) defined(CONFIG_USB_PXA27X_MODULE)
static struct gpio_vbus_mach_info palm27x_udc_info = { static struct gpio_vbus_mach_info palm27x_udc_info = {
.gpio_vbus_inverted = 1, .gpio_vbus_inverted = 1,
}; };

2
arch/arm/mach-pxa/palmtc.c
View File

@ -338,7 +338,7 @@ static inline void palmtc_mkp_init(void) {}
/****************************************************************************** /******************************************************************************
* UDC * UDC
******************************************************************************/ ******************************************************************************/
#if defined(CONFIG_USB_GADGET_PXA25X)||defined(CONFIG_USB_GADGET_PXA25X_MODULE) #if defined(CONFIG_USB_PXA25X)||defined(CONFIG_USB_PXA25X_MODULE)
static struct gpio_vbus_mach_info palmtc_udc_info = { static struct gpio_vbus_mach_info palmtc_udc_info = {
.gpio_vbus = GPIO_NR_PALMTC_USB_DETECT_N, .gpio_vbus = GPIO_NR_PALMTC_USB_DETECT_N,
.gpio_vbus_inverted = 1, .gpio_vbus_inverted = 1,

2
arch/arm/mach-pxa/vpac270.c
View File

@ -343,7 +343,7 @@ static inline void vpac270_uhc_init(void) {}
/****************************************************************************** /******************************************************************************
* USB Gadget * USB Gadget
******************************************************************************/ ******************************************************************************/
#if defined(CONFIG_USB_GADGET_PXA27X)||defined(CONFIG_USB_GADGET_PXA27X_MODULE) #if defined(CONFIG_USB_PXA27X)||defined(CONFIG_USB_PXA27X_MODULE)
static struct gpio_vbus_mach_info vpac270_gpio_vbus_info = { static struct gpio_vbus_mach_info vpac270_gpio_vbus_info = {
.gpio_vbus = GPIO41_VPAC270_UDC_DETECT, .gpio_vbus = GPIO41_VPAC270_UDC_DETECT,
.gpio_pullup = -1, .gpio_pullup = -1,