Commit af7c951d authored by Russell King's avatar Russell King Committed by Russell King
Browse files

Merge branch 'for_rmk' of git://git.mnementh.co.uk/linux-2.6-im 

Merge branch 'pxa-eseries' into pxa-machines

Conflicts:

	arch/arm/mach-pxa/Makefile
parents cc513ac0 ebcce7b1

arch/arm/mach-pxa/e330.c

0 → 100644
+43 −0
Original line number Diff line number Diff line 
/*

 * Hardware definitions for the Toshiba eseries PDAs

 *

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

 *

 * This file is licensed under

 * the terms of the GNU General Public License version 2. This program

 * is licensed "as is" without any warranty of any kind, whether express

 * or implied.

 *

 */



#include <linux/kernel.h>

#include <linux/init.h>



#include <asm/setup.h>

#include <asm/mach/arch.h>

#include <asm/mach-types.h>



#include <mach/mfp-pxa25x.h>

#include <mach/hardware.h>

#include <mach/udc.h>



#include "generic.h"

#include "eseries.h"



static void __init e330_init(void)

{

	pxa_set_udc_info(&e7xx_udc_mach_info);

}



MACHINE_START(E330, "Toshiba e330")

	/* Maintainer: Ian Molton (spyro@f2s.com) */

	.phys_io	= 0x40000000,

	.io_pg_offst	= (io_p2v(0x40000000) >> 18) & 0xfffc,

	.boot_params	= 0xa0000100,

	.map_io		= pxa_map_io,

	.init_irq	= pxa25x_init_irq,

	.fixup		= eseries_fixup,

	.init_machine	= e330_init,

	.timer		= &pxa_timer,

MACHINE_END

arch/arm/mach-pxa/e350.c

0 → 100644
+43 −0
Original line number Diff line number Diff line 
/*

 * Hardware definitions for the Toshiba eseries PDAs

 *

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

 *

 * This file is licensed under

 * the terms of the GNU General Public License version 2. This program

 * is licensed "as is" without any warranty of any kind, whether express

 * or implied.

 *

 */



#include <linux/kernel.h>

#include <linux/init.h>



#include <asm/setup.h>

#include <asm/mach/arch.h>

#include <asm/mach-types.h>



#include <mach/mfp-pxa25x.h>

#include <mach/hardware.h>

#include <mach/udc.h>



#include "generic.h"

#include "eseries.h"



static void __init e350_init(void)

{

	pxa_set_udc_info(&e7xx_udc_mach_info);

}



MACHINE_START(E350, "Toshiba e350")

	/* Maintainer: Ian Molton (spyro@f2s.com) */

	.phys_io	= 0x40000000,

	.io_pg_offst	= (io_p2v(0x40000000) >> 18) & 0xfffc,

	.boot_params	= 0xa0000100,

	.map_io		= pxa_map_io,

	.init_irq	= pxa25x_init_irq,

	.fixup		= eseries_fixup,

	.init_machine	= e350_init,

	.timer		= &pxa_timer,

MACHINE_END

arch/arm/mach-pxa/e400_lcd.c→arch/arm/mach-pxa/e400.c

+94 −0
Original line number Diff line number Diff line 
/*

 * e400_lcd.c

 * Hardware definitions for the Toshiba eseries PDAs

 *

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

 * Copyright (c) 2003 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.

 * This file is licensed under

 * the terms of the GNU General Public License version 2. This program

 * is licensed "as is" without any warranty of any kind, whether express

 * or implied.

 *

 */



#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/module.h>



#include <asm/setup.h>

#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 <mach/udc.h>



#include "generic.h"

#include "eseries.h"



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



static struct pxafb_mode_info e400_pxafb_mode_info = {

