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

Commit 0ec3cf69 authored by Ian Molton's avatar Ian Molton
Browse files

[ARM] eseries: move LCD defs into machine files 



This patch removes the seperate files used for the LCD definitions on
e-series and places the definitions into the machine specific files.

Signed-off-by: default avatarIan Molton <spyro@f2s.com>
parent 7dc96414

arch/arm/mach-pxa/Makefile

+4 −4
Original line number Diff line number Diff line
@@ -40,10 +40,10 @@ obj-$(CONFIG_MACH_MAGICIAN) += magician.o 
obj-$(CONFIG_ARCH_PXA_ESERIES)	+= eseries.o eseries_udc.o

obj-$(CONFIG_MACH_E330)		+= e330.o

obj-$(CONFIG_MACH_E350)		+= e350.o

obj-$(CONFIG_MACH_E740)		+= e740.o e740_lcd.o

obj-$(CONFIG_MACH_E750)		+= e750.o e750_lcd.o

obj-$(CONFIG_MACH_E400)		+= e400.o e400_lcd.o

obj-$(CONFIG_MACH_E800)		+= e800.o e800_lcd.o

obj-$(CONFIG_MACH_E740)		+= e740.o

obj-$(CONFIG_MACH_E750)		+= e750.o

obj-$(CONFIG_MACH_E400)		+= e400.o

obj-$(CONFIG_MACH_E800)		+= e800.o

obj-$(CONFIG_MACH_PALMTX)	+= palmtx.o



ifeq ($(CONFIG_MACH_ZYLONITE),y)

arch/arm/mach-pxa/e400.c

+32 −0
Original line number Diff line number Diff line
@@ -17,12 +17,41 @@ 
#include <asm/mach/arch.h>

#include <asm/mach-types.h>



#include <mach/pxa-regs.h>

#include <mach/mfp-pxa25x.h>

#include <mach/hardware.h>



#include <mach/pxafb.h>



#include "generic.h"

#include "eseries.h"



/* ------------------------ E400 LCD definitions ------------------------ */



static struct pxafb_mode_info e400_pxafb_mode_info = {

	.pixclock       = 140703,

	.xres           = 240,

	.yres           = 320,

	.bpp            = 16,

	.hsync_len      = 4,

	.left_margin    = 28,

	.right_margin   = 8,

	.vsync_len      = 3,

	.upper_margin   = 5,

	.lower_margin   = 6,

	.sync           = 0,

};



static struct pxafb_mach_info e400_pxafb_mach_info = {

	.modes          = &e400_pxafb_mode_info,

	.num_modes      = 1,

	.lccr0          = LCCR0_Color | LCCR0_Sngl | LCCR0_Act,

	.lccr3          = 0,

	.pxafb_backlight_power  = NULL,

};



/* ------------------------ E400 MFP config ----------------------------- */



