Merge branch 'move-atmel-mci-h' into boards

diff --combined arch/avr32/boards/atstk1000/atstk1002.c
index 11e7800c16329d5ae579af52506a4e7fd6bac66d,6d94f74bc5c7e3d8b9cc5e5d8ff738ade85ba945..1f33a106905cf9bf1d03400ddb6d116b2a51349d
--- 1/arch/avr32/boards/atstk1000/atstk1002.c
--- 2/arch/avr32/boards/atstk1000/atstk1002.c
+++ b/arch/avr32/boards/atstk1000/atstk1002.c
@@@ -16,12 -16,12 +16,12 @@@
  #include <linux/types.h>
  #include <linux/spi/spi.h>
  #include <linux/spi/at73c213.h>
+ #include <linux/atmel-mci.h>
  
  #include <video/atmel_lcdc.h>
  
  #include <asm/io.h>
  #include <asm/setup.h>
- #include <asm/atmel-mci.h>
  
  #include <mach/at32ap700x.h>
  #include <mach/board.h>
@@@ -287,7 -287,23 +287,7 @@@ static int __init atstk1002_init(void
         * ATSTK1000 uses 32-bit SDRAM interface. Reserve the
         * SDRAM-specific pins so that nobody messes with them.
         */
 -      at32_reserve_pin(GPIO_PIN_PE(0));       /* DATA[16]     */
 -      at32_reserve_pin(GPIO_PIN_PE(1));       /* DATA[17]     */
 -      at32_reserve_pin(GPIO_PIN_PE(2));       /* DATA[18]     */
 -      at32_reserve_pin(GPIO_PIN_PE(3));       /* DATA[19]     */
 -      at32_reserve_pin(GPIO_PIN_PE(4));       /* DATA[20]     */
 -      at32_reserve_pin(GPIO_PIN_PE(5));       /* DATA[21]     */
 -      at32_reserve_pin(GPIO_PIN_PE(6));       /* DATA[22]     */
 -      at32_reserve_pin(GPIO_PIN_PE(7));       /* DATA[23]     */
 -      at32_reserve_pin(GPIO_PIN_PE(8));       /* DATA[24]     */
 -      at32_reserve_pin(GPIO_PIN_PE(9));       /* DATA[25]     */
 -      at32_reserve_pin(GPIO_PIN_PE(10));      /* DATA[26]     */
 -      at32_reserve_pin(GPIO_PIN_PE(11));      /* DATA[27]     */
 -      at32_reserve_pin(GPIO_PIN_PE(12));      /* DATA[28]     */
 -      at32_reserve_pin(GPIO_PIN_PE(13));      /* DATA[29]     */
 -      at32_reserve_pin(GPIO_PIN_PE(14));      /* DATA[30]     */
 -      at32_reserve_pin(GPIO_PIN_PE(15));      /* DATA[31]     */
 -      at32_reserve_pin(GPIO_PIN_PE(26));      /* SDCS         */
 +      at32_reserve_pin(GPIO_PIOE_BASE, ATMEL_EBI_PE_DATA_ALL);
  
  #ifdef CONFIG_BOARD_ATSTK1006
        smc_set_timing(&nand_config, &nand_timing);

diff --combined arch/avr32/boards/atstk1000/atstk1003.c
index ac31666613a14560eef995c9152deaa4b7e40595,db2038cd2e5ba3208b3c06cc94102b6d2bda5c4b..b3a23c88bcfe500ac7511017f62e46ad024736b9
--- 1/arch/avr32/boards/atstk1000/atstk1003.c
--- 2/arch/avr32/boards/atstk1000/atstk1003.c
+++ b/arch/avr32/boards/atstk1000/atstk1003.c
@@@ -17,9 -17,9 +17,9 @@@
  
  #include <linux/spi/at73c213.h>
  #include <linux/spi/spi.h>
+ #include <linux/atmel-mci.h>
  
  #include <asm/setup.h>
- #include <asm/atmel-mci.h>
  
  #include <mach/at32ap700x.h>
  #include <mach/board.h>
@@@ -131,7 -131,23 +131,7 @@@ static int __init atstk1003_init(void
         * ATSTK1000 uses 32-bit SDRAM interface. Reserve the
         * SDRAM-specific pins so that nobody messes with them.
         */
 -      at32_reserve_pin(GPIO_PIN_PE(0));       /* DATA[16]     */
 -      at32_reserve_pin(GPIO_PIN_PE(1));       /* DATA[17]     */
 -      at32_reserve_pin(GPIO_PIN_PE(2));       /* DATA[18]     */
 -      at32_reserve_pin(GPIO_PIN_PE(3));       /* DATA[19]     */
 -      at32_reserve_pin(GPIO_PIN_PE(4));       /* DATA[20]     */
 -      at32_reserve_pin(GPIO_PIN_PE(5));       /* DATA[21]     */
 -      at32_reserve_pin(GPIO_PIN_PE(6));       /* DATA[22]     */
 -      at32_reserve_pin(GPIO_PIN_PE(7));       /* DATA[23]     */
 -      at32_reserve_pin(GPIO_PIN_PE(8));       /* DATA[24]     */
 -      at32_reserve_pin(GPIO_PIN_PE(9));       /* DATA[25]     */
 -      at32_reserve_pin(GPIO_PIN_PE(10));      /* DATA[26]     */
 -      at32_reserve_pin(GPIO_PIN_PE(11));      /* DATA[27]     */
 -      at32_reserve_pin(GPIO_PIN_PE(12));      /* DATA[28]     */
 -      at32_reserve_pin(GPIO_PIN_PE(13));      /* DATA[29]     */
 -      at32_reserve_pin(GPIO_PIN_PE(14));      /* DATA[30]     */
 -      at32_reserve_pin(GPIO_PIN_PE(15));      /* DATA[31]     */
 -      at32_reserve_pin(GPIO_PIN_PE(26));      /* SDCS         */
 +      at32_reserve_pin(GPIO_PIOE_BASE, ATMEL_EBI_PE_DATA_ALL);
  
  #ifdef        CONFIG_BOARD_ATSTK100X_SW2_CUSTOM
        at32_add_device_usart(1);

diff --combined arch/avr32/boards/mimc200/setup.c
index c060d4d2839e85b775dcfb46e1f436b09ebc1e28,811d73027f7706c49ffe36eebbbdba20051ac9d5..2b58d61f0afc3ad8cab3f2925f80bbc253d9a43b
--- 1/arch/avr32/boards/mimc200/setup.c
--- 2/arch/avr32/boards/mimc200/setup.c
+++ b/arch/avr32/boards/mimc200/setup.c
@@@ -24,7 -24,7 +24,7 @@@ extern struct atmel_lcdfb_info mimc200_
  #include <video/atmel_lcdc.h>
  #include <linux/fb.h>
  
- #include <asm/atmel-mci.h>
+ #include <linux/atmel-mci.h>
  #include <linux/io.h>
  #include <asm/setup.h>
  
@@@ -207,6 -207,8 +207,6 @@@ static int __init mimc200_init(void
         * reserve any pins for it.
         */
  
 -      at32_add_system_devices();
 -
        at32_add_device_usart(0);
        at32_add_device_usart(1);
        at32_add_device_usart(2);

diff --combined arch/avr32/mach-at32ap/at32ap700x.c
index b3293bf77e9436249c7ff1bbcb1c2fb5c1ac33ea,3cf49553e4f9a154b57e5d7e56040922da6bd5fa..ea7bc1e8562be302f7d75be16bb8844ca52e3510
--- 1/arch/avr32/mach-at32ap/at32ap700x.c
--- 2/arch/avr32/mach-at32ap/at32ap700x.c
+++ b/arch/avr32/mach-at32ap/at32ap700x.c
@@@ -15,8 -15,8 +15,8 @@@
  #include <linux/gpio.h>
  #include <linux/spi/spi.h>
  #include <linux/usb/atmel_usba_udc.h>
+ #include <linux/atmel-mci.h>
  
- #include <asm/atmel-mci.h>
  #include <asm/io.h>
  #include <asm/irq.h>
  
@@@ -421,7 -421,7 +421,7 @@@ static unsigned long hsb_clk_get_rate(s
        return bus_clk_get_rate(clk, shift);
  }
  
 -static void pba_clk_mode(struct clk *clk, int enabled)
 +void pba_clk_mode(struct clk *clk, int enabled)
  {
        unsigned long flags;
        u32 mask;
@@@ -436,7 -436,7 +436,7 @@@
        spin_unlock_irqrestore(&pm_lock, flags);
  }
  
 -static unsigned long pba_clk_get_rate(struct clk *clk)
 +unsigned long pba_clk_get_rate(struct clk *clk)
  {
        unsigned long cksel, shift = 0;