Merge branches 'boards' and 'fixes' of git://git.kernel.org/pub/scm/linux/kernel...

diff --combined arch/avr32/Kconfig
index 5252e15445b08a1c52431ab282b5d5e6981feb46,33a5b2969eb4addf24e36a59159d72488530dc0b..26eca87f673592d78617d16279a63aceebe0589f
--- 1/arch/avr32/Kconfig
--- 2/arch/avr32/Kconfig
+++ b/arch/avr32/Kconfig
@@@ -72,6 -72,8 +72,8 @@@ config GENERIC_BU
  
  source "init/Kconfig"
  
+ source "kernel/Kconfig.freezer"
+ 
  menu "System Type and features"
  
  source "kernel/time/Kconfig"
@@@ -119,19 -121,11 +121,19 @@@ config BOARD_ATSTK100
  config BOARD_ATNGW100
        bool "ATNGW100 Network Gateway"
        select CPU_AT32AP7000
 +
 +config BOARD_FAVR_32
 +      bool "Favr-32 LCD-board"
 +      select CPU_AT32AP7000
 +
 +config BOARD_MIMC200
 +      bool "MIMC200 CPU board"
 +      select CPU_AT32AP7000
  endchoice
  
 -if BOARD_ATSTK1000
  source "arch/avr32/boards/atstk1000/Kconfig"
 -endif
 +source "arch/avr32/boards/atngw100/Kconfig"
 +source "arch/avr32/boards/favr-32/Kconfig"
  
  choice
        prompt "Boot loader type"

diff --combined arch/avr32/boards/atngw100/setup.c
index af38ab3e45025da061500c7c280e9558f47ae395,259ceee02b6291c73d4b7cea5e158b40c0628e41..32fb9ba0fbdfe40e6943b2c5bdebbfd706bd59ad
--- 1/arch/avr32/boards/atngw100/setup.c
--- 2/arch/avr32/boards/atngw100/setup.c
+++ b/arch/avr32/boards/atngw100/setup.c
@@@ -56,13 -56,8 +56,13 @@@ static struct spi_board_info spi0_board
  static struct mci_platform_data __initdata mci0_data = {
        .slot[0] = {
                .bus_width      = 4,
 +#ifndef CONFIG_BOARD_ATNGW100_EVKLCD10X
                .detect_pin     = GPIO_PIN_PC(25),
                .wp_pin         = GPIO_PIN_PE(0),
 +#else
 +              .detect_pin     = GPIO_PIN_NONE,
 +              .wp_pin         = GPIO_PIN_NONE,
 +#endif
        },
  };
  
@@@ -177,8 -172,6 +177,6 @@@ static int __init atngw100_init(void
         * reserve any pins for it.
         */
  
-       at32_add_system_devices();
- 
        at32_add_device_usart(0);
  
        set_hw_addr(at32_add_device_eth(0, &eth_data[0]));

diff --combined arch/avr32/mach-at32ap/at32ap700x.c
index caec25a2eec62a34041ebee39ac5e45641c85484,748ac68c73dcb0bf0e1367dbf5f3c0afddd8e02f..0c6e02f80a31ce6cd562aa2147d0144a3e89b913
--- 1/arch/avr32/mach-at32ap/at32ap700x.c
--- 2/arch/avr32/mach-at32ap/at32ap700x.c
+++ b/arch/avr32/mach-at32ap/at32ap700x.c
@@@ -813,7 -813,7 +813,7 @@@ static struct resource pio4_resource[] 
  DEFINE_DEV(pio, 4);
  DEV_CLK(mck, pio4, pba, 14);
  
- void __init at32_add_system_devices(void)
+ static int __init system_device_init(void)
  {
        platform_device_register(&at32_pm0_device);
        platform_device_register(&at32_intc0_device);
@@@ -832,7 -832,10 +832,10 @@@
        platform_device_register(&pio2_device);
        platform_device_register(&pio3_device);
        platform_device_register(&pio4_device);
+ 
+       return 0;
  }
+ core_initcall(system_device_init);
  
  /* --------------------------------------------------------------------
   *  PSIF
@@@ -1091,9 -1094,7 +1094,9 @@@ at32_add_device_eth(unsigned int id, st
                        pin_mask |= (1 << 11);  /* RXD2 */
                        pin_mask |= (1 << 12);  /* RXD3 */
                        pin_mask |= (1 << 14);  /* RXCK */
 +#ifndef CONFIG_BOARD_MIMC200
                        pin_mask |= (1 << 18);  /* SPD  */
 +#endif
                }
  
                select_peripheral(PIOC, pin_mask, PERIPH_A, 0);
@@@ -1114,10 -1115,8 +1117,10 @@@
                pin_mask |= (1 << 3);   /* MDC  */
                pin_mask |= (1 << 2);   /* MDIO */
  
 +#ifndef CONFIG_BOARD_MIMC200
                if (!data->is_rmii)
                        pin_mask |= (1 << 15);  /* SPD  */
 +#endif
  
                select_peripheral(PIOD, pin_mask, PERIPH_B, 0);
  
@@@ -1474,7 -1473,7 +1477,7 @@@ at32_add_device_lcdc(unsigned int id, s
                        pin_mask = ATMEL_LCDC_PRI_24BIT | ATMEL_LCDC_PRI_CONTROL;
  
                /* LCDC on port C */
-               portc_mask = (pin_mask & 0xfff80000) >> 19;
+               portc_mask = pin_mask & 0xfff80000;
                select_peripheral(PIOC, portc_mask, PERIPH_A, 0);
  
                /* LCDC on port D */