lkml.org 
[lkml]   [2011]   [Dec]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[015/104] ARM: pxa: fix inconsistent CONFIG_USB_PXA27X
    3.1-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Haojian Zhuang <haojian.zhuang@marvell.com>

    commit c0a39151a4055332897cba615623d3de2f3896df upstream.

    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.

    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>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    arch/arm/configs/ezx_defconfig | 2 +-
    arch/arm/configs/imote2_defconfig | 2 +-
    arch/arm/configs/magician_defconfig | 2 +-
    arch/arm/configs/zeus_defconfig | 2 +-
    arch/arm/mach-pxa/balloon3.c | 2 +-
    arch/arm/mach-pxa/colibri-pxa320.c | 2 +-
    arch/arm/mach-pxa/gumstix.c | 2 +-
    arch/arm/mach-pxa/include/mach/palm27x.h | 4 ++--
    arch/arm/mach-pxa/palm27x.c | 4 ++--
    arch/arm/mach-pxa/palmtc.c | 2 +-
    arch/arm/mach-pxa/vpac270.c | 2 +-
    11 files changed, 13 insertions(+), 13 deletions(-)

    --- a/arch/arm/configs/ezx_defconfig
    +++ b/arch/arm/configs/ezx_defconfig
    @@ -287,7 +287,7 @@ CONFIG_USB=y
    # CONFIG_USB_DEVICE_CLASS is not set
    CONFIG_USB_OHCI_HCD=y
    CONFIG_USB_GADGET=y
    -CONFIG_USB_GADGET_PXA27X=y
    +CONFIG_USB_PXA27X=y
    CONFIG_USB_ETH=m
    # CONFIG_USB_ETH_RNDIS is not set
    CONFIG_MMC=y
    --- a/arch/arm/configs/imote2_defconfig
    +++ b/arch/arm/configs/imote2_defconfig
    @@ -263,7 +263,7 @@ CONFIG_USB=y
    # CONFIG_USB_DEVICE_CLASS is not set
    CONFIG_USB_OHCI_HCD=y
    CONFIG_USB_GADGET=y
    -CONFIG_USB_GADGET_PXA27X=y
    +CONFIG_USB_PXA27X=y
    CONFIG_USB_ETH=m
    # CONFIG_USB_ETH_RNDIS is not set
    CONFIG_MMC=y
    --- a/arch/arm/configs/magician_defconfig
    +++ b/arch/arm/configs/magician_defconfig
    @@ -132,7 +132,7 @@ CONFIG_USB_MON=m
    CONFIG_USB_OHCI_HCD=y
    CONFIG_USB_GADGET=y
    CONFIG_USB_GADGET_VBUS_DRAW=500
    -CONFIG_USB_GADGET_PXA27X=y
    +CONFIG_USB_PXA27X=y
    CONFIG_USB_ETH=m
    # CONFIG_USB_ETH_RNDIS is not set
    CONFIG_USB_GADGETFS=m
    --- a/arch/arm/configs/zeus_defconfig
    +++ b/arch/arm/configs/zeus_defconfig
    @@ -140,7 +140,7 @@ CONFIG_USB_SERIAL=m
    CONFIG_USB_SERIAL_GENERIC=y
    CONFIG_USB_SERIAL_MCT_U232=m
    CONFIG_USB_GADGET=m
    -CONFIG_USB_GADGET_PXA27X=y
    +CONFIG_USB_PXA27X=y
    CONFIG_USB_ETH=m
    CONFIG_USB_GADGETFS=m
    CONFIG_USB_FILE_STORAGE=m
    --- a/arch/arm/mach-pxa/balloon3.c
    +++ b/arch/arm/mach-pxa/balloon3.c
    @@ -307,7 +307,7 @@ static inline void balloon3_mmc_init(voi
    /******************************************************************************
    * 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)
    {
    if (cmd == PXA2XX_UDC_CMD_CONNECT)
    --- a/arch/arm/mach-pxa/colibri-pxa320.c
    +++ b/arch/arm/mach-pxa/colibri-pxa320.c
    @@ -146,7 +146,7 @@ static void __init colibri_pxa320_init_e
    static inline void __init colibri_pxa320_init_eth(void) {}
    #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 = {
    .gpio_vbus = mfp_to_gpio(MFP_PIN_GPIO96),
    .gpio_pullup = -1,
    --- a/arch/arm/mach-pxa/gumstix.c
    +++ b/arch/arm/mach-pxa/gumstix.c
    @@ -106,7 +106,7 @@ static void __init gumstix_mmc_init(void
    }
    #endif

    -#ifdef CONFIG_USB_GADGET_PXA25X
    +#ifdef CONFIG_USB_PXA25X
    static struct gpio_vbus_mach_info gumstix_udc_info = {
    .gpio_vbus = GPIO_GUMSTIX_USB_GPIOn,
    .gpio_pullup = GPIO_GUMSTIX_USB_GPIOx,
    --- a/arch/arm/mach-pxa/include/mach/palm27x.h
    +++ b/arch/arm/mach-pxa/include/mach/palm27x.h
    @@ -37,8 +37,8 @@ extern void __init palm27x_lcd_init(int
    static inline void palm27x_lcd_init(int power, struct pxafb_mode_info *mode) {}
    #endif

    -#if defined(CONFIG_USB_GADGET_PXA27X) || \
    - defined(CONFIG_USB_GADGET_PXA27X_MODULE)
    +#if defined(CONFIG_USB_PXA27X) || \
    + defined(CONFIG_USB_PXA27X_MODULE)
    extern void __init palm27x_udc_init(int vbus, int pullup,
    int vbus_inverted);
    #else
    --- a/arch/arm/mach-pxa/palm27x.c
    +++ b/arch/arm/mach-pxa/palm27x.c
    @@ -164,8 +164,8 @@ void __init palm27x_lcd_init(int power,
    /******************************************************************************
    * 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 palm27x_udc_info = {
    .gpio_vbus_inverted = 1,
    };
    --- a/arch/arm/mach-pxa/palmtc.c
    +++ b/arch/arm/mach-pxa/palmtc.c
    @@ -338,7 +338,7 @@ static inline void palmtc_mkp_init(void)
    /******************************************************************************
    * 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 = {
    .gpio_vbus = GPIO_NR_PALMTC_USB_DETECT_N,
    .gpio_vbus_inverted = 1,
    --- a/arch/arm/mach-pxa/vpac270.c
    +++ b/arch/arm/mach-pxa/vpac270.c
    @@ -343,7 +343,7 @@ static inline void vpac270_uhc_init(void
    /******************************************************************************
    * 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 = {
    .gpio_vbus = GPIO41_VPAC270_UDC_DETECT,
    .gpio_pullup = -1,



    \
     
     \ /
      Last update: 2011-12-07 17:27    [W:0.025 / U:99.140 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site