|
@@ -74,7 +74,22 @@ static int hardware_ecc = 1;
|
|
static int hardware_ecc;
|
|
static int hardware_ecc;
|
|
#endif
|
|
#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
|
|
* 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);
|
|
init_completion(&info->dma_completion);
|
|
|
|
|
|
|
|
+#ifdef CONFIG_BF54x
|
|
/* Setup DMAC1 channel mux for NFC which shared with SDH */
|
|
/* Setup DMAC1 channel mux for NFC which shared with SDH */
|
|
val = bfin_read_DMAC1_PERIMUX();
|
|
val = bfin_read_DMAC1_PERIMUX();
|
|
val &= 0xFFFE;
|
|
val &= 0xFFFE;
|
|
bfin_write_DMAC1_PERIMUX(val);
|
|
bfin_write_DMAC1_PERIMUX(val);
|
|
SSYNC();
|
|
SSYNC();
|
|
-
|
|
|
|
|
|
+#endif
|
|
/* Request NFC DMA channel */
|
|
/* Request NFC DMA channel */
|
|
ret = request_dma(CH_NFC, "BF5XX NFC driver");
|
|
ret = request_dma(CH_NFC, "BF5XX NFC driver");
|
|
if (ret < 0) {
|
|
if (ret < 0) {
|