Re: [PATCH 10/26] ARM: pxa: allow selecting just one of TREO680/CENTRO

[Eric Miao]

On Sun, Oct 2, 2011 at 4:03 AM, Arnd Bergmann <arnd@xxxxxxxx> 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@xxxxxxxx>

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@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/