Commit 40321fd2 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

Merge branch 'for-rmk' of... 

Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel

Conflicts:

	arch/arm/mach-pxa/am200epd.c
	arch/arm/mach-pxa/ezx.c
parents d83a12a4 3b24f30c

arch/arm/mach-pxa/Kconfig

+17 −10
Original line number Diff line number Diff line
@@ -27,15 +27,26 @@ 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 MACH_INTELMOTE2

	bool "Intel Mote 2 Platform"

	select PXA27x

	select IWMMXT

	select PXA_HAVE_BOARD_IRQS



config ARCH_LUBBOCK

	bool "Intel DBPXA250 Development Platform"
@@ -348,10 +359,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

arch/arm/mach-pxa/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -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
@@ -70,6 +70,8 @@ obj-$(CONFIG_MACH_ARMCORE) += cm-x2xx.o cm-x255.o cm-x270.o 
obj-$(CONFIG_MACH_CM_X300)      += cm-x300.o

obj-$(CONFIG_PXA_EZX)           += ezx.o



obj-$(CONFIG_MACH_INTELMOTE2)   += imote2.o



# Support for blinky lights

led-y := leds.o

led-$(CONFIG_ARCH_LUBBOCK)	+= leds-lubbock.o

arch/arm/mach-pxa/am200epd.c

+1 −3
Original line number Diff line number Diff line
@@ -344,7 +344,7 @@ static unsigned long am200_pin_config[] __initdata = { 
	GPIO16_GPIO,

};



static int __init am200_init(void)

int __init am200_init(void)

{

	int ret;
@@ -382,8 +382,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");

arch/arm/mach-pxa/cm-x2xx.c

+8 −21
Original line number Diff line number Diff line
@@ -210,10 +210,8 @@ static struct pxafb_mode_info generic_stn_320x240_mode = { 
static struct pxafb_mach_info generic_stn_320x240 = {

	.modes		= &generic_stn_320x240_mode,

	.num_modes	= 1,

	.lccr0		= 0,

	.lccr3		= (LCCR3_PixClkDiv(0x03) |

			   LCCR3_Acb(0xff) |

			   LCCR3_PCP),

	.lcd_conn	= LCD_COLOR_STN_8BPP | LCD_PCLK_EDGE_FALL |\

			  LCD_AC_BIAS_FREQ(0xff),

	.cmap_inverse	= 0,

	.cmap_static	= 0,

};
@@ -236,10 +234,8 @@ static struct pxafb_mode_info generic_tft_640x480_mode = { 
static struct pxafb_mach_info generic_tft_640x480 = {

	.modes		= &generic_tft_640x480_mode,

	.num_modes	= 1,

	.lccr0		= (LCCR0_PAS),

	.lccr3		= (LCCR3_PixClkDiv(0x01) |

			   LCCR3_Acb(0xff) |

			   LCCR3_PCP),

	.lcd_conn	= LCD_COLOR_TFT_8BPP | LCD_PCLK_EDGE_FALL |\

			  LCD_AC_BIAS_FREQ(0xff),

	.cmap_inverse	= 0,

	.cmap_static	= 0,

};
@@ -263,9 +259,7 @@ static struct pxafb_mode_info generic_crt_640x480_mode = { 
static struct pxafb_mach_info generic_crt_640x480 = {

	.modes		= &generic_crt_640x480_mode,

	.num_modes	= 1,

	.lccr0		= (LCCR0_PAS),

	.lccr3		= (LCCR3_PixClkDiv(0x01) |

			   LCCR3_Acb(0xff)),

	.lcd_conn	= LCD_COLOR_TFT_8BPP | LCD_AC_BIAS_FREQ(0xff),

	.cmap_inverse	= 0,

	.cmap_static	= 0,

};
@@ -289,9 +283,7 @@ static struct pxafb_mode_info generic_crt_800x600_mode = { 
static struct pxafb_mach_info generic_crt_800x600 = {

	.modes		= &generic_crt_800x600_mode,

	.num_modes	= 1,

	.lccr0		= (LCCR0_PAS),

	.lccr3		= (LCCR3_PixClkDiv(0x02) |

			   LCCR3_Acb(0xff)),

	.lcd_conn	= LCD_COLOR_TFT_8BPP | LCD_AC_BIAS_FREQ(0xff),

	.cmap_inverse	= 0,

	.cmap_static	= 0,

};
@@ -314,10 +306,7 @@ static struct pxafb_mode_info generic_tft_320x240_mode = { 
static struct pxafb_mach_info generic_tft_320x240 = {

	.modes		= &generic_tft_320x240_mode,

	.num_modes	= 1,

	.lccr0		= (LCCR0_PAS),

	.lccr3		= (LCCR3_PixClkDiv(0x06) |

			   LCCR3_Acb(0xff) |

			   LCCR3_PCP),

	.lcd_conn	= LCD_COLOR_TFT_16BPP | LCD_AC_BIAS_FREQ(0xff),

	.cmap_inverse	= 0,

	.cmap_static	= 0,

};
@@ -341,9 +330,7 @@ static struct pxafb_mode_info generic_stn_640x480_mode = { 
static struct pxafb_mach_info generic_stn_640x480 = {

	.modes		= &generic_stn_640x480_mode,

	.num_modes	= 1,

	.lccr0		= 0,

	.lccr3		= (LCCR3_PixClkDiv(0x02) |

			   LCCR3_Acb(0xff)),

	.lcd_conn	= LCD_COLOR_STN_8BPP | LCD_AC_BIAS_FREQ(0xff),

	.cmap_inverse	= 0,

	.cmap_static	= 0,

};

arch/arm/mach-pxa/e400.c

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ static struct pxafb_mode_info e400_pxafb_mode_info = { 
static struct pxafb_mach_info e400_pxafb_mach_info = {

	.modes          = &e400_pxafb_mode_info,

	.num_modes      = 1,

	.lccr0          = LCCR0_Color | LCCR0_Sngl | LCCR0_Act,

	.lcd_conn	= LCD_COLOR_TFT_16BPP,

	.lccr3          = 0,

	.pxafb_backlight_power  = NULL,

};