Merge tag 'at91-for-next-dt' of git://github.com/at91linux/linux-at91 into next/dt

"Jean-Christophe PLAGNIOL-VILLARD" <[email protected]> writes:

 ARM: AT91 more DT material

 New SoC conversion and boards support

 SoC convertion to DT:
  - at91sam9260
  - at91sam9263

 boards:
  - Atmel at91sam9g20ek/9263ek
  - Calao TNY-A9260/A9263/A9G20
  - Calao USB-A9260/A9263
  - Ethernnut 5
  - Kizbox

* tag 'at91-for-next-dt' of git://github.com/at91linux/linux-at91: (32 commits)
  Ethernut 5 board support
  ARM: at91: add kizbox board dt support.
  ARM: at91: DT: add Calao TNY A9263 board support
  ARM: at91: DT: add Calao USB A9263 board support
  ARM: at91: add at91sam9263ek DT support
  ARM: at91: add at91sam9263 DT support
  ARM: at91: standard device init only if DT is not populated.
  ARM: at91: DT: add Calao USB A9260 DT support
  ARM: at91: Calao USB A926x factorize common binding in usb_a9260_common
  ARM: at91: USB A926x update nand partition
  ARM: at91: add at91sam9g20ek boards dt support
  arm: at91: add Calao TNY-A9260 and TNY-A9G20 board support
  ARM: at91: add at91sam9260 DT support
  ARM: at91: add defconfig for device tree
  ARM: at91/dt: do not specify the board any more
  ARN: at91: introduce SOC_AT91xxx define to allow to compile SoC core support
  ARM: at91: add SOC_AT91SAM9 kconfig option to factorise select
  ARM: at91: pm select memory controler at runtime
  ARM: at91: move at91_init_leds to board init
  ARM: at91: do not pin mux the UARTs in init_early
  ...

Signed-off-by: Arnd Bergmann <[email protected]>
[olof: rebuilt branch due to drop of an early merge]
Signed-off-by: Olof Johansson <[email protected]>

diff --combined arch/arm/Kconfig
index 6e51ddde908aac16aca57e06d38197c8e10d6044,a69a199a5ecbc70ff907d716363efdc5e8fed975..3707ff06e50ce445f00925fd78a1767439fed82c
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -340,8 -340,8 +340,8 @@@ config ARCH_AT9
        select IRQ_DOMAIN
        select NEED_MACH_IO_H if PCCARD
        help
-         This enables support for systems based on the Atmel AT91RM9200,
-         AT91SAM9 processors.
+         This enables support for systems based on Atmel
+         AT91RM9200 and AT91SAM9* processors.
  
  config ARCH_BCMRING
        bool "Broadcom BCMRING"
@@@ -597,7 -597,6 +597,7 @@@ config ARCH_LPC32X
        select USB_ARCH_HAS_OHCI
        select CLKDEV_LOOKUP
        select GENERIC_CLOCKEVENTS
 +      select USE_OF
        help
          Support for the NXP LPC32XX family of processors
  

diff --combined arch/arm/mach-at91/at91rm9200_devices.c
index 05774e5b1cbaf32488a142b4060a1adc452c8177,d9f0d770978efb887a30948ac5575095a2528900..99affb5d0563432a9b2da1c2861abdc099d64f00
--- 1/arch/arm/mach-at91/at91rm9200_devices.c
--- 2/arch/arm/mach-at91/at91rm9200_devices.c
+++ b/arch/arm/mach-at91/at91rm9200_devices.c
@@@ -1152,14 -1152,6 +1152,6 @@@ void __init at91_register_uart(unsigne
                at91_uarts[portnr] = pdev;
  }
  
- void __init at91_set_serial_console(unsigned portnr)
- {
-       if (portnr < ATMEL_MAX_UART) {
-               atmel_default_console_device = at91_uarts[portnr];
-               at91rm9200_set_console_clock(at91_uarts[portnr]->id);
-       }
- }
- 
  void __init at91_add_device_serial(void)
  {
        int i;
@@@ -1168,13 -1160,10 +1160,9 @@@
                if (at91_uarts[i])
                        platform_device_register(at91_uarts[i]);
        }
- 
-       if (!atmel_default_console_device)
-               printk(KERN_INFO "AT91: No default serial console defined.\n");
  }
  #else
 -void __init __deprecated at91_init_serial(struct at91_uart_config *config) {}
  void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins) {}
- void __init at91_set_serial_console(unsigned portnr) {}
  void __init at91_add_device_serial(void) {}
  #endif
  

