From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 30 Jul 2011 06:32:53 +0000 (-0700)
Subject: Merge branch 'at91/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm... 
X-Git-Tag: v3.1-rc1~124
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=8f57be8ee44d92ef161c5af685aedbb717db96e0;hp=-c

Merge branch 'at91/cleanup' of git://git./linux/kernel/git/arm/linux-arm-soc

* 'at91/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc:
  at91: add arch specific ioremap support
  at91: factorize sram init
  at91: move register clocks to soc generic init
  at91: move clock subsystem init to soc generic init
  at91: use structure to store the current soc
  at91: remove AT91_DBGU offset from dbgu register macro
  at91: factorize at91 interrupts init to soc
  at91: introduce commom AT91_BASE_SYS
---

8f57be8ee44d92ef161c5af685aedbb717db96e0
diff --combined arch/arm/mach-at91/board-snapper9260.c
index 6010ce16b3cf,25cd3ffce1ee..c73d25e5faea
--- a/arch/arm/mach-at91/board-snapper9260.c
+++ b/arch/arm/mach-at91/board-snapper9260.c
@@@ -4,7 -4,7 +4,7 @@@
   *  Copyright (C) 2010 Bluewater System Ltd
   *
   * Author: Andre Renaud <andre@bluewatersys.com>
 - * Author: Ryan Mallon  <ryan@bluewatersys.com>
 + * Author: Ryan Mallon
   *
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
@@@ -42,7 -42,7 +42,7 @@@
  
  static void __init snapper9260_init_early(void)
  {
- 	at91sam9260_initialize(18432000);
+ 	at91_initialize(18432000);
  
  	/* Debug on ttyS0 */
  	at91_register_uart(0, 0, 0);
@@@ -55,11 -55,6 +55,6 @@@
  	at91_register_uart(AT91SAM9260_ID_US2, 3, 0);
  }
  
- static void __init snapper9260_init_irq(void)
- {
- 	at91sam9260_init_interrupts(NULL);
- }
- 
  static struct at91_usbh_data __initdata snapper9260_usbh_data = {
  	.ports		= 2,
  };
@@@ -179,9 -174,9 +174,9 @@@ static void __init snapper9260_board_in
  
  MACHINE_START(SNAPPER_9260, "Bluewater Systems Snapper 9260/9G20 module")
  	.timer		= &at91sam926x_timer,
- 	.map_io		= at91sam9260_map_io,
+ 	.map_io		= at91_map_io,
  	.init_early	= snapper9260_init_early,
- 	.init_irq	= snapper9260_init_irq,
+ 	.init_irq	= at91_init_irq_default,
  	.init_machine	= snapper9260_board_init,
  MACHINE_END