Skip to content

Commit

Permalink
[ARM] pxa/gumstix: fix incorrect init done by am200
Browse files Browse the repository at this point in the history
Signed-off-by: Jaya Kumar <jayakumar.lkml@gmail.com>
Cc: Andre Puschmann <andre.puschmann@imms.de>
Signed-off-by: Eric Miao <eric.miao@marvell.com>
  • Loading branch information
Jaya Kumar authored and Eric Miao committed Dec 17, 2008
1 parent 07f651c commit 3332b0c
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 14 deletions.
21 changes: 11 additions & 10 deletions arch/arm/mach-pxa/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,20 @@ endmenu
endif

config ARCH_GUMSTIX
bool "Gumstix XScale boards"
bool "Gumstix XScale 255 boards"
select PXA25x
help
Say Y here if you intend to run this kernel on a
Gumstix Full Function Minature Computer.
Say Y here if you intend to run this kernel on
Basix, Connex, ws-200ax, ws-400ax systems

config MACH_GUMSTIX_F
bool "Basix, Connex, ws-200ax, ws-400ax systems"
choice
prompt "Gumstix Carrier/Expansion Board"
depends on ARCH_GUMSTIX
select PXA25x

config GUMSTIX_AM200EPD
bool "Enable AM200EPD board support"

endchoice

config ARCH_LUBBOCK
bool "Intel DBPXA250 Development Platform"
Expand Down Expand Up @@ -348,10 +353,6 @@ config PCM990_DISPLAY_NONE

endchoice

config MACH_AM200EPD
depends on MACH_GUMSTIX_F
bool "Enable AM200EPD board support"

config PXA_EZX
bool "Motorola EZX Platform"
select PXA27x
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-pxa/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ obj-$(CONFIG_CPU_PXA930) += pxa930.o

# Specific board support
obj-$(CONFIG_ARCH_GUMSTIX) += gumstix.o
obj-$(CONFIG_MACH_AM200EPD) += am200epd.o
obj-$(CONFIG_GUMSTIX_AM200EPD) += am200epd.o
obj-$(CONFIG_ARCH_LUBBOCK) += lubbock.o
obj-$(CONFIG_MACH_LOGICPD_PXA270) += lpd270.o
obj-$(CONFIG_MACH_MAINSTONE) += mainstone.o
Expand Down
4 changes: 1 addition & 3 deletions arch/arm/mach-pxa/am200epd.c
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ static struct metronome_board am200_board = {
.cleanup = am200_cleanup,
};

static int __init am200_init(void)
int __init am200_init(void)
{
int ret;

Expand Down Expand Up @@ -367,8 +367,6 @@ static int __init am200_init(void)
module_param(panel_type, uint, 0);
MODULE_PARM_DESC(panel_type, "Select the panel type: 6, 8, 97");

module_init(am200_init);

MODULE_DESCRIPTION("board driver for am200 metronome epd kit");
MODULE_AUTHOR("Jaya Kumar");
MODULE_LICENSE("GPL");
15 changes: 15 additions & 0 deletions arch/arm/mach-pxa/gumstix.c
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,20 @@ static unsigned long gumstix_pin_config[] __initdata = {
GPIO16_GPIO,
};

int __attribute__((weak)) am200_init(void)
{
return 0;
}

static void __init carrier_board_init(void)
{
/*
* put carrier/expansion board init here if
* they cannot be detected programatically
*/
am200_init();
}

static void __init gumstix_init(void)
{
pxa2xx_mfp_config(ARRAY_AND_SIZE(gumstix_pin_config));
Expand All @@ -201,6 +215,7 @@ static void __init gumstix_init(void)
gumstix_udc_init();
gumstix_mmc_init();
(void) platform_add_devices(devices, ARRAY_SIZE(devices));
carrier_board_init();
}

MACHINE_START(GUMSTIX, "Gumstix")
Expand Down
4 changes: 4 additions & 0 deletions arch/arm/mach-pxa/include/mach/gumstix.h
Original file line number Diff line number Diff line change
Expand Up @@ -94,3 +94,7 @@ has detected a cable insertion; driven low otherwise. */
#define GPIO26_PRDY_nBSY_MD (GPIO26_PRDY_nBSY | GPIO_IN)
#define GPIO27_PRDY_nBSY_MD (GPIO27_PRDY_nBSY | GPIO_IN)
#define GPIO36_nCD_MD (GPIO36_nCD | GPIO_IN)

/* for expansion boards that can't be programatically detected */
extern int am200_init(void);

0 comments on commit 3332b0c

Please sign in to comment.