1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
|
diff -uprN -X linux-2.6.32.3/Documentation/dontdiff linux-2.6.32.3-vanilla/arch/arm/mach-at91/at91sam9260_devices.c linux-2.6.32.3/arch/arm/mach-at91/at91sam9260_devices.c
--- linux-2.6.32.3-vanilla/arch/arm/mach-at91/at91sam9260_devices.c 2010-01-06 17:07:45.000000000 -0600
+++ linux-2.6.32.3/arch/arm/mach-at91/at91sam9260_devices.c 2010-09-17 10:36:01.000000000 -0500
@@ -183,9 +183,9 @@ void __init at91_add_device_eth(struct a
at91_set_B_periph(AT91_PIN_PA25, 0); /* ERX2 */
at91_set_B_periph(AT91_PIN_PA26, 0); /* ERX3 */
at91_set_B_periph(AT91_PIN_PA27, 0); /* ERXCK */
- at91_set_B_periph(AT91_PIN_PA23, 0); /* ETX2 */
- at91_set_B_periph(AT91_PIN_PA24, 0); /* ETX3 */
- at91_set_B_periph(AT91_PIN_PA22, 0); /* ETXER */
+ at91_set_B_periph(AT91_PIN_PA10, 0); /* ETX2 */
+ at91_set_B_periph(AT91_PIN_PA11, 0); /* ETX3 */
+ /*at91_set_B_periph(AT91_PIN_PA22, 0);*/ /* ETXER */
}
eth_data = *data;
@@ -571,7 +571,15 @@ static struct platform_device at91sam926
.num_resources = ARRAY_SIZE(spi1_resources),
};
-static const unsigned spi1_standard_cs[4] = { AT91_PIN_PB3, AT91_PIN_PC5, AT91_PIN_PC4, AT91_PIN_PC3 };
+static const unsigned spi1_standard_cs[7] = {
+ AT91_PIN_PB3,
+ AT91_PIN_PC5,
+ AT91_PIN_PC4,
+ AT91_PIN_PC6,
+ AT91_PIN_PB12,
+ AT91_PIN_PB13,
+ AT91_PIN_PB16
+};
void __init at91_add_device_spi(struct spi_board_info *devices, int nr_devices)
{
diff -uprN -X linux-2.6.32.3/Documentation/dontdiff linux-2.6.32.3-vanilla/arch/arm/mach-at91/board-sam9g20ek.c linux-2.6.32.3/arch/arm/mach-at91/board-sam9g20ek.c
--- linux-2.6.32.3-vanilla/arch/arm/mach-at91/board-sam9g20ek.c 2010-01-06 17:07:45.000000000 -0600
+++ linux-2.6.32.3/arch/arm/mach-at91/board-sam9g20ek.c 2010-09-17 10:45:36.000000000 -0500
@@ -27,6 +27,8 @@
#include <linux/gpio_keys.h>
#include <linux/input.h>
#include <linux/clk.h>
+#include <linux/i2c/at24.h>
+#include <linux/delay.h>
#include <mach/hardware.h>
#include <asm/setup.h>
@@ -44,6 +46,7 @@
#include "sam9_smc.h"
#include "generic.h"
+static int i2c_present;
static void __init ek_map_io(void)
{
@@ -61,6 +64,43 @@ static void __init ek_map_io(void)
/* USART1 on ttyS2. (Rx, Tx, RTS, CTS) */
at91_register_uart(AT91SAM9260_ID_US1, 2, ATMEL_UART_CTS | ATMEL_UART_RTS);
+ int tmp;
+
+ /*
+ * Reset any initiated i2c data transfers?
+ */
+ at91_set_gpio_input(AT91_PIN_PA23, 0);
+ at91_set_gpio_output(AT91_PIN_PA24, 0);
+ for (tmp = 0; tmp < 11; tmp++) {
+ at91_set_gpio_value(AT91_PIN_PA24, 0);
+ udelay(20);
+ at91_set_gpio_value(AT91_PIN_PA24, 1);
+ udelay(20);
+ }
+ at91_set_gpio_input(AT91_PIN_PA24, 0);
+
+ /*
+ * PA24 and PA23 are used as ID pins on MTCBA/MTCDP-0.0 and I2C pins on MTCDP-1.0.
+ *
+ * MTCBA Rev. B: 0x01, C: 0x02, D: 0x03
+ * MTCDP Rev. A reads as 0x00 with TWCK and TWD pulled high
+ *
+ */
+ tmp = !at91_get_gpio_value(AT91_PIN_PA24) << 1 | !at91_get_gpio_value(AT91_PIN_PA23);
+
+ i2c_present = !tmp;
+
+ /*
+ * The GPS receiver is either at US2 on MTCBA/MTCDP-0.0 and US3 on MTCDP-1.0.
+ */
+ if (i2c_present) {
+ at91_register_uart(AT91SAM9260_ID_US3, 3, ATMEL_UART_CTS | ATMEL_UART_RTS);
+ printk(KERN_INFO "sam9g20: i2c available\n");
+ } else {
+ at91_register_uart(AT91SAM9260_ID_US2, 3, 0);
+ printk(KERN_INFO "sam9g20: i2c not available\n");
+ }
+
/* set serial console to ttyS0 (ie, DBGU) */
at91_set_serial_console(0);
}
@@ -82,8 +122,8 @@ static struct at91_usbh_data __initdata
* USB Device port
*/
static struct at91_udc_data __initdata ek_udc_data = {
- .vbus_pin = AT91_PIN_PC5,
- .pullup_pin = 0, /* pull-up driven by UDC */
+ .vbus_pin = AT91_PIN_PC12,
+ .pullup_pin = 0, /* pull-up driven by UDC */
};
@@ -107,6 +147,26 @@ static struct spi_board_info ek_spi_devi
},
#endif
#endif
+ {
+ .modalias = "mts-io-sout",
+ .chip_select = 0,
+ .bus_num = 1,
+ },
+ {
+ .modalias = "mts-io-board-temp",
+ .chip_select = 2,
+ .bus_num = 1,
+ },
+ {
+ .modalias = "mts-io-dout",
+ .chip_select = 1,
+ .bus_num = 1,
+ },
+ {
+ .modalias = "mts-io-din",
+ .chip_select = 4,
+ .bus_num = 1,
+ },
};
@@ -115,7 +175,7 @@ static struct spi_board_info ek_spi_devi
*/
static struct at91_eth_data __initdata ek_macb_data = {
.phy_irq_pin = AT91_PIN_PA7,
- .is_rmii = 1,
+ .is_rmii = 0,
};
@@ -124,18 +184,48 @@ static struct at91_eth_data __initdata e
*/
static struct mtd_partition __initdata ek_nand_partition[] = {
{
- .name = "Bootstrap",
- .offset = 0,
- .size = 4 * SZ_1M,
+ .name = "MTNCG-NANDFlash",
+ .offset = 0,
+ .size = 256*1024*1024,
+ },
+ {
+ .name = "AT91Bootstrap",
+ .offset = 0,
+ .size = 128*1024,
+ },
+ {
+ .name = "UBoot",
+ .offset = 128*1024,
+ .size = 256*1024,
},
{
- .name = "Partition 1",
- .offset = MTDPART_OFS_NXTBLK,
- .size = 60 * SZ_1M,
+ .name = "UBoot Config",
+ .offset = 384*1024,
+ .size = 128*1024,
},
{
- .name = "Partition 2",
- .offset = MTDPART_OFS_NXTBLK,
+ .name = "UBoot Redundant Config",
+ .offset = 512*1024,
+ .size = 128*1024,
+ },
+ {
+ .name = "uImage",
+ .offset = 640*1024,
+ .size = 59*128*1024,
+ },
+ {
+ .name = "Config",
+ .offset = 64*128*1024,
+ .size = 64*128*1024,
+ },
+ {
+ .name = "Oem Config",
+ .offset = 128*128*1024,
+ .size = 64*128*1024,
+ },
+ {
+ .name = "Rootfs",
+ .offset = 192*128*1024,
.size = MTDPART_SIZ_FULL,
},
};
@@ -195,11 +285,13 @@ static void __init ek_add_device_nand(vo
/*
* MCI (SD/MMC)
- * det_pin, wp_pin and vcc_pin are not connected
+ * vcc_pin is not connected
*/
static struct at91_mmc_data __initdata ek_mmc_data = {
.slot_b = 1,
.wire4 = 1,
+ .det_pin = AT91_PIN_PA6,
+ .wp_pin = AT91_PIN_PA9,
};
@@ -207,15 +299,10 @@ static struct at91_mmc_data __initdata e
* LEDs
*/
static struct gpio_led ek_leds[] = {
- { /* "bottom" led, green, userled1 to be defined */
- .name = "ds5",
- .gpio = AT91_PIN_PA6,
+ { /* "status" led, green */
+ .name = "status",
+ .gpio = AT91_PIN_PA30, /* DJS -- was AT91_PIN_PA9, */
.active_low = 1,
- .default_trigger = "none",
- },
- { /* "power" led, yellow */
- .name = "ds1",
- .gpio = AT91_PIN_PA9,
.default_trigger = "heartbeat",
}
};
@@ -269,15 +356,37 @@ static void __init ek_add_device_buttons
static void __init ek_add_device_buttons(void) {}
#endif
+uint8_t mts_id_eeprom[512];
+
+EXPORT_SYMBOL(mts_id_eeprom);
+
+static void mts_id_eeprom_load(struct memory_accessor *macc, void *context)
+{
+ int tmp;
+
+ memset(mts_id_eeprom, 0, sizeof(mts_id_eeprom));
+
+ tmp = macc->read(macc, mts_id_eeprom, 0, sizeof(mts_id_eeprom));
+ if (tmp != sizeof(mts_id_eeprom)) {
+ printk(KERN_ERR "sam9g20: id eeprom read failed: %d\n", tmp);
+ } else {
+ printk(KERN_INFO "sam9g20: read %d bytes from id eeprom\n", tmp);
+ }
+}
+
+static struct at24_platform_data at24c04_data = {
+ .byte_len = SZ_4K / 8,
+ .page_size = 16,
+ .setup = mts_id_eeprom_load,
+};
static struct i2c_board_info __initdata ek_i2c_devices[] = {
{
- I2C_BOARD_INFO("24c512", 0x50),
- I2C_BOARD_INFO("wm8731", 0x1b),
+ I2C_BOARD_INFO("24c04", 0x56),
+ .platform_data = &at24c04_data,
},
};
-
static void __init ek_board_init(void)
{
/* Serial */
|
