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

Commit 1f7f569c 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 into devel

parents a02f45cf e38a9707

arch/arm/mach-pxa/e330.c

+35 −1
Original line number Diff line number Diff line 
/*

 * Hardware definitions for the Toshiba eseries PDAs

 * Hardware definitions for the Toshiba e330 PDAs

 *

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

 *
@@ -12,6 +12,9 @@ 


#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/clk.h>

#include <linux/platform_device.h>

#include <linux/mfd/tc6387xb.h>



#include <asm/setup.h>

#include <asm/mach/arch.h>
@@ -19,13 +22,44 @@ 


#include <mach/mfp-pxa25x.h>

#include <mach/hardware.h>

#include <mach/pxa-regs.h>

#include <mach/eseries-gpio.h>

#include <mach/udc.h>



#include "generic.h"

#include "eseries.h"

#include "clock.h"



/* -------------------- e330 tc6387xb parameters -------------------- */



static struct tc6387xb_platform_data e330_tc6387xb_info = {

	.enable   = &eseries_tmio_enable,

	.disable  = &eseries_tmio_disable,

	.suspend  = &eseries_tmio_suspend,

	.resume   = &eseries_tmio_resume,

};



static struct platform_device e330_tc6387xb_device = {

	.name           = "tc6387xb",

	.id             = -1,

	.dev            = {

		.platform_data = &e330_tc6387xb_info,

	},

	.num_resources = 2,

	.resource      = eseries_tmio_resources,

};



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



static struct platform_device *devices[] __initdata = {

	&e330_tc6387xb_device,

};



static void __init e330_init(void)

{

	eseries_register_clks();

	eseries_get_tmio_gpios();

	platform_add_devices(devices, ARRAY_SIZE(devices));

	pxa_set_udc_info(&e7xx_udc_mach_info);

}

arch/arm/mach-pxa/e350.c

+35 −1
Original line number Diff line number Diff line 
/*

 * Hardware definitions for the Toshiba eseries PDAs

 * Hardware definitions for the Toshiba e350 PDAs

 *

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

 *
@@ -12,20 +12,54 @@ 


#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/clk.h>

#include <linux/platform_device.h>

#include <linux/mfd/t7l66xb.h>



#include <asm/setup.h>

#include <asm/mach/arch.h>

#include <asm/mach-types.h>



#include <mach/mfp-pxa25x.h>

#include <mach/pxa-regs.h>

#include <mach/hardware.h>

#include <mach/eseries-gpio.h>

#include <mach/udc.h>



#include "generic.h"

#include "eseries.h"

#include "clock.h"



/* -------------------- e350 t7l66xb parameters -------------------- */



static struct t7l66xb_platform_data e350_t7l66xb_info = {

	.irq_base               = IRQ_BOARD_START,

	.enable                 = &eseries_tmio_enable,

	.suspend                = &eseries_tmio_suspend,

	.resume                 = &eseries_tmio_resume,

};



static struct platform_device e350_t7l66xb_device = {

	.name           = "t7l66xb",

	.id             = -1,

	.dev            = {

		.platform_data = &e350_t7l66xb_info,

	},

	.num_resources = 2,

	.resource      = eseries_tmio_resources,

};



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



static struct platform_device *devices[] __initdata = {

	&e350_t7l66xb_device,

};



static void __init e350_init(void)

{

	eseries_register_clks();

	eseries_get_tmio_gpios();

	platform_add_devices(devices, ARRAY_SIZE(devices));

	pxa_set_udc_info(&e7xx_udc_mach_info);

}

arch/arm/mach-pxa/e400.c

+62 −3
Original line number Diff line number Diff line
@@ -12,20 +12,26 @@ 


#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/clk.h>

#include <linux/platform_device.h>

#include <linux/mfd/t7l66xb.h>

#include <linux/mtd/nand.h>

#include <linux/mtd/partitions.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/pxa-regs.h>

#include <mach/hardware.h>



