From 647f3fb9e22e63a02532add49a5c5427ee2d916b Mon Sep 17 00:00:00 2001 From: juhosg Date: Mon, 16 Dec 2013 08:17:40 +0000 Subject: [PATCH] ar71xx: rb95x: nuke rb95x_gpio_init Set up the chipselect GPIO directly in rb95x_nand_init instead. Signed-off-by: Gabor Juhos git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39087 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/ar71xx/files/arch/mips/ath79/mach-rb95x.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-rb95x.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-rb95x.c index f59c14c53f..1e5c477e3b 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/mach-rb95x.c +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-rb95x.c @@ -170,6 +170,8 @@ static int rb95x_nand_scan_fixup(struct mtd_info *mtd) void __init rb95x_nand_init(void) { + gpio_request_one(RB95X_GPIO_NAND_NCE, GPIOF_OUT_INIT_HIGH, "NAND nCE"); + ath79_nfc_set_scan_fixup(rb95x_nand_scan_fixup); ath79_nfc_set_parts(rb95x_nand_partitions, ARRAY_SIZE(rb95x_nand_partitions)); @@ -178,14 +180,8 @@ void __init rb95x_nand_init(void) ath79_register_nfc(); } -void __init rb95x_gpio_init(void) -{ - gpio_request_one(RB95X_GPIO_NAND_NCE, GPIOF_OUT_INIT_HIGH, "NAND nCE"); -} - static void __init rb95x_setup(void) { - rb95x_gpio_init(); rb95x_nand_init(); ath79_setup_ar934x_eth_cfg(AR934X_ETH_CFG_RGMII_GMAC0 | -- 2.11.0