	.pixclock       = 140703,
@@ -39,18 +51,44 @@ static struct pxafb_mach_info e400_pxafb_mach_info = { 
	.pxafb_backlight_power  = NULL,

};



static int __init e400_lcd_init(void)

{

	if (!machine_is_e400())

		return -ENODEV;

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



static unsigned long e400_pin_config[] __initdata = {

	/* Chip selects */

	GPIO15_nCS_1,   /* CS1 - Flash */

	GPIO80_nCS_4,   /* CS4 - TMIO */



	/* Clocks */

	GPIO12_32KHz,



	/* BTUART */

	GPIO42_BTUART_RXD,

	GPIO43_BTUART_TXD,

	GPIO44_BTUART_CTS,

	GPIO45_GPIO, /* Used by TMIO for #SUSPEND */



	/* wakeup */

	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);

	return 0;

	pxa_set_udc_info(&e7xx_udc_mach_info);

}



module_init(e400_lcd_init);



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

MODULE_DESCRIPTION("e400 lcd driver");

MODULE_LICENSE("GPLv2");

MACHINE_START(E400, "Toshiba e400")

	/* Maintainer: Ian Molton (spyro@f2s.com) */

	.phys_io	= 0x40000000,

	.io_pg_offst	= (io_p2v(0x40000000) >> 18) & 0xfffc,

	.boot_params	= 0xa0000100,

	.map_io		= pxa_map_io,

	.init_irq	= pxa25x_init_irq,

	.fixup		= eseries_fixup,

	.init_machine	= e400_init,

	.timer		= &pxa_timer,

MACHINE_END

arch/arm/mach-pxa/e740_lcd.c→arch/arm/mach-pxa/e740.c

+169 −0
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.

/*

 * Hardware definitions for the Toshiba eseries PDAs

 *

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

 * Copyright (c) 2003 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.

 * This file is licensed under

 * the terms of the GNU General Public License version 2. This program

 * is licensed "as is" without any warranty of any kind, whether express

 * or implied.

 *

 */



#include <linux/module.h>

#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/device.h>

#include <linux/fb.h>

#include <linux/err.h>

#include <linux/platform_device.h>

#include <linux/fb.h>



#include <video/w100fb.h>



#include <asm/setup.h>

#include <asm/mach/arch.h>

#include <asm/mach-types.h>



#include <video/w100fb.h>

#include <mach/mfp-pxa25x.h>

#include <mach/hardware.h>

#include <mach/udc.h>



#include "generic.h"

#include "eseries.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

*/



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



static struct w100_gen_regs e740_lcd_regs = {

	.lcd_format =            0x00008023,
@@ -66,7 +65,6 @@ static struct w100_mode e740_lcd_mode = { 
	.crtc_ps1_active =       0x41060010,

};





static struct w100_gpio_regs e740_w100_gpio_info = {

	.init_data1 = 0x21002103,

	.gpio_dir1  = 0xffffdeff,
@@ -93,9 +91,6 @@ static struct resource e740_fb_resources[] = { 
	},

};



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





static struct platform_device e740_fb_device = {

	.name           = "w100fb",

	.id             = -1,
@@ -106,18 +101,69 @@ static struct platform_device e740_fb_device = { 
	.resource       = e740_fb_resources,

};



static int e740_lcd_init(void)

{

	int ret;

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



static unsigned long e740_pin_config[] __initdata = {

	/* Chip selects */

	GPIO15_nCS_1,   /* CS1 - Flash */

	GPIO79_nCS_3,   /* CS3 - IMAGEON */

	GPIO80_nCS_4,   /* CS4 - TMIO */



	/* Clocks */

	GPIO12_32KHz,



	/* BTUART */

	GPIO42_BTUART_RXD,

	GPIO43_BTUART_TXD,

	GPIO44_BTUART_CTS,

	GPIO45_GPIO, /* Used by TMIO for #SUSPEND */



	/* PC Card */

	GPIO8_GPIO,   /* CD0 */

	GPIO44_GPIO,  /* CD1 */

	GPIO11_GPIO,  /* IRQ0 */

	GPIO6_GPIO,   /* IRQ1 */

	GPIO27_GPIO,  /* RST0 */

	GPIO24_GPIO,  /* RST1 */

	GPIO20_GPIO,  /* PWR0 */

	GPIO23_GPIO,  /* PWR1 */

	GPIO48_nPOE,

	GPIO49_nPWE,

	GPIO50_nPIOR,

	GPIO51_nPIOW,

	GPIO52_nPCE_1,

	GPIO53_nPCE_2,

	GPIO54_nPSKTSEL,

	GPIO55_nPREG,

	GPIO56_nPWAIT,

	GPIO57_nIOIS16,



	/* wakeup */

	GPIO0_GPIO | WAKEUP_ON_EDGE_RISE,

};



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



	if (!machine_is_e740())

		return -ENODEV;

static struct platform_device *devices[] __initdata = {

	&e740_fb_device,

};



	return platform_device_register(&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));

