diff options
Diffstat (limited to 'drivers/mtd/nand/nand_imx.c')
| -rw-r--r-- | drivers/mtd/nand/nand_imx.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/mtd/nand/nand_imx.c b/drivers/mtd/nand/nand_imx.c index 0dcf34a688..a56c65ff8c 100644 --- a/drivers/mtd/nand/nand_imx.c +++ b/drivers/mtd/nand/nand_imx.c @@ -26,7 +26,6 @@ #include <linux/mtd/nand.h> #include <mach/generic.h> #include <mach/imx-nand.h> -#include <mach/imx-regs.h> #include <io.h> #include <errno.h> @@ -1107,12 +1106,6 @@ static int __init imxnd_probe(struct device_d *dev) struct nand_ecclayout *oob_smallpage, *oob_largepage, *oob_4kpage; int err = 0; -#ifdef CONFIG_ARCH_IMX27 - PCCR1 |= PCCR1_NFC_BAUDEN; -#endif -#ifdef CONFIG_ARCH_IMX21 - PCCR0 |= PCCR0_NFC_EN; -#endif /* Allocate memory for MTD device structure and private data */ host = kzalloc(sizeof(struct imx_nand_host) + NAND_MAX_PAGESIZE + NAND_MAX_OOBSIZE, GFP_KERNEL); @@ -1175,6 +1168,9 @@ static int __init imxnd_probe(struct device_d *dev) oob_smallpage = &nandv2_hw_eccoob_smallpage; oob_largepage = &nandv2_hw_eccoob_largepage; oob_4kpage = &nandv2_hw_eccoob_4k; + } else { + err = -EINVAL; + goto escan; } host->dev = dev; |