Revert "Merge commit 'main-jb-2012.08.03-B4' into t114-0806"
[linux-2.6.git] / arch / arm / mach-tegra / board-enterprise-pinmux.c
index c946d2e..71aff6e 100644 (file)
 
 #include <linux/kernel.h>
 #include <linux/init.h>
+#include <linux/gpio.h>
 #include <mach/pinmux.h>
+#include <mach/pinmux-tegra30.h>
+#include <mach/gpio-tegra.h>
 #include "board.h"
 #include "board-enterprise.h"
+#include "devices.h"
 #include "gpio-names.h"
 
 #define DEFAULT_DRIVE(_name)                                   \
@@ -552,8 +556,9 @@ int __init enterprise_pinmux_init(void)
        struct board_info board_info;
        tegra_get_board_info(&board_info);
 
-       tegra_pinmux_config_table(enterprise_pinmux_common,
-                                 ARRAY_SIZE(enterprise_pinmux_common));
+       tegra30_default_pinmux();
+
+       tegra_pinmux_config_table(enterprise_pinmux_common, ARRAY_SIZE(enterprise_pinmux_common));
        tegra_drive_pinmux_config_table(enterprise_drive_pinmux,
                                        ARRAY_SIZE(enterprise_drive_pinmux));
        tegra_pinmux_config_table(enterprise_unused_pinmux_common,