summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2014-03-21 12:28:52 -0600
committerTom Warren <twarren@nvidia.com>2014-04-17 08:41:05 -0700
commit07bbd48b4785f28b41ceeab4337d7690837e6ec1 (patch)
treef548847555472a943bf3b5623fdf404f4e8919d5
parent6ac1e542c6ff8413698e59d83ae11ab51f59e8c2 (diff)
downloadu-boot-imx-07bbd48b4785f28b41ceeab4337d7690837e6ec1.zip
u-boot-imx-07bbd48b4785f28b41ceeab4337d7690837e6ec1.tar.gz
u-boot-imx-07bbd48b4785f28b41ceeab4337d7690837e6ec1.tar.bz2
ARM: tegra: prototype pinmux_init() in board.h
pinmux_init() is a board-level function, not a pinmux driver function. Move the prototype to a board header rather than the driver header. Signed-off-by: Stephen Warren <swarren@nvidia.com> Acked-by: Simon Glass <sjg@chromium.org> Signed-off-by: Tom Warren <twarren@nvidia.com>
-rw-r--r--arch/arm/include/asm/arch-tegra/board.h1
-rw-r--r--arch/arm/include/asm/arch-tegra114/pinmux.h3
-rw-r--r--arch/arm/include/asm/arch-tegra124/pinmux.h3
-rw-r--r--arch/arm/include/asm/arch-tegra30/pinmux.h3
-rw-r--r--board/nvidia/common/board.c8
5 files changed, 7 insertions, 11 deletions
diff --git a/arch/arm/include/asm/arch-tegra/board.h b/arch/arm/include/asm/arch-tegra/board.h
index 0e69864..ff77364 100644
--- a/arch/arm/include/asm/arch-tegra/board.h
+++ b/arch/arm/include/asm/arch-tegra/board.h
@@ -24,6 +24,7 @@ void gpio_early_init(void); /* overrideable GPIO config */
* an empty stub function will be called.
*/
+void pinmux_init(void); /* overrideable general pinmux setup */
void pin_mux_usb(void); /* overrideable USB pinmux setup */
void pin_mux_spi(void); /* overrideable SPI pinmux setup */
void pin_mux_nand(void); /* overrideable NAND pinmux setup */
diff --git a/arch/arm/include/asm/arch-tegra114/pinmux.h b/arch/arm/include/asm/arch-tegra114/pinmux.h
index 93d2ca5..a06b24f 100644
--- a/arch/arm/include/asm/arch-tegra114/pinmux.h
+++ b/arch/arm/include/asm/arch-tegra114/pinmux.h
@@ -580,9 +580,6 @@ void pinmux_set_io(enum pmux_pingrp pin, enum pmux_pin_io io);
*/
void pinmux_config_table(struct pingroup_config *config, int len);
-/* Set a group of pins from a table */
-void pinmux_init(void);
-
/**
* Set the GP pad configs
*
diff --git a/arch/arm/include/asm/arch-tegra124/pinmux.h b/arch/arm/include/asm/arch-tegra124/pinmux.h
index 2042f1f..900cf44 100644
--- a/arch/arm/include/asm/arch-tegra124/pinmux.h
+++ b/arch/arm/include/asm/arch-tegra124/pinmux.h
@@ -584,9 +584,6 @@ void pinmux_set_io(enum pmux_pingrp pin, enum pmux_pin_io io);
*/
void pinmux_config_table(struct pingroup_config *config, int len);
-/* Set a group of pins from a table */
-void pinmux_init(void);
-
/**
* Set the GP pad configs
*
diff --git a/arch/arm/include/asm/arch-tegra30/pinmux.h b/arch/arm/include/asm/arch-tegra30/pinmux.h
index 0704e4d..1449f53 100644
--- a/arch/arm/include/asm/arch-tegra30/pinmux.h
+++ b/arch/arm/include/asm/arch-tegra30/pinmux.h
@@ -632,9 +632,6 @@ void pinmux_set_io(enum pmux_pingrp pin, enum pmux_pin_io io);
*/
void pinmux_config_table(struct pingroup_config *config, int len);
-/* Set a group of pins from a table */
-void pinmux_init(void);
-
/**
* Set the GP pad configs
*
diff --git a/board/nvidia/common/board.c b/board/nvidia/common/board.c
index 3b18e28..d3d7bbd 100644
--- a/board/nvidia/common/board.c
+++ b/board/nvidia/common/board.c
@@ -48,6 +48,12 @@ const struct tegra_sysinfo sysinfo = {
CONFIG_TEGRA_BOARD_STRING
};
+void __pinmux_init(void)
+{
+}
+
+void pinmux_init(void) __attribute__((weak, alias("__pinmux_init")));
+
void __pin_mux_usb(void)
{
}
@@ -176,9 +182,7 @@ void gpio_early_init(void) __attribute__((weak, alias("__gpio_early_init")));
int board_early_init_f(void)
{
-#if !defined(CONFIG_TEGRA20)
pinmux_init();
-#endif
board_init_uart_f();
/* Initialize periph GPIOs */