2 files changed, 19 insertions, 3 deletions

diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index 246d4512f64b..bf0e9b083d13 100644
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -93,7 +93,7 @@ config MTD_NAND_AU1550
 
 config MTD_NAND_BF5XX
         tristate "Blackfin on-chip NAND Flash Controller driver"
-        depends on BF54x && MTD_NAND
+        depends on (BF54x || BF52x) && MTD_NAND
         help
           This enables the Blackfin on-chip NAND flash controller
 
diff --git a/drivers/mtd/nand/bf5xx_nand.c b/drivers/mtd/nand/bf5xx_nand.c
index 1657ecd74881..542850cd4c37 100644
--- a/drivers/mtd/nand/bf5xx_nand.c
+++ b/drivers/mtd/nand/bf5xx_nand.c
@@ -74,7 +74,22 @@ static int hardware_ecc = 1;
 static int hardware_ecc;
 #endif
 
-static unsigned short bfin_nfc_pin_req[] = {P_NAND_CE, P_NAND_RB, 0};
+static unsigned short bfin_nfc_pin_req[] =
+        {P_NAND_CE,
+         P_NAND_RB,
+         P_NAND_D0,
+         P_NAND_D1,
+         P_NAND_D2,
+         P_NAND_D3,
+         P_NAND_D4,
+         P_NAND_D5,
+         P_NAND_D6,
+         P_NAND_D7,
+         P_NAND_WE,
+         P_NAND_RE,
+         P_NAND_CLE,
+         P_NAND_ALE,
+         0};
 
 /*
  * Data structures for bf5xx nand flash controller driver
@@ -507,12 +522,13 @@ static int bf5xx_nand_dma_init(struct bf5xx_nand_info *info)
 
         init_completion(&info->dma_completion);
 
+#ifdef CONFIG_BF54x
         /* Setup DMAC1 channel mux for NFC which shared with SDH */
         val = bfin_read_DMAC1_PERIMUX();
         val &= 0xFFFE;
         bfin_write_DMAC1_PERIMUX(val);
         SSYNC();
-
+#endif
         /* Request NFC DMA channel */
         ret = request_dma(CH_NFC, "BF5XX NFC driver");
         if (ret < 0) {