diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-07-12 16:43:36 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-12 16:43:36 -0400 |
commit | 5a58d4bb66b1d68e4b9319dd5b89078bad2a7f64 (patch) | |
tree | 7e3c7dd69ba19b41d11ff8f08f2906443a72a5e6 /arch/arm/mach-pxa | |
parent | 7fecc34e07e02b4d9dab1a1f4bf7fdac0a656b9b (diff) | |
parent | ac2536109849217a71510b6ded813e91629e88f6 (diff) |
Merge branch 'eseries' into pxa
Conflicts:
arch/arm/mach-pxa/Makefile
Diffstat (limited to 'arch/arm/mach-pxa')
-rw-r--r-- | arch/arm/mach-pxa/Kconfig | 11 | ||||
-rw-r--r-- | arch/arm/mach-pxa/Makefile | 8 | ||||
-rw-r--r-- | arch/arm/mach-pxa/e400_lcd.c | 56 | ||||
-rw-r--r-- | arch/arm/mach-pxa/e740_lcd.c | 123 | ||||
-rw-r--r-- | arch/arm/mach-pxa/e750_lcd.c | 109 | ||||
-rw-r--r-- | arch/arm/mach-pxa/e800_lcd.c | 159 | ||||
-rw-r--r-- | arch/arm/mach-pxa/eseries.c | 15 | ||||
-rw-r--r-- | arch/arm/mach-pxa/eseries_udc.c | 57 |
8 files changed, 535 insertions, 3 deletions
diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig index 7f9664dee670..fdea1e7dc349 100644 --- a/arch/arm/mach-pxa/Kconfig +++ b/arch/arm/mach-pxa/Kconfig | |||
@@ -124,10 +124,19 @@ config MACH_E330 | |||
124 | Say Y here if you intend to run this kernel on a Toshiba | 124 | Say Y here if you intend to run this kernel on a Toshiba |
125 | e330 family PDA. | 125 | e330 family PDA. |
126 | 126 | ||
127 | config MACH_E350 | ||
128 | bool "Toshiba e350" | ||
129 | default y | ||
130 | depends on ARCH_PXA_ESERIES | ||
131 | help | ||
132 | Say Y here if you intend to run this kernel on a Toshiba | ||
133 | e350 family PDA. | ||
134 | |||
127 | config MACH_E740 | 135 | config MACH_E740 |
128 | bool "Toshiba e740" | 136 | bool "Toshiba e740" |
129 | default y | 137 | default y |
130 | depends on ARCH_PXA_ESERIES | 138 | depends on ARCH_PXA_ESERIES |
139 | select FB_W100 | ||
131 | help | 140 | help |
132 | Say Y here if you intend to run this kernel on a Toshiba | 141 | Say Y here if you intend to run this kernel on a Toshiba |
133 | e740 family PDA. | 142 | e740 family PDA. |
@@ -136,6 +145,7 @@ config MACH_E750 | |||
136 | bool "Toshiba e750" | 145 | bool "Toshiba e750" |
137 | default y | 146 | default y |
138 | depends on ARCH_PXA_ESERIES | 147 | depends on ARCH_PXA_ESERIES |
148 | select FB_W100 | ||
139 | help | 149 | help |
140 | Say Y here if you intend to run this kernel on a Toshiba | 150 | Say Y here if you intend to run this kernel on a Toshiba |
141 | e750 family PDA. | 151 | e750 family PDA. |
@@ -152,6 +162,7 @@ config MACH_E800 | |||
152 | bool "Toshiba e800" | 162 | bool "Toshiba e800" |
153 | default y | 163 | default y |
154 | depends on ARCH_PXA_ESERIES | 164 | depends on ARCH_PXA_ESERIES |
165 | select FB_W100 | ||
155 | help | 166 | help |
156 | Say Y here if you intend to run this kernel on a Toshiba | 167 | Say Y here if you intend to run this kernel on a Toshiba |
157 | e800 family PDA. | 168 | e800 family PDA. |
diff --git a/arch/arm/mach-pxa/Makefile b/arch/arm/mach-pxa/Makefile index b282412a01f5..5220a5c3fe90 100644 --- a/arch/arm/mach-pxa/Makefile +++ b/arch/arm/mach-pxa/Makefile | |||
@@ -36,8 +36,12 @@ obj-$(CONFIG_MACH_PCM990_BASEBOARD) += pcm990-baseboard.o | |||
36 | obj-$(CONFIG_MACH_TOSA) += tosa.o | 36 | obj-$(CONFIG_MACH_TOSA) += tosa.o |
37 | obj-$(CONFIG_MACH_EM_X270) += em-x270.o | 37 | obj-$(CONFIG_MACH_EM_X270) += em-x270.o |
38 | obj-$(CONFIG_MACH_MAGICIAN) += magician.o | 38 | obj-$(CONFIG_MACH_MAGICIAN) += magician.o |
39 | obj-$(CONFIG_ARCH_PXA_ESERIES) += eseries.o | 39 | obj-$(CONFIG_ARCH_PXA_ESERIES) += eseries.o eseries_udc.o |
40 | obj-$(CONFIG_MACH_PALMTX)+= palmtx.o | 40 | obj-$(CONFIG_MACH_E740) += e740_lcd.o |
41 | obj-$(CONFIG_MACH_E750) += e750_lcd.o | ||
42 | obj-$(CONFIG_MACH_E400) += e400_lcd.o | ||
43 | obj-$(CONFIG_MACH_E800) += e800_lcd.o | ||
44 | obj-$(CONFIG_MACH_PALMTX) += palmtx.o | ||
41 | 45 | ||
42 | ifeq ($(CONFIG_MACH_ZYLONITE),y) | 46 | ifeq ($(CONFIG_MACH_ZYLONITE),y) |
43 | obj-y += zylonite.o | 47 | obj-y += zylonite.o |
diff --git a/arch/arm/mach-pxa/e400_lcd.c b/arch/arm/mach-pxa/e400_lcd.c new file mode 100644 index 000000000000..16c023630626 --- /dev/null +++ b/arch/arm/mach-pxa/e400_lcd.c | |||
@@ -0,0 +1,56 @@ | |||
1 | /* | ||
2 | * e400_lcd.c | ||
3 | * | ||
4 | * (c) 2005 Ian Molton <spyro@f2s.com> | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify | ||
7 | * it under the terms of the GNU General Public License version 2 as | ||
8 | * published by the Free Software Foundation. | ||
9 | * | ||
10 | */ | ||
11 | |||
12 | #include <linux/kernel.h> | ||
13 | #include <linux/init.h> | ||
14 | #include <linux/module.h> | ||
15 | |||
16 | #include <asm/mach-types.h> | ||
17 | #include <asm/arch/pxa-regs.h> | ||
18 | #include <asm/arch/pxafb.h> | ||
19 | |||
20 | static struct pxafb_mode_info e400_pxafb_mode_info = { | ||
21 | .pixclock = 140703, | ||
22 | .xres = 240, | ||
23 | .yres = 320, | ||
24 | .bpp = 16, | ||
25 | .hsync_len = 4, | ||
26 | .left_margin = 28, | ||
27 | .right_margin = 8, | ||
28 | .vsync_len = 3, | ||
29 | .upper_margin = 5, | ||
30 | .lower_margin = 6, | ||
31 | .sync = 0, | ||
32 | }; | ||
33 | |||
34 | static struct pxafb_mach_info e400_pxafb_mach_info = { | ||
35 | .modes = &e400_pxafb_mode_info, | ||
36 | .num_modes = 1, | ||
37 | .lccr0 = LCCR0_Color | LCCR0_Sngl | LCCR0_Act, | ||
38 | .lccr3 = 0, | ||
39 | .pxafb_backlight_power = NULL, | ||
40 | }; | ||
41 | |||
42 | static int __init e400_lcd_init(void) | ||
43 | { | ||
44 | if (!machine_is_e400()) | ||
45 | return -ENODEV; | ||
46 | |||
47 | set_pxa_fb_info(&e400_pxafb_mach_info); | ||
48 | return 0; | ||
49 | } | ||
50 | |||
51 | module_init(e400_lcd_init); | ||
52 | |||
53 | MODULE_AUTHOR("Ian Molton <spyro@f2s.com>"); | ||
54 | MODULE_DESCRIPTION("e400 lcd driver"); | ||
55 | MODULE_LICENSE("GPLv2"); | ||
56 | |||
diff --git a/arch/arm/mach-pxa/e740_lcd.c b/arch/arm/mach-pxa/e740_lcd.c new file mode 100644 index 000000000000..26bd599af178 --- /dev/null +++ b/arch/arm/mach-pxa/e740_lcd.c | |||
@@ -0,0 +1,123 @@ | |||
1 | /* e740_lcd.c | ||
2 | * | ||
3 | * This file contains the definitions for the LCD timings and functions | ||
4 | * to control the LCD power / frontlighting via the w100fb driver. | ||
5 | * | ||
6 | * (c) 2005 Ian Molton <spyro@f2s.com> | ||
7 | * | ||
8 | * This program is free software; you can redistribute it and/or modify | ||
9 | * it under the terms of the GNU General Public License version 2 as | ||
10 | * published by the Free Software Foundation. | ||
11 | * | ||
12 | */ | ||
13 | |||
14 | #include <linux/module.h> | ||
15 | #include <linux/device.h> | ||
16 | #include <linux/fb.h> | ||
17 | #include <linux/err.h> | ||
18 | #include <linux/platform_device.h> | ||
19 | |||
20 | #include <asm/mach-types.h> | ||
21 | |||
22 | #include <video/w100fb.h> | ||
23 | |||
24 | /* | ||
25 | **potential** shutdown routine - to be investigated | ||
26 | devmem2 0x0c010528 w 0xff3fff00 | ||
27 | devmem2 0x0c010190 w 0x7FFF8000 | ||
28 | devmem2 0x0c0101b0 w 0x00FF0000 | ||
29 | devmem2 0x0c01008c w 0x00000000 | ||
30 | devmem2 0x0c010080 w 0x000000bf | ||
31 | devmem2 0x0c010098 w 0x00000015 | ||
32 | devmem2 0x0c010088 w 0x4b000204 | ||
33 | devmem2 0x0c010098 w 0x0000001d | ||
34 | */ | ||
35 | |||
36 | static struct w100_gen_regs e740_lcd_regs = { | ||
37 | .lcd_format = 0x00008023, | ||
38 | .lcdd_cntl1 = 0x0f000000, | ||
39 | .lcdd_cntl2 = 0x0003ffff, | ||
40 | .genlcd_cntl1 = 0x00ffff03, | ||
41 | .genlcd_cntl2 = 0x003c0f03, | ||
42 | .genlcd_cntl3 = 0x000143aa, | ||
43 | }; | ||
44 | |||
45 | static struct w100_mode e740_lcd_mode = { | ||
46 | .xres = 240, | ||
47 | .yres = 320, | ||
48 | .left_margin = 20, | ||
49 | .right_margin = 28, | ||
50 | .upper_margin = 9, | ||
51 | .lower_margin = 8, | ||
52 | .crtc_ss = 0x80140013, | ||
53 | .crtc_ls = 0x81150110, | ||
54 | .crtc_gs = 0x80050005, | ||
55 | .crtc_vpos_gs = 0x000a0009, | ||
56 | .crtc_rev = 0x0040010a, | ||
57 | .crtc_dclk = 0xa906000a, | ||
58 | .crtc_gclk = 0x80050108, | ||
59 | .crtc_goe = 0x80050108, | ||
60 | .pll_freq = 57, | ||
61 | .pixclk_divider = 4, | ||
62 | .pixclk_divider_rotated = 4, | ||
63 | .pixclk_src = CLK_SRC_XTAL, | ||
64 | .sysclk_divider = 1, | ||
65 | .sysclk_src = CLK_SRC_PLL, | ||
66 | .crtc_ps1_active = 0x41060010, | ||
67 | }; | ||
68 | |||
69 | |||
70 | static struct w100_gpio_regs e740_w100_gpio_info = { | ||
71 | .init_data1 = 0x21002103, | ||
72 | .gpio_dir1 = 0xffffdeff, | ||
73 | .gpio_oe1 = 0x03c00643, | ||
74 | .init_data2 = 0x003f003f, | ||
75 | .gpio_dir2 = 0xffffffff, | ||
76 | .gpio_oe2 = 0x000000ff, | ||
77 | }; | ||
78 | |||
79 | static struct w100fb_mach_info e740_fb_info = { | ||
80 | .modelist = &e740_lcd_mode, | ||
81 | .num_modes = 1, | ||
82 | .regs = &e740_lcd_regs, | ||
83 | .gpio = &e740_w100_gpio_info, | ||
84 | .xtal_freq = 14318000, | ||
85 | .xtal_dbl = 1, | ||
86 | }; | ||
87 | |||
88 | static struct resource e740_fb_resources[] = { | ||
89 | [0] = { | ||
90 | .start = 0x0c000000, | ||
91 | .end = 0x0cffffff, | ||
92 | .flags = IORESOURCE_MEM, | ||
93 | }, | ||
94 | }; | ||
95 | |||
96 | /* ----------------------- device declarations -------------------------- */ | ||
97 | |||
98 | |||
99 | static struct platform_device e740_fb_device = { | ||
100 | .name = "w100fb", | ||
101 | .id = -1, | ||
102 | .dev = { | ||
103 | .platform_data = &e740_fb_info, | ||
104 | }, | ||
105 | .num_resources = ARRAY_SIZE(e740_fb_resources), | ||
106 | .resource = e740_fb_resources, | ||
107 | }; | ||
108 | |||
109 | static int e740_lcd_init(void) | ||
110 | { | ||
111 | int ret; | ||
112 | |||
113 | if (!machine_is_e740()) | ||
114 | return -ENODEV; | ||
115 | |||
116 | return platform_device_register(&e740_fb_device); | ||
117 | } | ||
118 | |||
119 | module_init(e740_lcd_init); | ||
120 | |||
121 | MODULE_AUTHOR("Ian Molton <spyro@f2s.com>"); | ||
122 | MODULE_DESCRIPTION("e740 lcd driver"); | ||
123 | MODULE_LICENSE("GPLv2"); | ||
diff --git a/arch/arm/mach-pxa/e750_lcd.c b/arch/arm/mach-pxa/e750_lcd.c new file mode 100644 index 000000000000..75edc3b5390f --- /dev/null +++ b/arch/arm/mach-pxa/e750_lcd.c | |||
@@ -0,0 +1,109 @@ | |||
1 | /* e750_lcd.c | ||
2 | * | ||
3 | * This file contains the definitions for the LCD timings and functions | ||
4 | * to control the LCD power / frontlighting via the w100fb driver. | ||
5 | * | ||
6 | * (c) 2005 Ian Molton <spyro@f2s.com> | ||
7 | * | ||
8 | * This program is free software; you can redistribute it and/or modify | ||
9 | * it under the terms of the GNU General Public License version 2 as | ||
10 | * published by the Free Software Foundation. | ||
11 | * | ||
12 | */ | ||
13 | |||
14 | #include <linux/module.h> | ||
15 | #include <linux/device.h> | ||
16 | #include <linux/fb.h> | ||
17 | #include <linux/err.h> | ||
18 | #include <linux/platform_device.h> | ||
19 | |||
20 | #include <asm/mach-types.h> | ||
21 | |||
22 | #include <video/w100fb.h> | ||
23 | |||
24 | static struct w100_gen_regs e750_lcd_regs = { | ||
25 | .lcd_format = 0x00008003, | ||
26 | .lcdd_cntl1 = 0x00000000, | ||
27 | .lcdd_cntl2 = 0x0003ffff, | ||
28 | .genlcd_cntl1 = 0x00fff003, | ||
29 | .genlcd_cntl2 = 0x003c0f03, | ||
30 | .genlcd_cntl3 = 0x000143aa, | ||
31 | }; | ||
32 | |||
33 | static struct w100_mode e750_lcd_mode = { | ||
34 | .xres = 240, | ||
35 | .yres = 320, | ||
36 | .left_margin = 21, | ||
37 | .right_margin = 22, | ||
38 | .upper_margin = 5, | ||
39 | .lower_margin = 4, | ||
40 | .crtc_ss = 0x80150014, | ||
41 | .crtc_ls = 0x8014000d, | ||
42 | .crtc_gs = 0xc1000005, | ||
43 | .crtc_vpos_gs = 0x00020147, | ||
44 | .crtc_rev = 0x0040010a, | ||
45 | .crtc_dclk = 0xa1700030, | ||
46 | .crtc_gclk = 0x80cc0015, | ||
47 | .crtc_goe = 0x80cc0015, | ||
48 | .crtc_ps1_active = 0x61060017, | ||
49 | .pll_freq = 57, | ||
50 | .pixclk_divider = 4, | ||
51 | .pixclk_divider_rotated = 4, | ||
52 | .pixclk_src = CLK_SRC_XTAL, | ||
53 | .sysclk_divider = 1, | ||
54 | .sysclk_src = CLK_SRC_PLL, | ||
55 | }; | ||
56 | |||
57 | |||
58 | static struct w100_gpio_regs e750_w100_gpio_info = { | ||
59 | .init_data1 = 0x01192f1b, | ||
60 | .gpio_dir1 = 0xd5ffdeff, | ||
61 | .gpio_oe1 = 0x000020bf, | ||
62 | .init_data2 = 0x010f010f, | ||
63 | .gpio_dir2 = 0xffffffff, | ||
64 | .gpio_oe2 = 0x000001cf, | ||
65 | }; | ||
66 | |||
67 | static struct w100fb_mach_info e750_fb_info = { | ||
68 | .modelist = &e750_lcd_mode, | ||
69 | .num_modes = 1, | ||
70 | .regs = &e750_lcd_regs, | ||
71 | .gpio = &e750_w100_gpio_info, | ||
72 | .xtal_freq = 14318000, | ||
73 | .xtal_dbl = 1, | ||
74 | }; | ||
75 | |||
76 | static struct resource e750_fb_resources[] = { | ||
77 | [0] = { | ||
78 | .start = 0x0c000000, | ||
79 | .end = 0x0cffffff, | ||
80 | .flags = IORESOURCE_MEM, | ||
81 | }, | ||
82 | }; | ||
83 | |||
84 | /* ----------------------- device declarations -------------------------- */ | ||
85 | |||
86 | |||
87 | static struct platform_device e750_fb_device = { | ||
88 | .name = "w100fb", | ||
89 | .id = -1, | ||
90 | .dev = { | ||
91 | .platform_data = &e750_fb_info, | ||
92 | }, | ||
93 | .num_resources = ARRAY_SIZE(e750_fb_resources), | ||
94 | .resource = e750_fb_resources, | ||
95 | }; | ||
96 | |||
97 | static int e750_lcd_init(void) | ||
98 | { | ||
99 | if (!machine_is_e750()) | ||
100 | return -ENODEV; | ||
101 | |||
102 | return platform_device_register(&e750_fb_device); | ||
103 | } | ||
104 | |||
105 | module_init(e750_lcd_init); | ||
106 | |||
107 | MODULE_AUTHOR("Ian Molton <spyro@f2s.com>"); | ||
108 | MODULE_DESCRIPTION("e750 lcd driver"); | ||
109 | MODULE_LICENSE("GPLv2"); | ||
diff --git a/arch/arm/mach-pxa/e800_lcd.c b/arch/arm/mach-pxa/e800_lcd.c new file mode 100644 index 000000000000..e6aeab0ebc22 --- /dev/null +++ b/arch/arm/mach-pxa/e800_lcd.c | |||
@@ -0,0 +1,159 @@ | |||
1 | /* e800_lcd.c | ||
2 | * | ||
3 | * This file contains the definitions for the LCD timings and functions | ||
4 | * to control the LCD power / frontlighting via the w100fb driver. | ||
5 | * | ||
6 | * (c) 2005 Ian Molton <spyro@f2s.com> | ||
7 | * | ||
8 | * This program is free software; you can redistribute it and/or modify | ||
9 | * it under the terms of the GNU General Public License version 2 as | ||
10 | * published by the Free Software Foundation. | ||
11 | * | ||
12 | */ | ||
13 | |||
14 | #include <linux/module.h> | ||
15 | #include <linux/device.h> | ||
16 | #include <linux/fb.h> | ||
17 | #include <linux/err.h> | ||
18 | #include <linux/platform_device.h> | ||
19 | |||
20 | #include <asm/mach-types.h> | ||
21 | |||
22 | #include <video/w100fb.h> | ||
23 | |||
24 | static struct w100_gen_regs e800_lcd_regs = { | ||
25 | .lcd_format = 0x00008003, | ||
26 | .lcdd_cntl1 = 0x02a00000, | ||
27 | .lcdd_cntl2 = 0x0003ffff, | ||
28 | .genlcd_cntl1 = 0x000ff2a3, | ||
29 | .genlcd_cntl2 = 0x000002a3, | ||
30 | .genlcd_cntl3 = 0x000102aa, | ||
31 | }; | ||
32 | |||
33 | static struct w100_mode e800_lcd_mode[2] = { | ||
34 | [0] = { | ||
35 | .xres = 480, | ||
36 | .yres = 640, | ||
37 | .left_margin = 52, | ||
38 | .right_margin = 148, | ||
39 | .upper_margin = 2, | ||
40 | .lower_margin = 6, | ||
41 | .crtc_ss = 0x80350034, | ||
42 | .crtc_ls = 0x802b0026, | ||
43 | .crtc_gs = 0x80160016, | ||
44 | .crtc_vpos_gs = 0x00020003, | ||
45 | .crtc_rev = 0x0040001d, | ||
46 | .crtc_dclk = 0xe0000000, | ||
47 | .crtc_gclk = 0x82a50049, | ||
48 | .crtc_goe = 0x80ee001c, | ||
49 | .crtc_ps1_active = 0x00000000, | ||
50 | .pll_freq = 128, | ||
51 | .pixclk_divider = 4, | ||
52 | .pixclk_divider_rotated = 6, | ||
53 | .pixclk_src = CLK_SRC_PLL, | ||
54 | .sysclk_divider = 0, | ||
55 | .sysclk_src = CLK_SRC_PLL, | ||
56 | }, | ||
57 | [1] = { | ||
58 | .xres = 240, | ||
59 | .yres = 320, | ||
60 | .left_margin = 15, | ||
61 | .right_margin = 88, | ||
62 | .upper_margin = 0, | ||
63 | .lower_margin = 7, | ||
64 | .crtc_ss = 0xd010000f, | ||
65 | .crtc_ls = 0x80070003, | ||
66 | .crtc_gs = 0x80000000, | ||
67 | .crtc_vpos_gs = 0x01460147, | ||
68 | .crtc_rev = 0x00400003, | ||
69 | .crtc_dclk = 0xa1700030, | ||
70 | .crtc_gclk = 0x814b0008, | ||
71 | .crtc_goe = 0x80cc0015, | ||
72 | .crtc_ps1_active = 0x00000000, | ||
73 | .pll_freq = 100, | ||
74 | .pixclk_divider = 6, /* Wince uses 14 which gives a 7MHz pclk. */ | ||
75 | .pixclk_divider_rotated = 6, /* we want a 14MHz one (much nicer to look at) */ | ||
76 | .pixclk_src = CLK_SRC_PLL, | ||
77 | .sysclk_divider = 0, | ||
78 | .sysclk_src = CLK_SRC_PLL, | ||
79 | } | ||
80 | }; | ||
81 | |||
82 | |||
83 | static struct w100_gpio_regs e800_w100_gpio_info = { | ||
84 | .init_data1 = 0xc13fc019, | ||
85 | .gpio_dir1 = 0x3e40df7f, | ||
86 | .gpio_oe1 = 0x003c3000, | ||
87 | .init_data2 = 0x00000000, | ||
88 | .gpio_dir2 = 0x00000000, | ||
89 | .gpio_oe2 = 0x00000000, | ||
90 | }; | ||
91 | |||
92 | static struct w100_mem_info e800_w100_mem_info = { | ||
93 | .ext_cntl = 0x09640011, | ||
94 | .sdram_mode_reg = 0x00600021, | ||
95 | .ext_timing_cntl = 0x10001545, | ||
96 | .io_cntl = 0x7ddd7333, | ||
97 | .size = 0x1fffff, | ||
98 | }; | ||
99 | |||
100 | static void e800_tg_change(struct w100fb_par *par) | ||
101 | { | ||
102 | unsigned long tmp; | ||
103 | |||
104 | tmp = w100fb_gpio_read(W100_GPIO_PORT_A); | ||
105 | if (par->mode->xres == 480) | ||
106 | tmp |= 0x100; | ||
107 | else | ||
108 | tmp &= ~0x100; | ||
109 | w100fb_gpio_write(W100_GPIO_PORT_A, tmp); | ||
110 | } | ||
111 | |||
112 | static struct w100_tg_info e800_tg_info = { | ||
113 | .change = e800_tg_change, | ||
114 | }; | ||
115 | |||
116 | static struct w100fb_mach_info e800_fb_info = { | ||
117 | .modelist = e800_lcd_mode, | ||
118 | .num_modes = 2, | ||
119 | .regs = &e800_lcd_regs, | ||
120 | .gpio = &e800_w100_gpio_info, | ||
121 | .mem = &e800_w100_mem_info, | ||
122 | .tg = &e800_tg_info, | ||
123 | .xtal_freq = 16000000, | ||
124 | }; | ||
125 | |||
126 | static struct resource e800_fb_resources[] = { | ||
127 | [0] = { | ||
128 | .start = 0x0c000000, | ||
129 | .end = 0x0cffffff, | ||
130 | .flags = IORESOURCE_MEM, | ||
131 | }, | ||
132 | }; | ||
133 | |||
134 | /* ----------------------- device declarations -------------------------- */ | ||
135 | |||
136 | |||
137 | static struct platform_device e800_fb_device = { | ||
138 | .name = "w100fb", | ||
139 | .id = -1, | ||
140 | .dev = { | ||
141 | .platform_data = &e800_fb_info, | ||
142 | }, | ||
143 | .num_resources = ARRAY_SIZE(e800_fb_resources), | ||
144 | .resource = e800_fb_resources, | ||
145 | }; | ||
146 | |||
147 | static int e800_lcd_init(void) | ||
148 | { | ||
149 | if (!machine_is_e800()) | ||
150 | return -ENODEV; | ||
151 | |||
152 | return platform_device_register(&e800_fb_device); | ||
153 | } | ||
154 | |||
155 | module_init(e800_lcd_init); | ||
156 | |||
157 | MODULE_AUTHOR("Ian Molton <spyro@f2s.com>"); | ||
158 | MODULE_DESCRIPTION("e800 lcd driver"); | ||
159 | MODULE_LICENSE("GPLv2"); | ||
diff --git a/arch/arm/mach-pxa/eseries.c b/arch/arm/mach-pxa/eseries.c index ee0ae93c876a..c29b7b21c11b 100644 --- a/arch/arm/mach-pxa/eseries.c +++ b/arch/arm/mach-pxa/eseries.c | |||
@@ -17,7 +17,7 @@ | |||
17 | #include <asm/arch/hardware.h> | 17 | #include <asm/arch/hardware.h> |
18 | #include <asm/mach-types.h> | 18 | #include <asm/mach-types.h> |
19 | 19 | ||
20 | #include <generic.h> | 20 | #include "generic.h" |
21 | 21 | ||
22 | /* Only e800 has 128MB RAM */ | 22 | /* Only e800 has 128MB RAM */ |
23 | static void __init eseries_fixup(struct machine_desc *desc, | 23 | static void __init eseries_fixup(struct machine_desc *desc, |
@@ -47,6 +47,19 @@ MACHINE_START(E330, "Toshiba e330") | |||
47 | MACHINE_END | 47 | MACHINE_END |
48 | #endif | 48 | #endif |
49 | 49 | ||
50 | #ifdef CONFIG_MACH_E350 | ||
51 | MACHINE_START(E350, "Toshiba e350") | ||
52 | /* Maintainer: Ian Molton (spyro@f2s.com) */ | ||
53 | .phys_io = 0x40000000, | ||
54 | .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, | ||
55 | .boot_params = 0xa0000100, | ||
56 | .map_io = pxa_map_io, | ||
57 | .init_irq = pxa25x_init_irq, | ||
58 | .fixup = eseries_fixup, | ||
59 | .timer = &pxa_timer, | ||
60 | MACHINE_END | ||
61 | #endif | ||
62 | |||
50 | #ifdef CONFIG_MACH_E740 | 63 | #ifdef CONFIG_MACH_E740 |
51 | MACHINE_START(E740, "Toshiba e740") | 64 | MACHINE_START(E740, "Toshiba e740") |
52 | /* Maintainer: Ian Molton (spyro@f2s.com) */ | 65 | /* Maintainer: Ian Molton (spyro@f2s.com) */ |
diff --git a/arch/arm/mach-pxa/eseries_udc.c b/arch/arm/mach-pxa/eseries_udc.c new file mode 100644 index 000000000000..362847a10998 --- /dev/null +++ b/arch/arm/mach-pxa/eseries_udc.c | |||
@@ -0,0 +1,57 @@ | |||
1 | /* | ||
2 | * UDC functions for the Toshiba e-series PDAs | ||
3 | * | ||
4 | * Copyright (c) Ian Molton 2003 | ||
5 | * | ||
6 | * This file is licensed under | ||
7 | * the terms of the GNU General Public License version 2. This program | ||
8 | * is licensed "as is" without any warranty of any kind, whether express | ||
9 | * or implied. | ||
10 | * | ||
11 | */ | ||
12 | |||
13 | #include <linux/kernel.h> | ||
14 | #include <linux/init.h> | ||
15 | #include <linux/device.h> | ||
16 | |||
17 | #include <asm/arch/udc.h> | ||
18 | #include <asm/arch/eseries-gpio.h> | ||
19 | #include <asm/arch/hardware.h> | ||
20 | #include <asm/arch/pxa-regs.h> | ||
21 | #include <asm/mach/arch.h> | ||
22 | #include <asm/mach-types.h> | ||
23 | #include <asm/mach/map.h> | ||
24 | #include <asm/domain.h> | ||
25 | |||
26 | /* local PXA generic code */ | ||
27 | #include "generic.h" | ||
28 | |||
29 | static struct pxa2xx_udc_mach_info e7xx_udc_mach_info = { | ||
30 | .gpio_vbus = GPIO_E7XX_USB_DISC, | ||
31 | .gpio_pullup = GPIO_E7XX_USB_PULLUP, | ||
32 | .gpio_pullup_inverted = 1 | ||
33 | }; | ||
34 | |||
35 | static struct pxa2xx_udc_mach_info e800_udc_mach_info = { | ||
36 | .gpio_vbus = GPIO_E800_USB_DISC, | ||
37 | .gpio_pullup = GPIO_E800_USB_PULLUP, | ||
38 | .gpio_pullup_inverted = 1 | ||
39 | }; | ||
40 | |||
41 | static int __init eseries_udc_init(void) | ||
42 | { | ||
43 | if (machine_is_e330() || machine_is_e350() || | ||
44 | machine_is_e740() || machine_is_e750() || | ||
45 | machine_is_e400()) | ||
46 | pxa_set_udc_info(&e7xx_udc_mach_info); | ||
47 | else if (machine_is_e800()) | ||
48 | pxa_set_udc_info(&e800_udc_mach_info); | ||
49 | |||
50 | return 0; | ||
51 | } | ||
52 | |||
53 | module_init(eseries_udc_init); | ||
54 | |||
55 | MODULE_AUTHOR("Ian Molton <spyro@f2s.com>"); | ||
56 | MODULE_DESCRIPTION("eseries UDC support"); | ||
57 | MODULE_LICENSE("GPLv2"); | ||