1
0

foxg20.patch 14 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522
  1. diff -Nur linux-2.6.36.orig/arch/arm/Kconfig linux-2.6.36/arch/arm/Kconfig
  2. --- linux-2.6.36.orig/arch/arm/Kconfig 2010-10-20 22:30:22.000000000 +0200
  3. +++ linux-2.6.36/arch/arm/Kconfig 2010-12-25 17:49:20.000000000 +0100
  4. @@ -21,6 +21,8 @@
  5. select HAVE_FUNCTION_TRACER if (!XIP_KERNEL)
  6. select HAVE_GENERIC_DMA_COHERENT
  7. select HAVE_KERNEL_GZIP
  8. + select HAVE_KERNEL_BZIP2
  9. + select HAVE_KERNEL_LZMA
  10. select HAVE_KERNEL_LZO
  11. select HAVE_KERNEL_LZMA
  12. select HAVE_PERF_EVENTS
  13. diff -Nur linux-2.6.36.orig/arch/arm/include/asm/setup.h linux-2.6.36/arch/arm/include/asm/setup.h
  14. --- linux-2.6.36.orig/arch/arm/include/asm/setup.h 2010-10-20 22:30:22.000000000 +0200
  15. +++ linux-2.6.36/arch/arm/include/asm/setup.h 2010-12-25 17:49:20.000000000 +0100
  16. @@ -18,6 +18,8 @@
  17. #define COMMAND_LINE_SIZE 1024
  18. +const char *get_system_type(void);
  19. +
  20. /* The list ends with an ATAG_NONE node. */
  21. #define ATAG_NONE 0x00000000
  22. diff -Nur linux-2.6.36.orig/arch/arm/kernel/setup.c linux-2.6.36/arch/arm/kernel/setup.c
  23. --- linux-2.6.36.orig/arch/arm/kernel/setup.c 2010-10-20 22:30:22.000000000 +0200
  24. +++ linux-2.6.36/arch/arm/kernel/setup.c 2010-12-25 17:49:20.000000000 +0100
  25. @@ -899,8 +899,12 @@
  26. static int c_show(struct seq_file *m, void *v)
  27. {
  28. + unsigned long n = (unsigned long) v - 1;
  29. int i;
  30. + if (n == 0)
  31. + seq_printf(m, "system type\t\t: %s\n", get_system_type());
  32. +
  33. seq_printf(m, "Processor\t: %s rev %d (%s)\n",
  34. cpu_name, read_cpuid_id() & 15, elf_platform);
  35. diff -Nur linux-2.6.36.orig/arch/arm/mach-at91/Kconfig linux-2.6.36/arch/arm/mach-at91/Kconfig
  36. --- linux-2.6.36.orig/arch/arm/mach-at91/Kconfig 2010-10-20 22:30:22.000000000 +0200
  37. +++ linux-2.6.36/arch/arm/mach-at91/Kconfig 2010-12-25 17:49:20.000000000 +0100
  38. @@ -364,6 +364,15 @@
  39. evaluation board.
  40. <http://www.taskit.de/en/>
  41. +config MACH_FOXG20
  42. + bool "Acme Systems FOX G20"
  43. + select HAVE_AT91_DATAFLASH_CARD
  44. + select HAVE_NAND_ATMEL_BUSWIDTH_16
  45. + depends on ARCH_AT91SAM9G20
  46. + help
  47. + Select this if you are using Acme Systems
  48. + FOX Board G20 <http://netus.acmesystems.it>
  49. +
  50. endif
  51. if (ARCH_AT91SAM9260 || ARCH_AT91SAM9G20)
  52. diff -Nur linux-2.6.36.orig/arch/arm/mach-at91/Makefile linux-2.6.36/arch/arm/mach-at91/Makefile
  53. --- linux-2.6.36.orig/arch/arm/mach-at91/Makefile 2010-10-20 22:30:22.000000000 +0200
  54. +++ linux-2.6.36/arch/arm/mach-at91/Makefile 2010-12-25 17:49:20.000000000 +0100
  55. @@ -72,6 +72,9 @@
  56. # AT91SAM9G45 board-specific support
  57. obj-$(CONFIG_MACH_AT91SAM9G45EKES) += board-sam9m10g45ek.o
  58. +# FOXG20 board-specific support
  59. +obj-$(CONFIG_MACH_FOXG20) += board-foxg20.o
  60. +
  61. # AT91CAP9 board-specific support
  62. obj-$(CONFIG_MACH_AT91CAP9ADK) += board-cap9adk.o
  63. diff -Nur linux-2.6.36.orig/arch/arm/mach-at91/at91sam9260_devices.c linux-2.6.36/arch/arm/mach-at91/at91sam9260_devices.c
  64. --- linux-2.6.36.orig/arch/arm/mach-at91/at91sam9260_devices.c 2010-10-20 22:30:22.000000000 +0200
  65. +++ linux-2.6.36/arch/arm/mach-at91/at91sam9260_devices.c 2010-12-25 17:49:20.000000000 +0100
  66. @@ -454,7 +454,15 @@
  67. .sda_is_open_drain = 1,
  68. .scl_pin = AT91_PIN_PA24,
  69. .scl_is_open_drain = 1,
  70. +#if defined(CONFIG_MACH_FOXG20)
  71. + /* Some I2C devices are limited to 100 kHz and i2c-gpio.h
  72. + * says "frequency is (500 / udelay) kHz" so 5 is best (and is
  73. + * used in i2c-gpio.c)
  74. + */
  75. + .udelay = 5, /* ~100 kHz */
  76. +#else
  77. .udelay = 2, /* ~100 kHz */
  78. +#endif
  79. };
  80. static struct platform_device at91sam9260_twi_device = {
  81. diff -Nur linux-2.6.36.orig/arch/arm/mach-at91/board-foxg20.c linux-2.6.36/arch/arm/mach-at91/board-foxg20.c
  82. --- linux-2.6.36.orig/arch/arm/mach-at91/board-foxg20.c 1970-01-01 01:00:00.000000000 +0100
  83. +++ linux-2.6.36/arch/arm/mach-at91/board-foxg20.c 2010-12-25 17:49:20.000000000 +0100
  84. @@ -0,0 +1,376 @@
  85. +/*
  86. + * Copyright (C) 2005 SAN People
  87. + * Copyright (C) 2008 Atmel
  88. + * Copyright (C) 2010 Lee McLoughlin - lee@lmmrtech.com
  89. + *
  90. + * This program is free software; you can redistribute it and/or modify
  91. + * it under the terms of the GNU General Public License as published by
  92. + * the Free Software Foundation; either version 2 of the License, or
  93. + * (at your option) any later version.
  94. + *
  95. + * This program is distributed in the hope that it will be useful,
  96. + * but WITHOUT ANY WARRANTY; without even the implied warranty of
  97. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  98. + * GNU General Public License for more details.
  99. + *
  100. + * You should have received a copy of the GNU General Public License
  101. + * along with this program; if not, write to the Free Software
  102. + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  103. + */
  104. +
  105. +#include <linux/types.h>
  106. +#include <linux/init.h>
  107. +#include <linux/mm.h>
  108. +#include <linux/module.h>
  109. +#include <linux/platform_device.h>
  110. +#include <linux/spi/spi.h>
  111. +#include <linux/spi/at73c213.h>
  112. +#include <linux/gpio_keys.h>
  113. +#include <linux/input.h>
  114. +#include <linux/clk.h>
  115. +#include <linux/w1-gpio.h>
  116. +
  117. +#include <mach/hardware.h>
  118. +#include <asm/setup.h>
  119. +#include <asm/mach-types.h>
  120. +#include <asm/irq.h>
  121. +
  122. +#include <asm/mach/arch.h>
  123. +#include <asm/mach/map.h>
  124. +#include <asm/mach/irq.h>
  125. +
  126. +#include <mach/board.h>
  127. +#include <mach/gpio.h>
  128. +#include <mach/at91sam9_smc.h>
  129. +
  130. +#include "sam9_smc.h"
  131. +#include "generic.h"
  132. +
  133. +/*
  134. + * The FOX hardware comes as the "Netus" board with just the cpu, ram,
  135. + * dataflash and two header connectors. This is plugged into the Fox board
  136. + * which provides the ethernet, usb, rtc, leds, switch, ...
  137. + * Other version of the Fox board are planned which could contain
  138. + * both NAND and sound (WM8731).
  139. + *
  140. + * By default USART4 and USART5 are not enabled (freeing up those pins
  141. + * for general use)
  142. + *
  143. + * Note: Enabling the NAND without a NAND device present doesn't cause
  144. + * any issues as on boot the probe will fail.
  145. + */
  146. +/* #define FOXG20_NAND */
  147. +/* #define FOXG20_WM8731 */
  148. +/* #define FOX_USART4 */
  149. +/* #define FOX_USART5 */
  150. +
  151. +const char *get_system_type(void)
  152. +{
  153. + return "FoxBoard FOXG20";
  154. +}
  155. +
  156. +static void __init foxg20_map_io(void)
  157. +{
  158. + /* Initialize processor: 18.432 MHz crystal */
  159. + at91sam9260_initialize(18432000);
  160. +
  161. + /* DBGU on ttyS0. (Rx & Tx only) */
  162. + at91_register_uart(0, 0, 0);
  163. +
  164. + /* USART0 on ttyS1. (Rx, Tx, CTS, RTS, DTR, DSR, DCD, RI) */
  165. + at91_register_uart(AT91SAM9260_ID_US0, 1, ATMEL_UART_CTS | ATMEL_UART_RTS
  166. + | ATMEL_UART_DTR | ATMEL_UART_DSR | ATMEL_UART_DCD
  167. + | ATMEL_UART_RI);
  168. +
  169. + /* USART1 on ttyS2. (Rx, Tx, RTS, CTS) */
  170. + at91_register_uart(AT91SAM9260_ID_US1, 2, ATMEL_UART_CTS | ATMEL_UART_RTS);
  171. +
  172. + /* USART2 on ttyS3. (Rx & Tx only) */
  173. + at91_register_uart(AT91SAM9260_ID_US2, 3, 0);
  174. +
  175. + /* USART3 on ttyS4. (Rx, Tx, RTS, CTS) */
  176. + at91_register_uart(AT91SAM9260_ID_US3, 4, ATMEL_UART_CTS | ATMEL_UART_RTS);
  177. +
  178. +#if defined(FOX_USART4)
  179. + /* USART4 on ttyS5. (Rx & Tx only) */
  180. + at91_register_uart(AT91SAM9260_ID_US4, 5, 0);
  181. +#endif
  182. +
  183. +#if defined(FOX_USART5)
  184. + /* USART5 on ttyS6. (Rx & Tx only) */
  185. + at91_register_uart(AT91SAM9260_ID_US5, 6, 0);
  186. +#endif
  187. +
  188. + /* set serial console to ttyS0 (ie, DBGU) */
  189. + at91_set_serial_console(0);
  190. +}
  191. +
  192. +static void __init foxg20_init_irq(void)
  193. +{
  194. + at91sam9260_init_interrupts(NULL);
  195. +}
  196. +
  197. +
  198. +/*
  199. + * USB Host port
  200. + */
  201. +static struct at91_usbh_data __initdata foxg20_usbh_data = {
  202. + .ports = 2,
  203. +};
  204. +
  205. +/*
  206. + * USB Device port
  207. + */
  208. +static struct at91_udc_data __initdata foxg20_udc_data = {
  209. + .vbus_pin = AT91_PIN_PC6,
  210. + .pullup_pin = 0, /* pull-up driven by UDC */
  211. +};
  212. +
  213. +
  214. +/*
  215. + * SPI devices.
  216. + */
  217. +static struct spi_board_info foxg20_spi_devices[] = {
  218. +#if !defined(CONFIG_MMC_AT91)
  219. + {
  220. + .modalias = "mtd_dataflash",
  221. + .chip_select = 1,
  222. + .max_speed_hz = 15 * 1000 * 1000,
  223. + .bus_num = 0,
  224. + },
  225. +#endif
  226. +};
  227. +
  228. +
  229. +/*
  230. + * MACB Ethernet device
  231. + */
  232. +static struct at91_eth_data __initdata foxg20_macb_data = {
  233. + .phy_irq_pin = AT91_PIN_PA7,
  234. + .is_rmii = 1,
  235. +};
  236. +
  237. +
  238. +#ifdef FOXG20_NAND
  239. +/* The Fox doesn't have NAND memory */
  240. +/*
  241. + * NAND flash
  242. + */
  243. +static struct mtd_partition __initdata foxg20_nand_partition[] = {
  244. + {
  245. + .name = "Bootstrap",
  246. + .offset = 0,
  247. + .size = 4 * SZ_1M,
  248. + },
  249. + {
  250. + .name = "Partition 1",
  251. + .offset = MTDPART_OFS_NXTBLK,
  252. + .size = 60 * SZ_1M,
  253. + },
  254. + {
  255. + .name = "Partition 2",
  256. + .offset = MTDPART_OFS_NXTBLK,
  257. + .size = MTDPART_SIZ_FULL,
  258. + },
  259. +};
  260. +
  261. +static struct mtd_partition * __init nand_partitions(int size, int *num_partitions)
  262. +{
  263. + *num_partitions = ARRAY_SIZE(foxg20_nand_partition);
  264. + return foxg20_nand_partition;
  265. +}
  266. +
  267. +/* det_pin is not connected */
  268. +static struct atmel_nand_data __initdata foxg20_nand_data = {
  269. + .ale = 21,
  270. + .cle = 22,
  271. + .rdy_pin = AT91_PIN_PC13,
  272. + .enable_pin = AT91_PIN_PC14,
  273. + .partition_info = nand_partitions,
  274. +#if defined(CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16)
  275. + .bus_width_16 = 1,
  276. +#else
  277. + .bus_width_16 = 0,
  278. +#endif
  279. +};
  280. +
  281. +static struct sam9_smc_config __initdata foxg20_nand_smc_config = {
  282. + .ncs_read_setup = 0,
  283. + .nrd_setup = 2,
  284. + .ncs_write_setup = 0,
  285. + .nwe_setup = 2,
  286. +
  287. + .ncs_read_pulse = 4,
  288. + .nrd_pulse = 4,
  289. + .ncs_write_pulse = 4,
  290. + .nwe_pulse = 4,
  291. +
  292. + .read_cycle = 7,
  293. + .write_cycle = 7,
  294. +
  295. + .mode = AT91_SMC_READMODE | AT91_SMC_WRITEMODE | AT91_SMC_EXNWMODE_DISABLE,
  296. + .tdf_cycles = 3,
  297. +};
  298. +
  299. +static void __init foxg20_add_device_nand(void)
  300. +{
  301. + /* setup bus-width (8 or 16) */
  302. + if (foxg20_nand_data.bus_width_16)
  303. + foxg20_nand_smc_config.mode |= AT91_SMC_DBW_16;
  304. + else
  305. + foxg20_nand_smc_config.mode |= AT91_SMC_DBW_8;
  306. +
  307. + /* configure chip-select 3 (NAND) */
  308. + sam9_smc_configure(3, &foxg20_nand_smc_config);
  309. +
  310. + at91_add_device_nand(&foxg20_nand_data);
  311. +}
  312. +#endif
  313. +
  314. +
  315. +/*
  316. + * MCI (SD/MMC)
  317. + * det_pin, wp_pin and vcc_pin are not connected
  318. + */
  319. +static struct at91_mmc_data __initdata foxg20_mmc_data = {
  320. + .slot_b = 1,
  321. + .wire4 = 1,
  322. +};
  323. +
  324. +
  325. +/*
  326. + * LEDs
  327. + */
  328. +static struct gpio_led foxg20_leds[] = {
  329. + { /* user led, red */
  330. + .name = "user_led",
  331. + .gpio = AT91_PIN_PC7,
  332. + .active_low = 0,
  333. + .default_trigger = "heartbeat",
  334. + },
  335. +};
  336. +
  337. +
  338. +/*
  339. + * GPIO Buttons
  340. + */
  341. +#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
  342. +static struct gpio_keys_button foxg20_buttons[] = {
  343. + {
  344. + .gpio = AT91_PIN_PC4,
  345. + .code = BTN_1,
  346. + .desc = "Button 1",
  347. + .active_low = 1,
  348. + .wakeup = 1,
  349. + },
  350. +};
  351. +
  352. +static struct gpio_keys_platform_data foxg20_button_data = {
  353. + .buttons = foxg20_buttons,
  354. + .nbuttons = ARRAY_SIZE(foxg20_buttons),
  355. +};
  356. +
  357. +static struct platform_device foxg20_button_device = {
  358. + .name = "gpio-keys",
  359. + .id = -1,
  360. + .num_resources = 0,
  361. + .dev = {
  362. + .platform_data = &foxg20_button_data,
  363. + }
  364. +};
  365. +
  366. +static void __init foxg20_add_device_buttons(void)
  367. +{
  368. + at91_set_gpio_input(AT91_PIN_PC4, 1); /* btn1 */
  369. + at91_set_deglitch(AT91_PIN_PC4, 1);
  370. +
  371. + platform_device_register(&foxg20_button_device);
  372. +}
  373. +#else
  374. +static void __init foxg20_add_device_buttons(void) {}
  375. +#endif
  376. +
  377. +
  378. +#if !defined(FOXG20_WM8731)
  379. +#if defined(CONFIG_W1_MASTER_GPIO) || defined(CONFIG_W1_MASTER_GPIO_MODULE)
  380. +static struct w1_gpio_platform_data w1_gpio_pdata = {
  381. + /* If you choose to use a pin other than PB16 it needs to be 3.3V */
  382. + .pin = AT91_PIN_PB16,
  383. + .is_open_drain = 1,
  384. +};
  385. +
  386. +static struct platform_device w1_device = {
  387. + .name = "w1-gpio",
  388. + .id = -1,
  389. + .dev.platform_data = &w1_gpio_pdata,
  390. +};
  391. +
  392. +static void __init at91_add_device_w1(void)
  393. +{
  394. + at91_set_GPIO_periph(w1_gpio_pdata.pin, 1);
  395. + at91_set_multi_drive(w1_gpio_pdata.pin, 1);
  396. + platform_device_register(&w1_device);
  397. +}
  398. +
  399. +#endif
  400. +#endif
  401. +
  402. +
  403. +static struct i2c_board_info __initdata foxg20_i2c_devices[] = {
  404. + {
  405. + I2C_BOARD_INFO("24c512", 0x50),
  406. +#ifdef FOXG20_WM8731
  407. + I2C_BOARD_INFO("wm8731", 0x1b),
  408. +#endif
  409. + },
  410. +};
  411. +
  412. +
  413. +static void __init foxg20_board_init(void)
  414. +{
  415. + /* Serial */
  416. + at91_add_device_serial();
  417. + /* USB Host */
  418. + at91_add_device_usbh(&foxg20_usbh_data);
  419. + /* USB Device */
  420. + at91_add_device_udc(&foxg20_udc_data);
  421. + /* SPI */
  422. + at91_add_device_spi(foxg20_spi_devices, ARRAY_SIZE(foxg20_spi_devices));
  423. +#ifdef FOXG20_NAND
  424. + /* The Fox doesn't have NAND memory */
  425. + /* NAND */
  426. + foxg20_add_device_nand();
  427. +#endif
  428. + /* Ethernet */
  429. + at91_add_device_eth(&foxg20_macb_data);
  430. + /* MMC */
  431. + at91_add_device_mmc(0, &foxg20_mmc_data);
  432. + /* I2C */
  433. + at91_add_device_i2c(foxg20_i2c_devices, ARRAY_SIZE(foxg20_i2c_devices));
  434. + /* LEDs */
  435. + at91_gpio_leds(foxg20_leds, ARRAY_SIZE(foxg20_leds));
  436. + /* Push Buttons */
  437. + foxg20_add_device_buttons();
  438. +#ifdef FOXG20_WM8731
  439. + /* The Fox doesn't have this sound chip */
  440. + /* PCK0 provides MCLK to the WM8731 */
  441. + at91_set_B_periph(AT91_PIN_PC1, 0);
  442. + /* SSC (for WM8731) */
  443. + at91_add_device_ssc(AT91SAM9260_ID_SSC, ATMEL_SSC_TX);
  444. +#else
  445. +#if defined(CONFIG_W1_MASTER_GPIO) || defined(CONFIG_W1_MASTER_GPIO_MODULE)
  446. + at91_add_device_w1();
  447. +#endif
  448. +#endif
  449. +}
  450. +
  451. +MACHINE_START(AT91SAM9G20EK, "Acme Systems FOXG20")
  452. + /* Maintainer: Lee McLoughlin */
  453. + .phys_io = AT91_BASE_SYS,
  454. + .io_pg_offst = (AT91_VA_BASE_SYS >> 18) & 0xfffc,
  455. + .boot_params = AT91_SDRAM_BASE + 0x100,
  456. + .timer = &at91sam926x_timer,
  457. + .map_io = foxg20_map_io,
  458. + .init_irq = foxg20_init_irq,
  459. + .init_machine = foxg20_board_init,
  460. +MACHINE_END
  461. diff -Nur linux-2.6.36.orig/drivers/mmc/host/Kconfig linux-2.6.36/drivers/mmc/host/Kconfig
  462. --- linux-2.6.36.orig/drivers/mmc/host/Kconfig 2010-10-20 22:30:22.000000000 +0200
  463. +++ linux-2.6.36/drivers/mmc/host/Kconfig 2010-12-25 19:15:17.000000000 +0100
  464. @@ -208,12 +208,12 @@
  465. If unsure, say N.
  466. -choice
  467. - prompt "Atmel SD/MMC Driver"
  468. - depends on AVR32 || ARCH_AT91
  469. - default MMC_ATMELMCI if AVR32
  470. - help
  471. - Choose which driver to use for the Atmel MCI Silicon
  472. +#choice
  473. +# prompt "Atmel SD/MMC Driver"
  474. +# depends on AVR32 || ARCH_AT91
  475. +# default MMC_ATMELMCI if AVR32
  476. +# help
  477. +# Choose which driver to use for the Atmel MCI Silicon
  478. config MMC_AT91
  479. tristate "AT91 SD/MMC Card Interface support"
  480. @@ -223,17 +223,17 @@
  481. If unsure, say N.
  482. -config MMC_ATMELMCI
  483. - tristate "Atmel Multimedia Card Interface support"
  484. - depends on AVR32 || ARCH_AT91
  485. - help
  486. - This selects the Atmel Multimedia Card Interface driver. If
  487. - you have an AT32 (AVR32) or AT91 platform with a Multimedia
  488. - Card slot, say Y or M here.
  489. -
  490. - If unsure, say N.
  491. -
  492. -endchoice
  493. +#config MMC_ATMELMCI
  494. +# tristate "Atmel Multimedia Card Interface support"
  495. +# depends on AVR32 || ARCH_AT91
  496. +# help
  497. +# This selects the Atmel Multimedia Card Interface driver. If
  498. +# you have an AT32 (AVR32) or AT91 platform with a Multimedia
  499. +# Card slot, say Y or M here.
  500. +#
  501. +# If unsure, say N.
  502. +#
  503. +#endchoice
  504. config MMC_ATMELMCI_DMA
  505. bool "Atmel MCI DMA support (EXPERIMENTAL)"