Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0c82cc5d authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Eric Miao
Browse files

ARM: pxa: allow selecting just one of TREO680/CENTRO 



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: default avatarArnd Bergmann <arnd@arndb.de>
Cc: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: default avatarEric Miao <eric.y.miao@gmail.com>
parent 14558038

arch/arm/mach-pxa/palmtreo.c

+8 −0
Original line number Diff line number Diff line
@@ -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