From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 30 Apr 2012 22:08:35 +0000 (+0200)
Subject: Merge tag 'at91-for-next-dt' of git://github.com/at91linux/linux-at91 into next/dt
X-Git-Tag: v3.5-rc1~154^2~4
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=47fad7c6f8d9f64780793cc67d8280259538c31c;p=linux.git

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

"Jean-Christophe PLAGNIOL-VILLARD" <plagnioj@jcrosoft.com> 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 <arnd@arndb.de>
[olof: rebuilt branch due to drop of an early merge]
Signed-off-by: Olof Johansson <olof@lixom.net>
---

47fad7c6f8d9f64780793cc67d8280259538c31c
diff --cc arch/arm/mach-at91/at91rm9200_devices.c
index 05774e5b1cba,d9f0d770978e..99affb5d0563
--- a/arch/arm/mach-at91/at91rm9200_devices.c
+++ b/arch/arm/mach-at91/at91rm9200_devices.c
@@@ -1168,13 -1160,10 +1160,9 @@@ void __init at91_add_device_serial(void
  		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