Merge remote-tracking branch 'tegra/for-next'

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

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

diff --cc arch/arm/mach-tegra/board-seaboard-pinmux.c
index 74f78b7e3f19cdf7c943ba7a843cea492b82fa84,dd3b7405b4d40a93ac1ba92586942eafe8d0fcc6..fbce31daa3c9fd65760fc8d6fcc2b0cbdc92db8e
--- 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
@@@ -167,12 -192,32 +192,34 @@@ static struct tegra_gpio_table common_g
        { .gpio = TEGRA_GPIO_LIDSWITCH,         .enable = true },
        { .gpio = TEGRA_GPIO_POWERKEY,          .enable = true },
        { .gpio = TEGRA_GPIO_ISL29018_IRQ,      .enable = true },
 +      { .gpio = TEGRA_GPIO_CDC_IRQ,           .enable = true },
 +      { .gpio = TEGRA_GPIO_USB1,              .enable = true },
  };
  
- void __init seaboard_pinmux_init(void)
+ static void __init update_pinmux(struct tegra_pingroup_config *newtbl, int size)
+ {
+       int i, j;
+       struct tegra_pingroup_config *new_pingroup, *base_pingroup;
+ 
+       /* Update base seaboard pinmux table with secondary board
+        * specific pinmux table table.
+        */
+       for (i = 0; i < size; i++) {
+               new_pingroup = &newtbl[i];
+               for (j = 0; j < ARRAY_SIZE(seaboard_pinmux); j++) {
+                       base_pingroup = &seaboard_pinmux[j];
+                       if (new_pingroup->pingroup == base_pingroup->pingroup) {
+                               *base_pingroup = *new_pingroup;
+                               break;
+                       }
+               }
+       }
+ }
+ 
+ void __init seaboard_common_pinmux_init(void)
  {
+       platform_add_devices(pinmux_devices, ARRAY_SIZE(pinmux_devices));
+ 
        tegra_pinmux_config_table(seaboard_pinmux, ARRAY_SIZE(seaboard_pinmux));
  
        tegra_drive_pinmux_config_table(seaboard_drive_pinmux,

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