summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tegra/board-harmony-pinmux.c
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2010-05-14 19:30:34 -0700
committerDan Willemsen <dwillemsen@nvidia.com>2012-03-21 22:10:44 -0700
commiteb2f44125f2d00e79d7ad7735f9901d9f855045e (patch)
tree01708f2592d02402c8f70c90440e9b1a42ed3208 /arch/arm/mach-tegra/board-harmony-pinmux.c
parent3149651a9bfaede0482b248d27741e129f48f06a (diff)
[ARM] tegra: harmony: Make board init calls explicit
Signed-off-by: Colin Cross <ccross@android.com> Change-Id: Ic14e8db00f2272de2f4ee4013bb3ab5c1951e7fe Rebase-Id: Rebac80b43410ed08f04ba9081be3912cd38b5c6e
Diffstat (limited to 'arch/arm/mach-tegra/board-harmony-pinmux.c')
-rw-r--r--arch/arm/mach-tegra/board-harmony-pinmux.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/board-harmony-pinmux.c b/arch/arm/mach-tegra/board-harmony-pinmux.c
index 465808c8ac0b..02664c5bf0de 100644
--- a/arch/arm/mach-tegra/board-harmony-pinmux.c
+++ b/arch/arm/mach-tegra/board-harmony-pinmux.c
@@ -17,6 +17,7 @@
#include <linux/kernel.h>
#include <linux/gpio.h>
#include <linux/of.h>
+#include <linux/init.h>
#include <mach/pinmux.h>
#include <mach/pinmux-tegra20.h>
@@ -25,7 +26,7 @@
#include "board-harmony.h"
#include "board-pinmux.h"
-static struct tegra_pingroup_config harmony_pinmux[] = {
+static __initdata struct tegra_pingroup_config harmony_pinmux[] = {
{TEGRA_PINGROUP_ATA, TEGRA_MUX_IDE, TEGRA_PUPD_NORMAL, TEGRA_TRI_NORMAL},
{TEGRA_PINGROUP_ATB, TEGRA_MUX_SDIO4, TEGRA_PUPD_NORMAL, TEGRA_TRI_NORMAL},
{TEGRA_PINGROUP_ATC, TEGRA_MUX_NAND, TEGRA_PUPD_NORMAL, TEGRA_TRI_NORMAL},
@@ -164,7 +165,7 @@ static struct tegra_board_pinmux_conf conf = {
.gpio_count = ARRAY_SIZE(gpio_table),
};
-void harmony_pinmux_init(void)
+void __init harmony_pinmux_init(void)
{
tegra_board_pinmux_init(&conf, NULL);
}