diff options
Diffstat (limited to 'arch/arm/mach-s3c24xx/mach-gta02.c')
-rw-r--r-- | arch/arm/mach-s3c24xx/mach-gta02.c | 61 |
1 files changed, 28 insertions, 33 deletions
diff --git a/arch/arm/mach-s3c24xx/mach-gta02.c b/arch/arm/mach-s3c24xx/mach-gta02.c index 973b87ca87f4..b9782ac2237a 100644 --- a/arch/arm/mach-s3c24xx/mach-gta02.c +++ b/arch/arm/mach-s3c24xx/mach-gta02.c | |||
@@ -1,6 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * linux/arch/arm/mach-s3c2442/mach-gta02.c | ||
3 | * | ||
4 | * S3C2442 Machine Support for Openmoko GTA02 / FreeRunner. | 2 | * S3C2442 Machine Support for Openmoko GTA02 / FreeRunner. |
5 | * | 3 | * |
6 | * Copyright (C) 2006-2009 by Openmoko, Inc. | 4 | * Copyright (C) 2006-2009 by Openmoko, Inc. |
@@ -23,7 +21,6 @@ | |||
23 | * along with this program; if not, write to the Free Software | 21 | * along with this program; if not, write to the Free Software |
24 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, | 22 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, |
25 | * MA 02111-1307 USA | 23 | * MA 02111-1307 USA |
26 | * | ||
27 | */ | 24 | */ |
28 | 25 | ||
29 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |
@@ -34,62 +31,60 @@ | |||
34 | #include <linux/timer.h> | 31 | #include <linux/timer.h> |
35 | #include <linux/init.h> | 32 | #include <linux/init.h> |
36 | #include <linux/gpio.h> | 33 | #include <linux/gpio.h> |
34 | #include <linux/gpio_keys.h> | ||
37 | #include <linux/workqueue.h> | 35 | #include <linux/workqueue.h> |
38 | #include <linux/platform_device.h> | 36 | #include <linux/platform_device.h> |
39 | #include <linux/serial_core.h> | 37 | #include <linux/serial_core.h> |
40 | #include <linux/spi/spi.h> | 38 | #include <linux/input.h> |
41 | #include <linux/spi/s3c24xx.h> | 39 | #include <linux/io.h> |
40 | #include <linux/i2c.h> | ||
42 | 41 | ||
43 | #include <linux/mmc/host.h> | 42 | #include <linux/mmc/host.h> |
44 | 43 | ||
44 | #include <linux/mfd/pcf50633/adc.h> | ||
45 | #include <linux/mfd/pcf50633/backlight.h> | ||
46 | #include <linux/mfd/pcf50633/core.h> | ||
47 | #include <linux/mfd/pcf50633/gpio.h> | ||
48 | #include <linux/mfd/pcf50633/mbc.h> | ||
49 | #include <linux/mfd/pcf50633/pmic.h> | ||
50 | |||
45 | #include <linux/mtd/mtd.h> | 51 | #include <linux/mtd/mtd.h> |
46 | #include <linux/mtd/nand.h> | 52 | #include <linux/mtd/nand.h> |
47 | #include <linux/mtd/nand_ecc.h> | 53 | #include <linux/mtd/nand_ecc.h> |
48 | #include <linux/mtd/partitions.h> | 54 | #include <linux/mtd/partitions.h> |
49 | #include <linux/mtd/physmap.h> | 55 | #include <linux/mtd/physmap.h> |
50 | #include <linux/io.h> | ||
51 | 56 | ||
52 | #include <linux/i2c.h> | ||
53 | #include <linux/regulator/machine.h> | 57 | #include <linux/regulator/machine.h> |
54 | 58 | ||
55 | #include <linux/mfd/pcf50633/core.h> | 59 | #include <linux/spi/spi.h> |
56 | #include <linux/mfd/pcf50633/mbc.h> | 60 | #include <linux/spi/s3c24xx.h> |
57 | #include <linux/mfd/pcf50633/adc.h> | ||
58 | #include <linux/mfd/pcf50633/gpio.h> | ||
59 | #include <linux/mfd/pcf50633/pmic.h> | ||
60 | #include <linux/mfd/pcf50633/backlight.h> | ||
61 | |||
62 | #include <linux/input.h> | ||
63 | #include <linux/gpio_keys.h> | ||
64 | 61 | ||
62 | #include <asm/irq.h> | ||
63 | #include <asm/mach-types.h> | ||
65 | #include <asm/mach/arch.h> | 64 | #include <asm/mach/arch.h> |
66 | #include <asm/mach/map.h> | 65 | #include <asm/mach/map.h> |
67 | #include <asm/mach/irq.h> | 66 | #include <asm/mach/irq.h> |
68 | 67 | ||
69 | #include <asm/irq.h> | 68 | #include <linux/platform_data/i2c-s3c2410.h> |
70 | #include <asm/mach-types.h> | 69 | #include <linux/platform_data/mtd-nand-s3c2410.h> |
70 | #include <linux/platform_data/touchscreen-s3c2410.h> | ||
71 | #include <linux/platform_data/usb-ohci-s3c2410.h> | ||
72 | #include <linux/platform_data/usb-s3c2410_udc.h> | ||
71 | 73 | ||
72 | #include <mach/regs-irq.h> | ||
73 | #include <mach/regs-gpio.h> | ||
74 | #include <mach/fb.h> | 74 | #include <mach/fb.h> |
75 | |||
76 | #include <linux/platform_data/usb-ohci-s3c2410.h> | ||
77 | #include <mach/regs-mem.h> | ||
78 | #include <mach/hardware.h> | 75 | #include <mach/hardware.h> |
76 | #include <mach/regs-gpio.h> | ||
77 | #include <mach/regs-irq.h> | ||
78 | #include <mach/regs-mem.h> | ||
79 | 79 | ||
80 | #include <mach/gta02.h> | ||
81 | |||
82 | #include <plat/regs-serial.h> | ||
83 | #include <linux/platform_data/mtd-nand-s3c2410.h> | ||
84 | #include <plat/devs.h> | ||
85 | #include <plat/cpu.h> | 80 | #include <plat/cpu.h> |
86 | #include <plat/pm.h> | 81 | #include <plat/devs.h> |
87 | #include <linux/platform_data/usb-s3c2410_udc.h> | ||
88 | #include <plat/gpio-cfg.h> | 82 | #include <plat/gpio-cfg.h> |
89 | #include <linux/platform_data/i2c-s3c2410.h> | 83 | #include <plat/pm.h> |
90 | #include <linux/platform_data/touchscreen-s3c2410.h> | 84 | #include <plat/regs-serial.h> |
91 | 85 | ||
92 | #include "common.h" | 86 | #include "common.h" |
87 | #include "gta02.h" | ||
93 | 88 | ||
94 | static struct pcf50633 *gta02_pcf; | 89 | static struct pcf50633 *gta02_pcf; |
95 | 90 | ||
@@ -595,6 +590,6 @@ MACHINE_START(NEO1973_GTA02, "GTA02") | |||
595 | .map_io = gta02_map_io, | 590 | .map_io = gta02_map_io, |
596 | .init_irq = s3c24xx_init_irq, | 591 | .init_irq = s3c24xx_init_irq, |
597 | .init_machine = gta02_machine_init, | 592 | .init_machine = gta02_machine_init, |
598 | .timer = &s3c24xx_timer, | 593 | .init_time = s3c24xx_timer_init, |
599 | .restart = s3c244x_restart, | 594 | .restart = s3c244x_restart, |
600 | MACHINE_END | 595 | MACHINE_END |