From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lucas Stach Date: Thu, 27 Sep 2012 23:52:04 +0200 Subject: [U-Boot] =?utf-8?q?=5BPATCH_2/2=5D_tegra=3A_nand=3A_add_board_pin?= =?utf-8?q?mux?= In-Reply-To: <1348782724-19151-1-git-send-email-dev@lynxeye.de> References: <1348782724-19151-1-git-send-email-dev@lynxeye.de> Message-ID: <1348782724-19151-2-git-send-email-dev@lynxeye.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Boards may require a different pinmux setup for NAND than the default one. Add a way to call into board specific code to set this up. Signed-off-by: Lucas Stach --- arch/arm/include/asm/arch-tegra/board.h | 1 + drivers/mtd/nand/tegra_nand.c | 11 ++++++++++- 2 Dateien ge?ndert, 11 Zeilen hinzugef?gt(+), 1 Zeile entfernt(-) diff --git a/arch/arm/include/asm/arch-tegra/board.h b/arch/arm/include/asm/arch-tegra/board.h index 7e56df7..be6bf25 100644 --- a/arch/arm/include/asm/arch-tegra/board.h +++ b/arch/arm/include/asm/arch-tegra/board.h @@ -43,5 +43,6 @@ void gpio_early_init(void); /* overrideable GPIO config */ 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 */ #endif diff --git a/drivers/mtd/nand/tegra_nand.c b/drivers/mtd/nand/tegra_nand.c index 2c1b533..baaea4f 100644 --- a/drivers/mtd/nand/tegra_nand.c +++ b/drivers/mtd/nand/tegra_nand.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include @@ -992,7 +993,6 @@ int tegra_nand_init(struct nand_chip *nand, int devnum) /* Adjust timing for NAND device */ setup_timing(config->timing, info->reg); - funcmux_select(PERIPH_ID_NDFLASH, FUNCMUX_DEFAULT); fdtdec_setup_gpio(&config->wp_gpio); gpio_direction_output(config->wp_gpio.gpio, 1); @@ -1016,10 +1016,19 @@ int tegra_nand_init(struct nand_chip *nand, int devnum) return 0; } +void __pin_mux_nand(void) +{ + funcmux_select(PERIPH_ID_NDFLASH, FUNCMUX_DEFAULT); +} + +void pin_mux_nand(void) __attribute__((weak, alias("__pin_mux_nand"))); + void board_nand_init(void) { struct nand_chip *nand = &nand_chip[0]; + pin_mux_nand(); + if (tegra_nand_init(nand, 0)) puts("Tegra NAND init failed\n"); } -- 1.7.11.4