static unsigned long e400_pin_config[] __initdata = {

	/* Chip selects */

	GPIO15_nCS_1,   /* CS1 - Flash */
@@ -41,9 +70,12 @@ static unsigned long e400_pin_config[] __initdata = { 
	GPIO0_GPIO | WAKEUP_ON_EDGE_RISE,

};



/* ---------------------------------------------------------------------- */



static void __init e400_init(void)

{

	pxa2xx_mfp_config(ARRAY_AND_SIZE(e400_pin_config));

	set_pxa_fb_info(&e400_pxafb_mach_info);

}



MACHINE_START(E400, "Toshiba e400")

arch/arm/mach-pxa/e400_lcd.c

deleted100644 → 0
+0 −56
Original line number Diff line number Diff line 
/*

 * e400_lcd.c

 *

 * (c) 2005 Ian Molton <spyro@f2s.com>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 *

 */



#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/module.h>



#include <asm/mach-types.h>

#include <mach/pxa-regs.h>

#include <mach/pxafb.h>



static struct pxafb_mode_info e400_pxafb_mode_info = {

	.pixclock       = 140703,

	.xres           = 240,

	.yres           = 320,

	.bpp            = 16,

	.hsync_len      = 4,

	.left_margin    = 28,

	.right_margin   = 8,

	.vsync_len      = 3,

	.upper_margin   = 5,

	.lower_margin   = 6,

	.sync           = 0,

};



static struct pxafb_mach_info e400_pxafb_mach_info = {

	.modes          = &e400_pxafb_mode_info,

	.num_modes      = 1,

	.lccr0          = LCCR0_Color | LCCR0_Sngl | LCCR0_Act,

	.lccr3          = 0,

	.pxafb_backlight_power  = NULL,

};



static int __init e400_lcd_init(void)

{

	if (!machine_is_e400())

		return -ENODEV;



	set_pxa_fb_info(&e400_pxafb_mach_info);

	return 0;

}



module_init(e400_lcd_init);



MODULE_AUTHOR("Ian Molton <spyro@f2s.com>");

MODULE_DESCRIPTION("e400 lcd driver");

MODULE_LICENSE("GPLv2");

arch/arm/mach-pxa/e740.c

+86 −0
Original line number Diff line number Diff line
@@ -12,6 +12,11 @@ 


#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/device.h>

#include <linux/platform_device.h>

#include <linux/fb.h>



#include <video/w100fb.h>



#include <asm/setup.h>

#include <asm/mach/arch.h>
@@ -23,6 +28,80 @@ 
#include "generic.h"

#include "eseries.h"





/* ------------------------ e740 video support --------------------------- */



static struct w100_gen_regs e740_lcd_regs = {

	.lcd_format =            0x00008023,

	.lcdd_cntl1 =            0x0f000000,

	.lcdd_cntl2 =            0x0003ffff,

	.genlcd_cntl1 =          0x00ffff03,

	.genlcd_cntl2 =          0x003c0f03,

	.genlcd_cntl3 =          0x000143aa,

};



static struct w100_mode e740_lcd_mode = {

	.xres            = 240,

	.yres            = 320,

	.left_margin     = 20,

	.right_margin    = 28,

	.upper_margin    = 9,

	.lower_margin    = 8,

	.crtc_ss         = 0x80140013,

	.crtc_ls         = 0x81150110,

	.crtc_gs         = 0x80050005,

	.crtc_vpos_gs    = 0x000a0009,

	.crtc_rev        = 0x0040010a,

	.crtc_dclk       = 0xa906000a,

	.crtc_gclk       = 0x80050108,

	.crtc_goe        = 0x80050108,

	.pll_freq        = 57,

	.pixclk_divider         = 4,

	.pixclk_divider_rotated = 4,

	.pixclk_src     = CLK_SRC_XTAL,

	.sysclk_divider  = 1,

	.sysclk_src     = CLK_SRC_PLL,

	.crtc_ps1_active =       0x41060010,

};



static struct w100_gpio_regs e740_w100_gpio_info = {

	.init_data1 = 0x21002103,

	.gpio_dir1  = 0xffffdeff,

	.gpio_oe1   = 0x03c00643,

	.init_data2 = 0x003f003f,

	.gpio_dir2  = 0xffffffff,

	.gpio_oe2   = 0x000000ff,

};



static struct w100fb_mach_info e740_fb_info = {

	.modelist   = &e740_lcd_mode,

	.num_modes  = 1,

	.regs       = &e740_lcd_regs,

	.gpio       = &e740_w100_gpio_info,

	.xtal_freq = 14318000,

	.xtal_dbl   = 1,

};



static struct resource e740_fb_resources[] = {

	[0] = {

		.start          = 0x0c000000,

		.end            = 0x0cffffff,

		.flags          = IORESOURCE_MEM,

	},

};



static struct platform_device e740_fb_device = {

	.name           = "w100fb",

	.id             = -1,

	.dev            = {

		.platform_data  = &e740_fb_info,

	},

	.num_resources  = ARRAY_SIZE(e740_fb_resources),

	.resource       = e740_fb_resources,

};



/* --------------------------- MFP Pin config -------------------------- */



static unsigned long e740_pin_config[] __initdata = {

	/* Chip selects */

	GPIO15_nCS_1,   /* CS1 - Flash */
@@ -62,9 +141,16 @@ static unsigned long e740_pin_config[] __initdata = { 
	GPIO0_GPIO | WAKEUP_ON_EDGE_RISE,

};



/* ----------------------------------------------------------------------- */



static struct platform_device *devices[] __initdata = {

	&e740_fb_device,

};



static void __init e740_init(void)

{

	pxa2xx_mfp_config(ARRAY_AND_SIZE(e740_pin_config));

	platform_add_devices(devices, ARRAY_SIZE(devices));

}



MACHINE_START(E740, "Toshiba e740")

arch/arm/mach-pxa/e740_lcd.c

deleted100644 → 0
+0 −123
Original line number Diff line number Diff line 
/* e740_lcd.c

 *

 * This file contains the definitions for the LCD timings and functions

 * to control the LCD power / frontlighting via the w100fb driver.

 *

 * (c) 2005 Ian Molton <spyro@f2s.com>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 *

 */



#include <linux/module.h>

#include <linux/device.h>

#include <linux/fb.h>

#include <linux/err.h>

#include <linux/platform_device.h>



#include <asm/mach-types.h>



#include <video/w100fb.h>



/*

**potential** shutdown routine - to be investigated

devmem2 0x0c010528 w 0xff3fff00

devmem2 0x0c010190 w 0x7FFF8000

devmem2 0x0c0101b0 w 0x00FF0000

devmem2 0x0c01008c w 0x00000000

devmem2 0x0c010080 w 0x000000bf

devmem2 0x0c010098 w 0x00000015

devmem2 0x0c010088 w 0x4b000204

devmem2 0x0c010098 w 0x0000001d

*/



static struct w100_gen_regs e740_lcd_regs = {

	.lcd_format =            0x00008023,

	.lcdd_cntl1 =            0x0f000000,

	.lcdd_cntl2 =            0x0003ffff,

	.genlcd_cntl1 =          0x00ffff03,

	.genlcd_cntl2 =          0x003c0f03,

	.genlcd_cntl3 =          0x000143aa,

};



static struct w100_mode e740_lcd_mode = {

	.xres            = 240,

	.yres            = 320,

	.left_margin     = 20,

	.right_margin    = 28,

	.upper_margin    = 9,

	.lower_margin    = 8,

	.crtc_ss         = 0x80140013,

	.crtc_ls         = 0x81150110,

	.crtc_gs         = 0x80050005,

	.crtc_vpos_gs    = 0x000a0009,

	.crtc_rev        = 0x0040010a,

	.crtc_dclk       = 0xa906000a,

	.crtc_gclk       = 0x80050108,

	.crtc_goe        = 0x80050108,

	.pll_freq        = 57,

	.pixclk_divider         = 4,

	.pixclk_divider_rotated = 4,

	.pixclk_src     = CLK_SRC_XTAL,

	.sysclk_divider  = 1,

	.sysclk_src     = CLK_SRC_PLL,

	.crtc_ps1_active =       0x41060010,

};





static struct w100_gpio_regs e740_w100_gpio_info = {

	.init_data1 = 0x21002103,

	.gpio_dir1  = 0xffffdeff,

	.gpio_oe1   = 0x03c00643,

	.init_data2 = 0x003f003f,

	.gpio_dir2  = 0xffffffff,

	.gpio_oe2   = 0x000000ff,

};



static struct w100fb_mach_info e740_fb_info = {

	.modelist   = &e740_lcd_mode,

	.num_modes  = 1,

	.regs       = &e740_lcd_regs,

	.gpio       = &e740_w100_gpio_info,

	.xtal_freq = 14318000,

	.xtal_dbl   = 1,

};



static struct resource e740_fb_resources[] = {

	[0] = {

		.start          = 0x0c000000,

		.end            = 0x0cffffff,

		.flags          = IORESOURCE_MEM,

	},

};



/* ----------------------- device declarations -------------------------- */





static struct platform_device e740_fb_device = {

	.name           = "w100fb",

	.id             = -1,

	.dev            = {

		.platform_data  = &e740_fb_info,

	},

	.num_resources  = ARRAY_SIZE(e740_fb_resources),

	.resource       = e740_fb_resources,

};



static int e740_lcd_init(void)

{

	int ret;



	if (!machine_is_e740())

		return -ENODEV;



	return platform_device_register(&e740_fb_device);

}



module_init(e740_lcd_init);



MODULE_AUTHOR("Ian Molton <spyro@f2s.com>");

MODULE_DESCRIPTION("e740 lcd driver");

MODULE_LICENSE("GPLv2");