#include <mach/eseries-gpio.h>

#include <mach/pxafb.h>

#include <mach/udc.h>



#include "generic.h"

#include "eseries.h"

#include "clock.h"



/* ------------------------ E400 LCD definitions ------------------------ */
@@ -65,7 +71,10 @@ static unsigned long e400_pin_config[] __initdata = { 
	GPIO42_BTUART_RXD,

	GPIO43_BTUART_TXD,

	GPIO44_BTUART_CTS,

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



	/* TMIO controller */

	GPIO19_GPIO, /* t7l66xb #PCLR */

	GPIO45_GPIO, /* t7l66xb #SUSPEND (NOT BTUART!) */



	/* wakeup */

	GPIO0_GPIO | WAKEUP_ON_EDGE_RISE,
@@ -73,10 +82,60 @@ static unsigned long e400_pin_config[] __initdata = { 


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



static struct mtd_partition partition_a = {

	.name = "Internal NAND flash",

	.offset =  0,

	.size =  MTDPART_SIZ_FULL,

};



static uint8_t scan_ff_pattern[] = { 0xff, 0xff };



static struct nand_bbt_descr e400_t7l66xb_nand_bbt = {

	.options = 0,

	.offs = 4,

	.len = 2,

	.pattern = scan_ff_pattern

};



static struct tmio_nand_data e400_t7l66xb_nand_config = {

	.num_partitions = 1,

	.partition = &partition_a,

	.badblock_pattern = &e400_t7l66xb_nand_bbt,

};



static struct t7l66xb_platform_data e400_t7l66xb_info = {

	.irq_base 		= IRQ_BOARD_START,

	.enable                 = &eseries_tmio_enable,

	.suspend                = &eseries_tmio_suspend,

	.resume                 = &eseries_tmio_resume,



	.nand_data              = &e400_t7l66xb_nand_config,

};



static struct platform_device e400_t7l66xb_device = {

	.name           = "t7l66xb",

	.id             = -1,

	.dev            = {

		.platform_data = &e400_t7l66xb_info,

	},

	.num_resources = 2,

	.resource      = eseries_tmio_resources,

};



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



static struct platform_device *devices[] __initdata = {

	&e400_t7l66xb_device,

};



static void __init e400_init(void)

{

	pxa2xx_mfp_config(ARRAY_AND_SIZE(e400_pin_config));

	/* Fixme - e400 may have a switched clock */

	eseries_register_clks();

	eseries_get_tmio_gpios();

	set_pxa_fb_info(&e400_pxafb_mach_info);

	platform_add_devices(devices, ARRAY_SIZE(devices));

	pxa_set_udc_info(&e7xx_udc_mach_info);

}

arch/arm/mach-pxa/e740.c

+44 −2
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ 
#include <linux/device.h>

#include <linux/platform_device.h>

#include <linux/fb.h>

#include <linux/clk.h>

#include <linux/mfd/t7l66xb.h>



#include <video/w100fb.h>
@@ -23,12 +25,16 @@ 
#include <asm/mach-types.h>



#include <mach/mfp-pxa25x.h>

#include <mach/pxa-regs.h>

#include <mach/hardware.h>

#include <mach/eseries-gpio.h>

#include <mach/udc.h>

#include <mach/irda.h>



#include "generic.h"

#include "eseries.h"



#include "clock.h"

#include "devices.h"



/* ------------------------ e740 video support --------------------------- */
@@ -116,7 +122,17 @@ static unsigned long e740_pin_config[] __initdata = { 
	GPIO42_BTUART_RXD,

	GPIO43_BTUART_TXD,

	GPIO44_BTUART_CTS,

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



	/* TMIO controller */

	GPIO19_GPIO, /* t7l66xb #PCLR */

	GPIO45_GPIO, /* t7l66xb #SUSPEND (NOT BTUART!) */



	/* UDC */

	GPIO13_GPIO,

	GPIO3_GPIO,



	/* IrDA */

	GPIO38_GPIO | MFP_LPM_DRIVE_HIGH,



	/* PC Card */

	GPIO8_GPIO,   /* CD0 */
@@ -142,17 +158,43 @@ static unsigned long e740_pin_config[] __initdata = { 
	GPIO0_GPIO | WAKEUP_ON_EDGE_RISE,

};



/* -------------------- e740 t7l66xb parameters -------------------- */



static struct t7l66xb_platform_data e740_t7l66xb_info = {

	.irq_base 		= IRQ_BOARD_START,

	.enable                 = &eseries_tmio_enable,

	.suspend                = &eseries_tmio_suspend,

	.resume                 = &eseries_tmio_resume,

};



static struct platform_device e740_t7l66xb_device = {

	.name           = "t7l66xb",

	.id             = -1,

	.dev            = {

		.platform_data = &e740_t7l66xb_info,

	},

	.num_resources = 2,

	.resource      = eseries_tmio_resources,

};



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



static struct platform_device *devices[] __initdata = {

	&e740_fb_device,

	&e740_t7l66xb_device,

};



static void __init e740_init(void)

{

	pxa2xx_mfp_config(ARRAY_AND_SIZE(e740_pin_config));

	eseries_register_clks();

	clk_add_alias("CLK_CK48M", &e740_t7l66xb_device.dev,

			"UDCCLK", &pxa25x_device_udc.dev),

	eseries_get_tmio_gpios();

	platform_add_devices(devices, ARRAY_SIZE(devices));

	pxa_set_udc_info(&e7xx_udc_mach_info);

	e7xx_irda_init();

	pxa_set_ficp_info(&e7xx_ficp_platform_data);

}



MACHINE_START(E740, "Toshiba e740")

arch/arm/mach-pxa/e750.c

+35 −1
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/device.h>

#include <linux/platform_device.h>

#include <linux/fb.h>

#include <linux/mfd/tc6393xb.h>



#include <video/w100fb.h>
@@ -23,11 +24,15 @@ 
#include <asm/mach-types.h>



#include <mach/mfp-pxa25x.h>

#include <mach/pxa-regs.h>

#include <mach/hardware.h>

#include <mach/eseries-gpio.h>

#include <mach/udc.h>

#include <mach/irda.h>



#include "generic.h"

#include "eseries.h"

#include "clock.h"



/* ---------------------- E750 LCD definitions -------------------- */
@@ -100,16 +105,45 @@ static struct platform_device e750_fb_device = { 
	.resource       = e750_fb_resources,

};



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

/* ----------------- e750 tc6393xb parameters ------------------ */



static struct tc6393xb_platform_data e750_tc6393xb_info = {

	.irq_base       = IRQ_BOARD_START,

	.scr_pll2cr     = 0x0cc1,

	.scr_gper       = 0,

	.gpio_base      = -1,

	.suspend        = &eseries_tmio_suspend,

	.resume         = &eseries_tmio_resume,

	.enable         = &eseries_tmio_enable,

	.disable        = &eseries_tmio_disable,

};



static struct platform_device e750_tc6393xb_device = {

	.name           = "tc6393xb",

	.id             = -1,

	.dev            = {

		.platform_data = &e750_tc6393xb_info,

	},

	.num_resources = 2,

	.resource      = eseries_tmio_resources,

};



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



static struct platform_device *devices[] __initdata = {

	&e750_fb_device,

	&e750_tc6393xb_device,

};



static void __init e750_init(void)

{

	clk_add_alias("CLK_CK3P6MI", &e750_tc6393xb_device.dev,

			"GPIO11_CLK", NULL),

	eseries_get_tmio_gpios();

	platform_add_devices(devices, ARRAY_SIZE(devices));

	pxa_set_udc_info(&e7xx_udc_mach_info);

	e7xx_irda_init();

	pxa_set_ficp_info(&e7xx_ficp_platform_data);

}



MACHINE_START(E750, "Toshiba e750")