]>
Commit | Line | Data |
---|---|---|
13c25be3 GKH |
1 | From c0a39151a4055332897cba615623d3de2f3896df Mon Sep 17 00:00:00 2001 |
2 | From: Haojian Zhuang <haojian.zhuang@marvell.com> | |
3 | Date: Thu, 10 Nov 2011 07:13:07 +0800 | |
4 | Subject: ARM: pxa: fix inconsistent CONFIG_USB_PXA27X | |
5 | ||
6 | From: Haojian Zhuang <haojian.zhuang@marvell.com> | |
7 | ||
8 | commit c0a39151a4055332897cba615623d3de2f3896df upstream. | |
9 | ||
10 | Since CONFIG_USB_GADGET_PXA27X and other macros are renamed to | |
11 | CONFIG_USB_PXA27X. Update them in arch/arm/mach-pxa and arch/arm/configs | |
12 | to keep consistent. | |
13 | ||
14 | Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> | |
15 | Acked-by: Felipe Balbi <balbi@ti.com> | |
16 | Signed-off-by: Eric Miao <eric.y.miao@gmail.com> | |
17 | Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> | |
18 | ||
19 | --- | |
20 | arch/arm/configs/ezx_defconfig | 2 +- | |
21 | arch/arm/configs/imote2_defconfig | 2 +- | |
22 | arch/arm/configs/magician_defconfig | 2 +- | |
23 | arch/arm/configs/zeus_defconfig | 2 +- | |
24 | arch/arm/mach-pxa/balloon3.c | 2 +- | |
25 | arch/arm/mach-pxa/colibri-pxa320.c | 2 +- | |
26 | arch/arm/mach-pxa/gumstix.c | 2 +- | |
27 | arch/arm/mach-pxa/include/mach/palm27x.h | 4 ++-- | |
28 | arch/arm/mach-pxa/palm27x.c | 4 ++-- | |
29 | arch/arm/mach-pxa/palmtc.c | 2 +- | |
30 | arch/arm/mach-pxa/vpac270.c | 2 +- | |
31 | 11 files changed, 13 insertions(+), 13 deletions(-) | |
32 | ||
33 | --- a/arch/arm/configs/ezx_defconfig | |
34 | +++ b/arch/arm/configs/ezx_defconfig | |
35 | @@ -287,7 +287,7 @@ CONFIG_USB=y | |
36 | # CONFIG_USB_DEVICE_CLASS is not set | |
37 | CONFIG_USB_OHCI_HCD=y | |
38 | CONFIG_USB_GADGET=y | |
39 | -CONFIG_USB_GADGET_PXA27X=y | |
40 | +CONFIG_USB_PXA27X=y | |
41 | CONFIG_USB_ETH=m | |
42 | # CONFIG_USB_ETH_RNDIS is not set | |
43 | CONFIG_MMC=y | |
44 | --- a/arch/arm/configs/imote2_defconfig | |
45 | +++ b/arch/arm/configs/imote2_defconfig | |
46 | @@ -263,7 +263,7 @@ CONFIG_USB=y | |
47 | # CONFIG_USB_DEVICE_CLASS is not set | |
48 | CONFIG_USB_OHCI_HCD=y | |
49 | CONFIG_USB_GADGET=y | |
50 | -CONFIG_USB_GADGET_PXA27X=y | |
51 | +CONFIG_USB_PXA27X=y | |
52 | CONFIG_USB_ETH=m | |
53 | # CONFIG_USB_ETH_RNDIS is not set | |
54 | CONFIG_MMC=y | |
55 | --- a/arch/arm/configs/magician_defconfig | |
56 | +++ b/arch/arm/configs/magician_defconfig | |
57 | @@ -132,7 +132,7 @@ CONFIG_USB_MON=m | |
58 | CONFIG_USB_OHCI_HCD=y | |
59 | CONFIG_USB_GADGET=y | |
60 | CONFIG_USB_GADGET_VBUS_DRAW=500 | |
61 | -CONFIG_USB_GADGET_PXA27X=y | |
62 | +CONFIG_USB_PXA27X=y | |
63 | CONFIG_USB_ETH=m | |
64 | # CONFIG_USB_ETH_RNDIS is not set | |
65 | CONFIG_USB_GADGETFS=m | |
66 | --- a/arch/arm/configs/zeus_defconfig | |
67 | +++ b/arch/arm/configs/zeus_defconfig | |
68 | @@ -140,7 +140,7 @@ CONFIG_USB_SERIAL=m | |
69 | CONFIG_USB_SERIAL_GENERIC=y | |
70 | CONFIG_USB_SERIAL_MCT_U232=m | |
71 | CONFIG_USB_GADGET=m | |
72 | -CONFIG_USB_GADGET_PXA27X=y | |
73 | +CONFIG_USB_PXA27X=y | |
74 | CONFIG_USB_ETH=m | |
75 | CONFIG_USB_GADGETFS=m | |
76 | CONFIG_USB_FILE_STORAGE=m | |
77 | --- a/arch/arm/mach-pxa/balloon3.c | |
78 | +++ b/arch/arm/mach-pxa/balloon3.c | |
79 | @@ -307,7 +307,7 @@ static inline void balloon3_mmc_init(voi | |
80 | /****************************************************************************** | |
81 | * USB Gadget | |
82 | ******************************************************************************/ | |
83 | -#if defined(CONFIG_USB_GADGET_PXA27X)||defined(CONFIG_USB_GADGET_PXA27X_MODULE) | |
84 | +#if defined(CONFIG_USB_PXA27X)||defined(CONFIG_USB_PXA27X_MODULE) | |
85 | static void balloon3_udc_command(int cmd) | |
86 | { | |
87 | if (cmd == PXA2XX_UDC_CMD_CONNECT) | |
88 | --- a/arch/arm/mach-pxa/colibri-pxa320.c | |
89 | +++ b/arch/arm/mach-pxa/colibri-pxa320.c | |
90 | @@ -146,7 +146,7 @@ static void __init colibri_pxa320_init_e | |
91 | static inline void __init colibri_pxa320_init_eth(void) {} | |
92 | #endif /* CONFIG_AX88796 */ | |
93 | ||
94 | -#if defined(CONFIG_USB_GADGET_PXA27X)||defined(CONFIG_USB_GADGET_PXA27X_MODULE) | |
95 | +#if defined(CONFIG_USB_PXA27X)||defined(CONFIG_USB_PXA27X_MODULE) | |
96 | static struct gpio_vbus_mach_info colibri_pxa320_gpio_vbus_info = { | |
97 | .gpio_vbus = mfp_to_gpio(MFP_PIN_GPIO96), | |
98 | .gpio_pullup = -1, | |
99 | --- a/arch/arm/mach-pxa/gumstix.c | |
100 | +++ b/arch/arm/mach-pxa/gumstix.c | |
101 | @@ -106,7 +106,7 @@ static void __init gumstix_mmc_init(void | |
102 | } | |
103 | #endif | |
104 | ||
105 | -#ifdef CONFIG_USB_GADGET_PXA25X | |
106 | +#ifdef CONFIG_USB_PXA25X | |
107 | static struct gpio_vbus_mach_info gumstix_udc_info = { | |
108 | .gpio_vbus = GPIO_GUMSTIX_USB_GPIOn, | |
109 | .gpio_pullup = GPIO_GUMSTIX_USB_GPIOx, | |
110 | --- a/arch/arm/mach-pxa/include/mach/palm27x.h | |
111 | +++ b/arch/arm/mach-pxa/include/mach/palm27x.h | |
112 | @@ -37,8 +37,8 @@ extern void __init palm27x_lcd_init(int | |
113 | static inline void palm27x_lcd_init(int power, struct pxafb_mode_info *mode) {} | |
114 | #endif | |
115 | ||
116 | -#if defined(CONFIG_USB_GADGET_PXA27X) || \ | |
117 | - defined(CONFIG_USB_GADGET_PXA27X_MODULE) | |
118 | +#if defined(CONFIG_USB_PXA27X) || \ | |
119 | + defined(CONFIG_USB_PXA27X_MODULE) | |
120 | extern void __init palm27x_udc_init(int vbus, int pullup, | |
121 | int vbus_inverted); | |
122 | #else | |
123 | --- a/arch/arm/mach-pxa/palm27x.c | |
124 | +++ b/arch/arm/mach-pxa/palm27x.c | |
125 | @@ -164,8 +164,8 @@ void __init palm27x_lcd_init(int power, | |
126 | /****************************************************************************** | |
127 | * USB Gadget | |
128 | ******************************************************************************/ | |
129 | -#if defined(CONFIG_USB_GADGET_PXA27X) || \ | |
130 | - defined(CONFIG_USB_GADGET_PXA27X_MODULE) | |
131 | +#if defined(CONFIG_USB_PXA27X) || \ | |
132 | + defined(CONFIG_USB_PXA27X_MODULE) | |
133 | static struct gpio_vbus_mach_info palm27x_udc_info = { | |
134 | .gpio_vbus_inverted = 1, | |
135 | }; | |
136 | --- a/arch/arm/mach-pxa/palmtc.c | |
137 | +++ b/arch/arm/mach-pxa/palmtc.c | |
138 | @@ -338,7 +338,7 @@ static inline void palmtc_mkp_init(void) | |
139 | /****************************************************************************** | |
140 | * UDC | |
141 | ******************************************************************************/ | |
142 | -#if defined(CONFIG_USB_GADGET_PXA25X)||defined(CONFIG_USB_GADGET_PXA25X_MODULE) | |
143 | +#if defined(CONFIG_USB_PXA25X)||defined(CONFIG_USB_PXA25X_MODULE) | |
144 | static struct gpio_vbus_mach_info palmtc_udc_info = { | |
145 | .gpio_vbus = GPIO_NR_PALMTC_USB_DETECT_N, | |
146 | .gpio_vbus_inverted = 1, | |
147 | --- a/arch/arm/mach-pxa/vpac270.c | |
148 | +++ b/arch/arm/mach-pxa/vpac270.c | |
149 | @@ -343,7 +343,7 @@ static inline void vpac270_uhc_init(void | |
150 | /****************************************************************************** | |
151 | * USB Gadget | |
152 | ******************************************************************************/ | |
153 | -#if defined(CONFIG_USB_GADGET_PXA27X)||defined(CONFIG_USB_GADGET_PXA27X_MODULE) | |
154 | +#if defined(CONFIG_USB_PXA27X)||defined(CONFIG_USB_PXA27X_MODULE) | |
155 | static struct gpio_vbus_mach_info vpac270_gpio_vbus_info = { | |
156 | .gpio_vbus = GPIO41_VPAC270_UDC_DETECT, | |
157 | .gpio_pullup = -1, |