diff --combined arch/arm/mach-at91/board-rm9200ek.c
index b2e4fe21f346cf6217dfb78b5e8b3f6553e76fe6,78ffc8315f970d6d1a398be704e7bef89c94d6fc..2b15b8adec4ccb9c671fab7e2423a59f2860ad89
--- 1/arch/arm/mach-at91/board-rm9200ek.c
--- 2/arch/arm/mach-at91/board-rm9200ek.c
+++ b/arch/arm/mach-at91/board-rm9200ek.c
@@@ -50,20 -50,6 +50,6 @@@ static void __init ek_init_early(void
  {
        /* Initialize processor: 18.432 MHz crystal */
        at91_initialize(18432000);
- 
-       /* Setup the LEDs */
-       at91_init_leds(AT91_PIN_PB1, AT91_PIN_PB2);
- 
-       /* DBGU on ttyS0. (Rx & Tx only) */
-       at91_register_uart(0, 0, 0);
- 
-       /* USART1 on ttyS1. (Rx, Tx, CTS, RTS, DTR, DSR, DCD, RI) */
-       at91_register_uart(AT91RM9200_ID_US1, 1, ATMEL_UART_CTS | ATMEL_UART_RTS
-                          | ATMEL_UART_DTR | ATMEL_UART_DSR | ATMEL_UART_DCD
-                          | ATMEL_UART_RI);
- 
-       /* set serial console to ttyS0 (ie, DBGU) */
-       at91_set_serial_console(0);
  }
  
  static struct macb_platform_data __initdata ek_eth_data = {
@@@ -117,7 -103,7 +103,7 @@@ static struct i2c_board_info __initdat
  };
  
  #define EK_FLASH_BASE AT91_CHIPSELECT_0
 -#define EK_FLASH_SIZE SZ_2M
 +#define EK_FLASH_SIZE SZ_8M
  
  static struct physmap_flash_data ek_flash_data = {
        .width          = 2,
@@@ -161,7 -147,17 +147,17 @@@ static struct gpio_led ek_leds[] = 
  
  static void __init ek_board_init(void)
  {
+       /* Setup the LEDs */
+       at91_init_leds(AT91_PIN_PB1, AT91_PIN_PB2);
+ 
        /* Serial */
+       /* DBGU on ttyS0. (Rx & Tx only) */
+       at91_register_uart(0, 0, 0);
+ 
+       /* USART1 on ttyS1. (Rx, Tx, CTS, RTS, DTR, DSR, DCD, RI) */
+       at91_register_uart(AT91RM9200_ID_US1, 1, ATMEL_UART_CTS | ATMEL_UART_RTS
+                          | ATMEL_UART_DTR | ATMEL_UART_DSR | ATMEL_UART_DCD
+                          | ATMEL_UART_RI);
        at91_add_device_serial();
        /* Ethernet */
        at91_add_device_eth(&ek_eth_data);

diff --combined arch/arm/mach-at91/board-sam9261ek.c
index 065fed342424902bbe15aa67101fd524397eaa7b,065b5ee35070e6da3bdce857a6988cb98853f962..2736453821b0d55e9782d065107c176102ca4c35
--- 1/arch/arm/mach-at91/board-sam9261ek.c
--- 2/arch/arm/mach-at91/board-sam9261ek.c
+++ b/arch/arm/mach-at91/board-sam9261ek.c
@@@ -58,15 -58,6 +58,6 @@@ static void __init ek_init_early(void
  {
        /* Initialize processor: 18.432 MHz crystal */
        at91_initialize(18432000);
- 
-       /* Setup the LEDs */
-       at91_init_leds(AT91_PIN_PA13, AT91_PIN_PA14);
- 
-       /* DBGU on ttyS0. (Rx & Tx only) */
-       at91_register_uart(0, 0, 0);
- 
-       /* set serial console to ttyS0 (ie, DBGU) */
-       at91_set_serial_console(0);
  }
  
  /*
@@@ -85,6 -76,8 +76,6 @@@ static struct resource dm9000_resource[
                .flags  = IORESOURCE_MEM
        },
        [2] = {
 -              .start  = AT91_PIN_PC11,
 -              .end    = AT91_PIN_PC11,
                .flags  = IORESOURCE_IRQ
                        | IORESOURCE_IRQ_LOWEDGE | IORESOURCE_IRQ_HIGHEDGE,
        }
@@@ -128,8 -121,6 +119,8 @@@ static struct sam9_smc_config __initdat
  
  static void __init ek_add_device_dm9000(void)
  {
 +      struct resource *r = &dm9000_resource[2];
 +
        /* Configure chip-select 2 (DM9000) */
        sam9_smc_configure(0, 2, &dm9000_smc_config);
  
@@@ -139,7 -130,6 +130,7 @@@
        /* Configure Interrupt pin as input, no pull-up */
        at91_set_gpio_input(AT91_PIN_PC11, 0);
  
 +      r->start = r->end = gpio_to_irq(AT91_PIN_PC11);
        platform_device_register(&dm9000_device);
  }
  #else
@@@ -577,7 -567,12 +568,12 @@@ static struct gpio_led ek_leds[] = 
  
  static void __init ek_board_init(void)
  {
+       /* Setup the LEDs */
+       at91_init_leds(AT91_PIN_PA13, AT91_PIN_PA14);
+ 
        /* Serial */
+       /* DBGU on ttyS0. (Rx & Tx only) */
+       at91_register_uart(0, 0, 0);
        at91_add_device_serial();
        /* USB Host */
        at91_add_device_usbh(&ek_usbh_data);