diff options
| author |   Raghav Dogra <raghav.dogra@nxp.com> | 2016-07-01 21:32:30 +0530 |
|---|---|---|
| committer |   Brian Norris <computersforpeace@gmail.com> | 2016-07-13 17:31:10 -0700 |
| commit | 8ea126bc1ac28be93eb5ae3c82741a3dc8e66ae2 (patch) | |
| tree | eafd9901adbf33b36a6e08f1012e7f629371d1b4 | |
| parent | mtd: spi-nor: fix wrong "fully unlocked" test (diff) | |
| download | linux-dev-8ea126bc1ac28be93eb5ae3c82741a3dc8e66ae2.tar.xz linux-dev-8ea126bc1ac28be93eb5ae3c82741a3dc8e66ae2.zip | |
memory: Update dependency of IFC for Layerscape
This patch enables IFC NAND support on ARM layerscape platform.
It fixes the dependency to enable NAND. The include files are being modified
to ensure complilation for both PowerPC and ARM architectures.
Signed-off-by: Raghav Dogra <raghav.dogra@nxp.com>
Acked-by: Scott Wood <oss@buserror.net>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
| -rw-r--r-- | drivers/memory/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/memory/fsl_ifc.c | 4 | ||||
| -rw-r--r-- | drivers/mtd/nand/Kconfig | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/drivers/memory/Kconfig b/drivers/memory/Kconfig index 81ddb17575a9..5645705c7110 100644 --- a/drivers/memory/Kconfig +++ b/drivers/memory/Kconfig @@ -104,7 +104,7 @@ config FSL_CORENET_CF config FSL_IFC bool - depends on FSL_SOC + depends on FSL_SOC || ARCH_LAYERSCAPE config JZ4780_NEMC bool "Ingenic JZ4780 SoC NEMC driver" diff --git a/drivers/memory/fsl_ifc.c b/drivers/memory/fsl_ifc.c index 904b4af5f142..1b182b117f9c 100644 --- a/drivers/memory/fsl_ifc.c +++ b/drivers/memory/fsl_ifc.c @@ -31,7 +31,9 @@ #include <linux/of_device.h> #include <linux/platform_device.h> #include <linux/fsl_ifc.h> -#include <asm/prom.h> +#include <linux/irqdomain.h> +#include <linux/of_address.h> +#include <linux/of_irq.h> struct fsl_ifc_ctrl *fsl_ifc_ctrl_dev; EXPORT_SYMBOL(fsl_ifc_ctrl_dev); diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig index f05e0e9eb2f7..eace3ef10d9d 100644 --- a/drivers/mtd/nand/Kconfig +++ b/drivers/mtd/nand/Kconfig @@ -438,7 +438,7 @@ config MTD_NAND_FSL_ELBC config MTD_NAND_FSL_IFC tristate "NAND support for Freescale IFC controller" - depends on MTD_NAND && FSL_SOC + depends on MTD_NAND && (FSL_SOC || ARCH_LAYERSCAPE) select FSL_IFC select MEMORY help |