lkml.org 
[lkml]   [2011]   [Oct]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    From
    Date
    SubjectRe: [PATCH 10/26] ARM: pxa: allow selecting just one of TREO680/CENTRO
    On Sun, Oct 2, 2011 at 4:03 AM, Arnd Bergmann <arnd@arndb.de> wrote:
    > There are two variants of the palmtreo machine, the 680 and the
    > centro, and Kconfig allows selecting one or both of them.
    > This changes the board file so that it's actually possible
    > to build all configurations that are allowed.
    >
    > Signed-off-by: Arnd Bergmann <arnd@arndb.de>

    Looks good to me. Applied.

    Cc'ed Marek Vasut.

    > ---
    >  arch/arm/mach-pxa/palmtreo.c |    8 ++++++++
    >  1 files changed, 8 insertions(+), 0 deletions(-)
    >
    > diff --git a/arch/arm/mach-pxa/palmtreo.c b/arch/arm/mach-pxa/palmtreo.c
    > index bb27d4b..30364b0 100644
    > --- a/arch/arm/mach-pxa/palmtreo.c
    > +++ b/arch/arm/mach-pxa/palmtreo.c
    > @@ -423,6 +423,7 @@ static void __init palmphone_common_init(void)
    >        palmtreo_leds_init();
    >  }
    >
    > +#ifdef CONFIG_MACH_TREO680
    >  static void __init treo680_init(void)
    >  {
    >        pxa2xx_mfp_config(ARRAY_AND_SIZE(treo680_pin_config));
    > @@ -430,7 +431,9 @@ static void __init treo680_init(void)
    >        palm27x_mmc_init(GPIO_NR_TREO_SD_DETECT_N, GPIO_NR_TREO680_SD_READONLY,
    >                        GPIO_NR_TREO680_SD_POWER, 0);
    >  }
    > +#endif
    >
    > +#ifdef CONFIG_MACH_CENTRO
    >  static void __init centro_init(void)
    >  {
    >        pxa2xx_mfp_config(ARRAY_AND_SIZE(centro685_pin_config));
    > @@ -438,7 +441,9 @@ static void __init centro_init(void)
    >        palm27x_mmc_init(GPIO_NR_TREO_SD_DETECT_N, -1,
    >                        GPIO_NR_CENTRO_SD_POWER, 1);
    >  }
    > +#endif
    >
    > +#ifdef CONFIG_MACH_TREO680
    >  MACHINE_START(TREO680, "Palm Treo 680")
    >        .boot_params    = 0xa0000100,
    >        .map_io         = pxa27x_map_io,
    > @@ -448,7 +453,9 @@ MACHINE_START(TREO680, "Palm Treo 680")
    >        .timer          = &pxa_timer,
    >        .init_machine   = treo680_init,
    >  MACHINE_END
    > +#endif
    >
    > +#ifdef CONFIG_MACH_CENTRO
    >  MACHINE_START(CENTRO, "Palm Centro 685")
    >        .boot_params    = 0xa0000100,
    >        .map_io         = pxa27x_map_io,
    > @@ -458,3 +465,4 @@ MACHINE_START(CENTRO, "Palm Centro 685")
    >        .timer          = &pxa_timer,
    >        .init_machine   = centro_init,
    >  MACHINE_END
    > +#endif
    > --
    > 1.7.5.4
    >
    >
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2011-10-07 08:15    [W:4.035 / U:0.168 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site