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

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

diff --cc arch/arm/mach-tegra/Makefile
Simple merge

diff --cc arch/arm/mach-tegra/board-dt-tegra20.c
index ddaa037be02815cfc71b1cb78ffe86b94c3d8109,909065f62e38097d671101e1e84f4b99e171bfbf..70f060251f00d677e323325e1d13ae15cb3f7106
--- 1/arch/arm/mach-tegra/board-dt-tegra20.c
--- 2/arch/arm/mach-tegra/board-dt.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-harmony-pinmux.c
Simple merge

diff --cc arch/arm/mach-tegra/board-paz00-pinmux.c
Simple merge

diff --cc arch/arm/mach-tegra/board-paz00.c
Simple merge

diff --cc arch/arm/mach-tegra/board-seaboard-pinmux.c
index f6b9c01ef0dbc4d24ec188493d7d213037917852,a448f29fbbb28e6b10e90bea5fa8378aadaf2b5a..55e7e43a14ad6e15dafc266aaa1d85540d3641d9
--- 1/arch/arm/mach-tegra/board-seaboard-pinmux.c
--- 2/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 7331e15b73cca342e5bd702d8d96fd8d447b9f74,1b3ccec45ea5b207d6f7c83be067d6d8c8268d6f..a21a2be57cb67356767b34efa7b06270eb38fe2c
--- 1/arch/arm/mach-tegra/board-trimslice-pinmux.c
--- 2/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},