projects / buildroot.git / blob
? search:


05522da5bd68ae0a8713f13f3bff03afc48463c2
[buildroot.git] /
1 diff -urN linux-2.6.28.2-0rig//arch/avr32/boards/atstk1000/atstk1002.c linux-2.6.28.2/arch/avr32/boards/atstk1000/atstk1002.c
2 --- linux-2.6.28.2-0rig//arch/avr32/boards/atstk1000/atstk1002.c 2009-01-29 08:39:35.000000000 +0100
3 +++ linux-2.6.28.2/arch/avr32/boards/atstk1000/atstk1002.c 2009-01-29 09:50:56.000000000 +0100
4 @@ -99,6 +99,7 @@
5 static struct atmel_nand_data atstk1006_nand_data __initdata = {
6 .cle = 21,
7 .ale = 22,
8 + .det_pin = GPIO_PIN_NONE,
9 .rdy_pin = GPIO_PIN_PB(30),
10 .enable_pin = GPIO_PIN_PB(29),
11 .partition_info = nand_part_info,
12 diff -urN linux-2.6.28.2-0rig//arch/avr32/mach-at32ap/at32ap700x.c linux-2.6.28.2/arch/avr32/mach-at32ap/at32ap700x.c
13 --- linux-2.6.28.2-0rig//arch/avr32/mach-at32ap/at32ap700x.c 2009-01-29 09:41:04.000000000 +0100
14 +++ linux-2.6.28.2/arch/avr32/mach-at32ap/at32ap700x.c 2009-01-29 09:50:56.000000000 +0100
15 @@ -1972,13 +1972,14 @@
16 goto fail;
17
18 hmatrix_sfr_set_bits(HMATRIX_SLAVE_EBI, HMATRIX_EBI_NAND_ENABLE);
19 - if (data->enable_pin)
20 +
21 + if (gpio_is_valid(data->enable_pin))
22 at32_select_gpio(data->enable_pin,
23 AT32_GPIOF_OUTPUT | AT32_GPIOF_HIGH);
24 - if (data->rdy_pin)
25 - at32_select_gpio(data->rdy_pin, 0);
26 - if (data->det_pin)
27 + if (gpio_is_valid(data->det_pin))
28 at32_select_gpio(data->det_pin, 0);
29 + if (gpio_is_valid(data->rdy_pin))
30 + at32_select_gpio(data->rdy_pin, 0);
31
32 platform_device_add(pdev);
33 return pdev;