	pxa_set_udc_info(&e7xx_udc_mach_info);

}



module_init(e740_lcd_init);

MACHINE_START(E740, "Toshiba e740")

	/* Maintainer: Ian Molton (spyro@f2s.com) */

	.phys_io	= 0x40000000,

	.io_pg_offst	= (io_p2v(0x40000000) >> 18) & 0xfffc,

	.boot_params	= 0xa0000100,

	.map_io		= pxa_map_io,

	.init_irq	= pxa25x_init_irq,

	.fixup		= eseries_fixup,

	.init_machine	= e740_init,

	.timer		= &pxa_timer,

MACHINE_END

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

MODULE_DESCRIPTION("e740 lcd driver");

MODULE_LICENSE("GPLv2");

arch/arm/mach-pxa/e750_lcd.c→arch/arm/mach-pxa/e750.c

+42 −25
Original line number Diff line number Diff line 
/* e750_lcd.c

/*

 * Hardware definitions for the Toshiba eseries PDAs

 *

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

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

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

 *

 * (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.

 * This file is licensed under

 * the terms of the GNU General Public License version 2. This program

 * is licensed "as is" without any warranty of any kind, whether express

 * or implied.

 *

 */



#include <linux/module.h>

#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/device.h>

#include <linux/fb.h>

#include <linux/err.h>

#include <linux/platform_device.h>

#include <linux/fb.h>



#include <video/w100fb.h>



#include <asm/setup.h>

#include <asm/mach/arch.h>

#include <asm/mach-types.h>



#include <video/w100fb.h>

#include <mach/mfp-pxa25x.h>

#include <mach/hardware.h>

#include <mach/udc.h>



#include "generic.h"

#include "eseries.h"



/* ---------------------- E750 LCD definitions -------------------- */



static struct w100_gen_regs e750_lcd_regs = {

	.lcd_format =            0x00008003,
@@ -54,7 +64,6 @@ static struct w100_mode e750_lcd_mode = { 
	.sysclk_src     = CLK_SRC_PLL,

};





static struct w100_gpio_regs e750_w100_gpio_info = {

	.init_data1 = 0x01192f1b,

	.gpio_dir1  = 0xd5ffdeff,
@@ -81,9 +90,6 @@ static struct resource e750_fb_resources[] = { 
	},

};



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





static struct platform_device e750_fb_device = {

	.name           = "w100fb",

	.id             = -1,
@@ -94,16 +100,27 @@ static struct platform_device e750_fb_device = { 
	.resource       = e750_fb_resources,

};



static int e750_lcd_init(void)

{

	if (!machine_is_e750())

		return -ENODEV;

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



	return platform_device_register(&e750_fb_device);

static struct platform_device *devices[] __initdata = {

	&e750_fb_device,

};



static void __init e750_init(void)

{

	platform_add_devices(devices, ARRAY_SIZE(devices));

	pxa_set_udc_info(&e7xx_udc_mach_info);

}



module_init(e750_lcd_init);

MACHINE_START(E750, "Toshiba e750")

	/* Maintainer: Ian Molton (spyro@f2s.com) */

	.phys_io	= 0x40000000,

	.io_pg_offst	= (io_p2v(0x40000000) >> 18) & 0xfffc,

	.boot_params	= 0xa0000100,

	.map_io		= pxa_map_io,

	.init_irq	= pxa25x_init_irq,

	.fixup		= eseries_fixup,

	.init_machine	= e750_init,

	.timer		= &pxa_timer,

MACHINE_END

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

MODULE_DESCRIPTION("e750 lcd driver");

MODULE_LICENSE("GPLv2");