From: Olof Johansson <olof@lixom.net>
Date: Tue, 20 Dec 2011 19:06:45 +0000 (-0800)
Subject: Merge branch 'for-3.3/boards' into for-next
X-Git-Tag: next-20111221~97^2~2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ba425b8b7fe10b6a73a61521175e2c01377b4899;p=karo-tx-linux.git

Merge branch 'for-3.3/boards' into for-next

Conflicts:
	arch/arm/mach-tegra/board-harmony-pcie.c
---

ba425b8b7fe10b6a73a61521175e2c01377b4899
diff --cc arch/arm/mach-tegra/board-dt-tegra20.c
index ddaa037be028,909065f62e38..70f060251f00
--- a/arch/arm/mach-tegra/board-dt-tegra20.c
+++ b/arch/arm/mach-tegra/board-dt-tegra20.c
@@@ -106,17 -93,16 +108,10 @@@ static struct 
  
  static void __init tegra_dt_init(void)
  {
 -	struct device_node *node;
  	int i;
  
 -	node = of_find_matching_node_by_address(NULL, tegra_dt_gic_match,
 -						TEGRA_ARM_INT_DIST_BASE);
 -	if (node)
 -		irq_domain_add_simple(node, INT_GIC_BASE);
 -
  	tegra_clk_init_from_table(tegra_dt_clk_init_table);
  
- 	/*
- 	 * Finished with the static registrations now; fill in the missing
- 	 * devices
- 	 */
- 	of_platform_populate(NULL, tegra_dt_match_table,
- 				tegra20_auxdata_lookup, NULL);
- 
  	for (i = 0; i < ARRAY_SIZE(pinmux_configs); i++) {
  		if (of_machine_is_compatible(pinmux_configs[i].machine)) {
  			pinmux_configs[i].init();
@@@ -126,12 -112,17 +121,19 @@@
  
  	WARN(i == ARRAY_SIZE(pinmux_configs),
  		"Unknown platform! Pinmuxing not initialized\n");
+ 
+ 	/*
+ 	 * Finished with the static registrations now; fill in the missing
+ 	 * devices
+ 	 */
+ 	of_platform_populate(NULL, tegra_dt_match_table,
+ 				tegra20_auxdata_lookup, NULL);
  }
  
 -static const char * tegra_dt_board_compat[] = {
 +static const char *tegra20_dt_board_compat[] = {
 +	"compulab,trimslice",
  	"nvidia,harmony",
 +	"compal,paz00",
  	"nvidia,seaboard",
  	"nvidia,ventana",
  	NULL
diff --cc arch/arm/mach-tegra/board-seaboard-pinmux.c
index f6b9c01ef0db,a448f29fbbb2..55e7e43a14ad
--- a/arch/arm/mach-tegra/board-seaboard-pinmux.c
+++ b/arch/arm/mach-tegra/board-seaboard-pinmux.c
@@@ -19,11 -19,11 +19,11 @@@
  #include <linux/of.h>
  
  #include <mach/pinmux.h>
 -#include <mach/pinmux-t2.h>
 +#include <mach/pinmux-tegra20.h>
  
  #include "gpio-names.h"
+ #include "board-pinmux.h"
  #include "board-seaboard.h"
- #include "devices.h"
  
  #define DEFAULT_DRIVE(_name)					\
  	{							\
diff --cc arch/arm/mach-tegra/board-trimslice-pinmux.c
index 7331e15b73cc,1b3ccec45ea5..a21a2be57cb6
--- a/arch/arm/mach-tegra/board-trimslice-pinmux.c
+++ b/arch/arm/mach-tegra/board-trimslice-pinmux.c
@@@ -19,13 -19,12 +19,13 @@@
  #include <linux/of.h>
  
  #include <mach/pinmux.h>
 +#include <mach/pinmux-tegra20.h>
  
  #include "gpio-names.h"
+ #include "board-pinmux.h"
  #include "board-trimslice.h"
- #include "devices.h"
  
- static __initdata struct tegra_pingroup_config trimslice_pinmux[] = {
+ static struct tegra_pingroup_config trimslice_pinmux[] = {
  	{TEGRA_PINGROUP_ATA,   TEGRA_MUX_IDE,           TEGRA_PUPD_NORMAL,	TEGRA_TRI_TRISTATE},
  	{TEGRA_PINGROUP_ATB,   TEGRA_MUX_SDIO4,         TEGRA_PUPD_NORMAL,	TEGRA_TRI_NORMAL},
  	{TEGRA_PINGROUP_ATC,   TEGRA_MUX_NAND,          TEGRA_PUPD_NORMAL,	TEGRA_TRI_TRISTATE},