diff options
Diffstat (limited to 'arch/arm/mach-ep93xx/micro9.c')
-rw-r--r-- | arch/arm/mach-ep93xx/micro9.c | 89 |
1 files changed, 45 insertions, 44 deletions
diff --git a/arch/arm/mach-ep93xx/micro9.c b/arch/arm/mach-ep93xx/micro9.c index c2197236b632..15d6815d78c4 100644 --- a/arch/arm/mach-ep93xx/micro9.c +++ b/arch/arm/mach-ep93xx/micro9.c | |||
@@ -17,6 +17,7 @@ | |||
17 | #include <linux/platform_device.h> | 17 | #include <linux/platform_device.h> |
18 | #include <linux/sched.h> | 18 | #include <linux/sched.h> |
19 | #include <linux/io.h> | 19 | #include <linux/io.h> |
20 | #include <linux/i2c.h> | ||
20 | #include <linux/mtd/physmap.h> | 21 | #include <linux/mtd/physmap.h> |
21 | 22 | ||
22 | #include <mach/hardware.h> | 23 | #include <mach/hardware.h> |
@@ -25,7 +26,7 @@ | |||
25 | #include <asm/mach-types.h> | 26 | #include <asm/mach-types.h> |
26 | 27 | ||
27 | static struct ep93xx_eth_data micro9_eth_data = { | 28 | static struct ep93xx_eth_data micro9_eth_data = { |
28 | .phy_id = 0x1f, | 29 | .phy_id = 0x1f, |
29 | }; | 30 | }; |
30 | 31 | ||
31 | static void __init micro9_init(void) | 32 | static void __init micro9_init(void) |
@@ -38,46 +39,46 @@ static void __init micro9_init(void) | |||
38 | */ | 39 | */ |
39 | #ifdef CONFIG_MACH_MICRO9H | 40 | #ifdef CONFIG_MACH_MICRO9H |
40 | static struct physmap_flash_data micro9h_flash_data = { | 41 | static struct physmap_flash_data micro9h_flash_data = { |
41 | .width = 4, | 42 | .width = 4, |
42 | }; | 43 | }; |
43 | 44 | ||
44 | static struct resource micro9h_flash_resource = { | 45 | static struct resource micro9h_flash_resource = { |
45 | .start = 0x10000000, | 46 | .start = EP93XX_CS1_PHYS_BASE, |
46 | .end = 0x13ffffff, | 47 | .end = EP93XX_CS1_PHYS_BASE + SZ_64M - 1, |
47 | .flags = IORESOURCE_MEM, | 48 | .flags = IORESOURCE_MEM, |
48 | }; | 49 | }; |
49 | 50 | ||
50 | static struct platform_device micro9h_flash = { | 51 | static struct platform_device micro9h_flash = { |
51 | .name = "physmap-flash", | 52 | .name = "physmap-flash", |
52 | .id = 0, | 53 | .id = 0, |
53 | .dev = { | 54 | .dev = { |
54 | .platform_data = µ9h_flash_data, | 55 | .platform_data = µ9h_flash_data, |
55 | }, | 56 | }, |
56 | .num_resources = 1, | 57 | .num_resources = 1, |
57 | .resource = µ9h_flash_resource, | 58 | .resource = µ9h_flash_resource, |
58 | }; | 59 | }; |
59 | 60 | ||
60 | static void __init micro9h_init(void) | 61 | static void __init micro9h_init(void) |
61 | { | 62 | { |
62 | platform_device_register(µ9h_flash); | 63 | platform_device_register(µ9h_flash); |
63 | } | 64 | } |
64 | 65 | ||
65 | static void __init micro9h_init_machine(void) | 66 | static void __init micro9h_init_machine(void) |
66 | { | 67 | { |
67 | ep93xx_init_devices(); | 68 | ep93xx_init_devices(); |
68 | micro9_init(); | 69 | micro9_init(); |
69 | micro9h_init(); | 70 | micro9h_init(); |
70 | } | 71 | } |
71 | 72 | ||
72 | MACHINE_START(MICRO9, "Contec Hypercontrol Micro9-H") | 73 | MACHINE_START(MICRO9, "Contec Hypercontrol Micro9-H") |
73 | /* Maintainer: Manfred Gruber <manfred.gruber@contec.at> */ | 74 | /* Maintainer: Manfred Gruber <manfred.gruber@contec.at> */ |
74 | .phys_io = EP93XX_APB_PHYS_BASE, | 75 | .phys_io = EP93XX_APB_PHYS_BASE, |
75 | .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc, | 76 | .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc, |
76 | .boot_params = 0x00000100, | 77 | .boot_params = EP93XX_SDCE3_PHYS_BASE_SYNC + 0x100, |
77 | .map_io = ep93xx_map_io, | 78 | .map_io = ep93xx_map_io, |
78 | .init_irq = ep93xx_init_irq, | 79 | .init_irq = ep93xx_init_irq, |
79 | .timer = &ep93xx_timer, | 80 | .timer = &ep93xx_timer, |
80 | .init_machine = micro9h_init_machine, | 81 | .init_machine = micro9h_init_machine, |
81 | MACHINE_END | 82 | MACHINE_END |
82 | #endif | 83 | #endif |
83 | 84 | ||
@@ -87,19 +88,19 @@ MACHINE_END | |||
87 | #ifdef CONFIG_MACH_MICRO9M | 88 | #ifdef CONFIG_MACH_MICRO9M |
88 | static void __init micro9m_init_machine(void) | 89 | static void __init micro9m_init_machine(void) |
89 | { | 90 | { |
90 | ep93xx_init_devices(); | 91 | ep93xx_init_devices(); |
91 | micro9_init(); | 92 | micro9_init(); |
92 | } | 93 | } |
93 | 94 | ||
94 | MACHINE_START(MICRO9M, "Contec Hypercontrol Micro9-M") | 95 | MACHINE_START(MICRO9M, "Contec Hypercontrol Micro9-M") |
95 | /* Maintainer: Manfred Gruber <manfred.gruber@contec.at> */ | 96 | /* Maintainer: Manfred Gruber <manfred.gruber@contec.at> */ |
96 | .phys_io = EP93XX_APB_PHYS_BASE, | 97 | .phys_io = EP93XX_APB_PHYS_BASE, |
97 | .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc, | 98 | .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc, |
98 | .boot_params = 0x00000100, | 99 | .boot_params = EP93XX_SDCE3_PHYS_BASE_SYNC + 0x100, |
99 | .map_io = ep93xx_map_io, | 100 | .map_io = ep93xx_map_io, |
100 | .init_irq = ep93xx_init_irq, | 101 | .init_irq = ep93xx_init_irq, |
101 | .timer = &ep93xx_timer, | 102 | .timer = &ep93xx_timer, |
102 | .init_machine = micro9m_init_machine, | 103 | .init_machine = micro9m_init_machine, |
103 | MACHINE_END | 104 | MACHINE_END |
104 | #endif | 105 | #endif |
105 | 106 | ||
@@ -109,19 +110,19 @@ MACHINE_END | |||
109 | #ifdef CONFIG_MACH_MICRO9L | 110 | #ifdef CONFIG_MACH_MICRO9L |
110 | static void __init micro9l_init_machine(void) | 111 | static void __init micro9l_init_machine(void) |
111 | { | 112 | { |
112 | ep93xx_init_devices(); | 113 | ep93xx_init_devices(); |
113 | micro9_init(); | 114 | micro9_init(); |
114 | } | 115 | } |
115 | 116 | ||
116 | MACHINE_START(MICRO9L, "Contec Hypercontrol Micro9-L") | 117 | MACHINE_START(MICRO9L, "Contec Hypercontrol Micro9-L") |
117 | /* Maintainer: Manfred Gruber <manfred.gruber@contec.at> */ | 118 | /* Maintainer: Manfred Gruber <manfred.gruber@contec.at> */ |
118 | .phys_io = EP93XX_APB_PHYS_BASE, | 119 | .phys_io = EP93XX_APB_PHYS_BASE, |
119 | .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc, | 120 | .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc, |
120 | .boot_params = 0x00000100, | 121 | .boot_params = EP93XX_SDCE3_PHYS_BASE_SYNC + 0x100, |
121 | .map_io = ep93xx_map_io, | 122 | .map_io = ep93xx_map_io, |
122 | .init_irq = ep93xx_init_irq, | 123 | .init_irq = ep93xx_init_irq, |
123 | .timer = &ep93xx_timer, | 124 | .timer = &ep93xx_timer, |
124 | .init_machine = micro9l_init_machine, | 125 | .init_machine = micro9l_init_machine, |
125 | MACHINE_END | 126 | MACHINE_END |
126 | #endif | 127 | #endif |
127 | 128 | ||