Skip to content

L
linux-davinci
Commit af7c951d authored by Russell King's avatar Russell King Committed by Russell King
Browse files
Options

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
Show whitespace changes
Inline Side-by-side
Showing with 456 additions and 257 deletions
arch/arm/mach-pxa/e330.c 0 → 100644
View file @ af7c951d
/*
* 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
View file @ af7c951d
/*
* 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
View file @ af7c951d
/* /*
* 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 * This file is licensed under
* it under the terms of the GNU General Public License version 2 as * the terms of the GNU General Public License version 2. This program
* published by the Free Software Foundation. * is licensed "as is" without any warranty of any kind, whether express
* or implied.
* *
*/ */
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/module.h>
#include <asm/setup.h>
#include <asm/mach/arch.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <mach/pxa-regs.h> #include <mach/pxa-regs.h>
#include <mach/mfp-pxa25x.h>
#include <mach/hardware.h>
#include <mach/pxafb.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 = { static struct pxafb_mode_info e400_pxafb_mode_info = {
.pixclock = 140703, .pixclock = 140703,
...@@ -39,18 +51,44 @@ static struct pxafb_mach_info e400_pxafb_mach_info = { ...@@ -39,18 +51,44 @@ static struct pxafb_mach_info e400_pxafb_mach_info = {
.pxafb_backlight_power = NULL, .pxafb_backlight_power = NULL,
}; };
static int __init e400_lcd_init(void) /* ------------------------ E400 MFP config ----------------------------- */
{
if (!machine_is_e400()) static unsigned long e400_pin_config[] __initdata = {
return -ENODEV; /* 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); set_pxa_fb_info(&e400_pxafb_mach_info);
return 0; pxa_set_udc_info(&e7xx_udc_mach_info);
} }
module_init(e400_lcd_init); MACHINE_START(E400, "Toshiba e400")
/* Maintainer: Ian Molton (spyro@f2s.com) */
MODULE_AUTHOR("Ian Molton <spyro@f2s.com>"); .phys_io = 0x40000000,
MODULE_DESCRIPTION("e400 lcd driver"); .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
MODULE_LICENSE("GPLv2"); .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
View file @ af7c951d
/* e740_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.
* *
* (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 * This file is licensed under
* it under the terms of the GNU General Public License version 2 as * the terms of the GNU General Public License version 2. This program
* published by the Free Software Foundation. * 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/device.h>
#include <linux/fb.h>
#include <linux/err.h>
#include <linux/platform_device.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 <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 /* ------------------------ e740 video support --------------------------- */
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 = { static struct w100_gen_regs e740_lcd_regs = {
.lcd_format = 0x00008023, .lcd_format = 0x00008023,
...@@ -66,7 +65,6 @@ static struct w100_mode e740_lcd_mode = { ...@@ -66,7 +65,6 @@ static struct w100_mode e740_lcd_mode = {
.crtc_ps1_active = 0x41060010, .crtc_ps1_active = 0x41060010,
}; };
static struct w100_gpio_regs e740_w100_gpio_info = { static struct w100_gpio_regs e740_w100_gpio_info = {
.init_data1 = 0x21002103, .init_data1 = 0x21002103,
.gpio_dir1 = 0xffffdeff, .gpio_dir1 = 0xffffdeff,
...@@ -93,9 +91,6 @@ static struct resource e740_fb_resources[] = { ...@@ -93,9 +91,6 @@ static struct resource e740_fb_resources[] = {
}, },
}; };
/* ----------------------- device declarations -------------------------- */
static struct platform_device e740_fb_device = { static struct platform_device e740_fb_device = {
.name = "w100fb", .name = "w100fb",
.id = -1, .id = -1,
...@@ -106,18 +101,69 @@ static struct platform_device e740_fb_device = { ...@@ -106,18 +101,69 @@ static struct platform_device e740_fb_device = {
.resource = e740_fb_resources, .resource = e740_fb_resources,
}; };
static int e740_lcd_init(void) /* --------------------------- MFP Pin config -------------------------- */
{
int ret; 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()) static struct platform_device *devices[] __initdata = {
return -ENODEV; &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
View file @ af7c951d
/* e750_lcd.c /*
* Hardware definitions for the Toshiba eseries PDAs
* *
* This file contains the definitions for the LCD timings and functions * Copyright (c) 2003 Ian Molton <spyro@f2s.com>
* to control the LCD power / frontlighting via the w100fb driver.
* *
* (c) 2005 Ian Molton <spyro@f2s.com> * This file is licensed under
* * the terms of the GNU General Public License version 2. This program
* This program is free software; you can redistribute it and/or modify * is licensed "as is" without any warranty of any kind, whether express
* it under the terms of the GNU General Public License version 2 as * or implied.
* published by the Free Software Foundation.
* *
*/ */
#include <linux/module.h> #include <linux/kernel.h>
#include <linux/init.h>
#include <linux/device.h> #include <linux/device.h>
#include <linux/fb.h>
#include <linux/err.h>
#include <linux/platform_device.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 <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 = { static struct w100_gen_regs e750_lcd_regs = {
.lcd_format = 0x00008003, .lcd_format = 0x00008003,
...@@ -54,7 +64,6 @@ static struct w100_mode e750_lcd_mode = { ...@@ -54,7 +64,6 @@ static struct w100_mode e750_lcd_mode = {
.sysclk_src = CLK_SRC_PLL, .sysclk_src = CLK_SRC_PLL,
}; };
static struct w100_gpio_regs e750_w100_gpio_info = { static struct w100_gpio_regs e750_w100_gpio_info = {
.init_data1 = 0x01192f1b, .init_data1 = 0x01192f1b,
.gpio_dir1 = 0xd5ffdeff, .gpio_dir1 = 0xd5ffdeff,
...@@ -81,9 +90,6 @@ static struct resource e750_fb_resources[] = { ...@@ -81,9 +90,6 @@ static struct resource e750_fb_resources[] = {
}, },
}; };
/* ----------------------- device declarations -------------------------- */
static struct platform_device e750_fb_device = { static struct platform_device e750_fb_device = {
.name = "w100fb", .name = "w100fb",
.id = -1, .id = -1,
...@@ -94,16 +100,27 @@ static struct platform_device e750_fb_device = { ...@@ -94,16 +100,27 @@ static struct platform_device e750_fb_device = {
.resource = e750_fb_resources, .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");
arch/arm/mach-pxa/e800_lcd.c → arch/arm/mach-pxa/e800.c
View file @ af7c951d
/* e800_lcd.c /*
* Hardware definitions for the Toshiba eseries PDAs
* *
* This file contains the definitions for the LCD timings and functions * Copyright (c) 2003 Ian Molton <spyro@f2s.com>
* to control the LCD power / frontlighting via the w100fb driver.
* *
* (c) 2005 Ian Molton <spyro@f2s.com> * This file is licensed under
* * the terms of the GNU General Public License version 2. This program
* This program is free software; you can redistribute it and/or modify * is licensed "as is" without any warranty of any kind, whether express
* it under the terms of the GNU General Public License version 2 as * or implied.
* published by the Free Software Foundation.
* *
*/ */
#include <linux/module.h> #include <linux/kernel.h>
#include <linux/init.h>
#include <linux/device.h> #include <linux/device.h>
#include <linux/fb.h>
#include <linux/err.h>
#include <linux/platform_device.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 <asm/mach-types.h>
#include <video/w100fb.h> #include <mach/mfp-pxa25x.h>
#include <mach/hardware.h>
#include <mach/eseries-gpio.h>
#include <mach/udc.h>
#include "generic.h"
#include "eseries.h"
/* ------------------------ e800 LCD definitions ------------------------- */
static struct w100_gen_regs e800_lcd_regs = { static struct w100_gen_regs e800_lcd_regs = {
.lcd_format = 0x00008003, .lcd_format = 0x00008003,
...@@ -71,8 +82,8 @@ static struct w100_mode e800_lcd_mode[2] = { ...@@ -71,8 +82,8 @@ static struct w100_mode e800_lcd_mode[2] = {
.crtc_goe = 0x80cc0015, .crtc_goe = 0x80cc0015,
.crtc_ps1_active = 0x00000000, .crtc_ps1_active = 0x00000000,
.pll_freq = 100, .pll_freq = 100,
.pixclk_divider = 6, /* Wince uses 14 which gives a 7MHz pclk. */ .pixclk_divider = 6, /* Wince uses 14 which gives a */
.pixclk_divider_rotated = 6, /* we want a 14MHz one (much nicer to look at) */ .pixclk_divider_rotated = 6, /* 7MHz Pclk. We use a 14MHz one */
.pixclk_src = CLK_SRC_PLL, .pixclk_src = CLK_SRC_PLL,
.sysclk_divider = 0, .sysclk_divider = 0,
.sysclk_src = CLK_SRC_PLL, .sysclk_src = CLK_SRC_PLL,
...@@ -131,9 +142,6 @@ static struct resource e800_fb_resources[] = { ...@@ -131,9 +142,6 @@ static struct resource e800_fb_resources[] = {
}, },
}; };
/* ----------------------- device declarations -------------------------- */
static struct platform_device e800_fb_device = { static struct platform_device e800_fb_device = {
.name = "w100fb", .name = "w100fb",
.id = -1, .id = -1,
...@@ -144,16 +152,35 @@ static struct platform_device e800_fb_device = { ...@@ -144,16 +152,35 @@ static struct platform_device e800_fb_device = {
.resource = e800_fb_resources, .resource = e800_fb_resources,
}; };
static int e800_lcd_init(void) /* --------------------------- UDC definitions --------------------------- */
{
if (!machine_is_e800()) static struct pxa2xx_udc_mach_info e800_udc_mach_info = {
return -ENODEV; .gpio_vbus = GPIO_E800_USB_DISC,
.gpio_pullup = GPIO_E800_USB_PULLUP,
.gpio_pullup_inverted = 1
};
return platform_device_register(&e800_fb_device); /* ----------------------------------------------------------------------- */
static struct platform_device *devices[] __initdata = {
&e800_fb_device,
};
static void __init e800_init(void)
{
platform_add_devices(devices, ARRAY_SIZE(devices));
pxa_set_udc_info(&e800_udc_mach_info);
} }
module_init(e800_lcd_init); MACHINE_START(E800, "Toshiba e800")
/* 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 = e800_init,
.timer = &pxa_timer,
MACHINE_END
MODULE_AUTHOR("Ian Molton <spyro@f2s.com>");
MODULE_DESCRIPTION("e800 lcd driver");
MODULE_LICENSE("GPLv2");
arch/arm/mach-pxa/eseries.c
View file @ af7c951d
...@@ -19,68 +19,13 @@ ...@@ -19,68 +19,13 @@
#include <mach/mfp-pxa25x.h> #include <mach/mfp-pxa25x.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include <mach/eseries-gpio.h>
#include <mach/udc.h>
#include "generic.h" #include "generic.h"
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,
};
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,
};
/* Only e800 has 128MB RAM */ /* Only e800 has 128MB RAM */
static void __init eseries_fixup(struct machine_desc *desc, void __init eseries_fixup(struct machine_desc *desc,
struct tag *tags, char **cmdline, struct meminfo *mi) struct tag *tags, char **cmdline, struct meminfo *mi)
{ {
mi->nr_banks=1; mi->nr_banks=1;
...@@ -92,95 +37,9 @@ static void __init eseries_fixup(struct machine_desc *desc, ...@@ -92,95 +37,9 @@ static void __init eseries_fixup(struct machine_desc *desc,
mi->bank[0].size = (64*1024*1024); mi->bank[0].size = (64*1024*1024);
} }
static void __init e740_init(void) struct pxa2xx_udc_mach_info e7xx_udc_mach_info = {
{ .gpio_vbus = GPIO_E7XX_USB_DISC,
pxa2xx_mfp_config(ARRAY_AND_SIZE(e740_pin_config)); .gpio_pullup = GPIO_E7XX_USB_PULLUP,
} .gpio_pullup_inverted = 1
};
static void __init e400_init(void)
{
pxa2xx_mfp_config(ARRAY_AND_SIZE(e400_pin_config));
}
/* e-series machine definitions */
#ifdef CONFIG_MACH_E330
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,
.timer = &pxa_timer,
MACHINE_END
#endif
#ifdef CONFIG_MACH_E350
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,
.timer = &pxa_timer,
MACHINE_END
#endif
#ifdef CONFIG_MACH_E740
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
#endif
#ifdef CONFIG_MACH_E750
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,
.timer = &pxa_timer,
MACHINE_END
#endif
#ifdef CONFIG_MACH_E400
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
#endif
#ifdef CONFIG_MACH_E800
MACHINE_START(E800, "Toshiba e800")
/* 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,
.timer = &pxa_timer,
MACHINE_END
#endif
arch/arm/mach-pxa/eseries.h 0 → 100644
View file @ af7c951d
void __init eseries_fixup(struct machine_desc *desc,
struct tag *tags, char **cmdline, struct meminfo *mi);
extern struct pxa2xx_udc_mach_info e7xx_udc_mach_info;
arch/arm/mach-pxa/eseries_udc.c deleted 100644 → 0
View file @ cc513ac0
/*
* UDC functions for the Toshiba e-series PDAs
*
* Copyright (c) Ian Molton 2003
*
* 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/device.h>
#include <mach/udc.h>
#include <mach/eseries-gpio.h>
#include <mach/hardware.h>
#include <mach/pxa-regs.h>
#include <asm/mach/arch.h>
#include <asm/mach-types.h>
#include <asm/mach/map.h>
#include <asm/domain.h>
/* local PXA generic code */
#include "generic.h"
static struct pxa2xx_udc_mach_info e7xx_udc_mach_info = {
.gpio_vbus = GPIO_E7XX_USB_DISC,
.gpio_pullup = GPIO_E7XX_USB_PULLUP,
.gpio_pullup_inverted = 1
};
static struct pxa2xx_udc_mach_info e800_udc_mach_info = {
.gpio_vbus = GPIO_E800_USB_DISC,
.gpio_pullup = GPIO_E800_USB_PULLUP,
.gpio_pullup_inverted = 1
};
static int __init eseries_udc_init(void)
{
if (machine_is_e330() || machine_is_e350() ||
machine_is_e740() || machine_is_e750() ||
machine_is_e400())
pxa_set_udc_info(&e7xx_udc_mach_info);
else if (machine_is_e800())
pxa_set_udc_info(&e800_udc_mach_info);
return 0;
}
module_init(eseries_udc_init);
MODULE_AUTHOR("Ian Molton <spyro@f2s.com>");
MODULE_DESCRIPTION("eseries UDC support");
MODULE_LICENSE("GPLv2");
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment