diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2013-05-30 17:38:17 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2013-05-30 17:38:17 +0000 |
| commit | 6da63a87939f7f2fd005cd41cc814591bf551802 (patch) | |
| tree | 246a7d21086b0f7bca6c7e11171f86ad67473e7c | |
| parent | 50c59c4797795723217feaf517f091aa3bbe9b00 (diff) | |
| download | upstream-6da63a87939f7f2fd005cd41cc814591bf551802.tar.gz upstream-6da63a87939f7f2fd005cd41cc814591bf551802.tar.bz2 upstream-6da63a87939f7f2fd005cd41cc814591bf551802.zip | |
ar71xx: rb2011: move NAND nCE init to rb2011_nand_init
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 36794
| -rw-r--r-- | target/linux/ar71xx/files/arch/mips/ath79/mach-rb2011.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-rb2011.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-rb2011.c index 86a8d0755d..7a24e98c66 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/mach-rb2011.c +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-rb2011.c @@ -212,6 +212,8 @@ static int rb2011_nand_scan_fixup(struct mtd_info *mtd) static void __init rb2011_nand_init(void) { + gpio_request_one(RB2011_GPIO_NAND_NCE, GPIOF_OUT_INIT_HIGH, "NAND nCE"); + ath79_nfc_set_scan_fixup(rb2011_nand_scan_fixup); ath79_nfc_set_parts(rb2011_nand_partitions, ARRAY_SIZE(rb2011_nand_partitions)); @@ -220,15 +222,9 @@ static void __init rb2011_nand_init(void) ath79_register_nfc(); } -static void __init rb2011_gpio_init(void) -{ - gpio_request_one(RB2011_GPIO_NAND_NCE, GPIOF_OUT_INIT_HIGH, "NAND nCE"); -} - static void __init rb2011_setup(void) { rb2011_init_partitions(); - rb2011_gpio_init(); ath79_register_m25p80(&rb2011_spi_flash_data); rb2011_nand_init(); |