dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-02 17:22:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

ARM: tegra: prototype pinmux_init() in board.h

Browse Source 
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>
This commit is contained in:
Stephen Warren
2014-03-21 12:28:52 -06:00
committed by Tom Warren
parent 6ac1e542c6
commit 07bbd48b47
5 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/include/asm/arch-tegra/board.h
View File

@@ -24,6 +24,7 @@ void gpio_early_init(void); /* overrideable GPIO config */
* an empty stub function will be called. * 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_usb(void); /* overrideable USB pinmux setup */
void pin_mux_spi(void); /* overrideable SPI pinmux setup */ void pin_mux_spi(void); /* overrideable SPI pinmux setup */
void pin_mux_nand(void); /* overrideable NAND pinmux setup */ void pin_mux_nand(void); /* overrideable NAND pinmux setup */

3
arch/arm/include/asm/arch-tegra114/pinmux.h
View File

@@ -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); 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 * Set the GP pad configs
* *

3
arch/arm/include/asm/arch-tegra124/pinmux.h
View File

@@ -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); 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 * Set the GP pad configs
* *

3
arch/arm/include/asm/arch-tegra30/pinmux.h
View File

@@ -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); 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 * Set the GP pad configs
* *

8
board/nvidia/common/board.c
View File

@@ -48,6 +48,12 @@ const struct tegra_sysinfo sysinfo = {
CONFIG_TEGRA_BOARD_STRING CONFIG_TEGRA_BOARD_STRING
}; };
void __pinmux_init(void)
{
}
void pinmux_init(void) __attribute__((weak, alias("__pinmux_init")));
void __pin_mux_usb(void) 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) int board_early_init_f(void)
{ {
#if !defined(CONFIG_TEGRA20)
pinmux_init(); pinmux_init();
#endif
board_init_uart_f(); board_init_uart_f();
/* Initialize periph GPIOs */ /* Initialize periph GPIOs */