You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
52 lines
1.5 KiB
Diff
52 lines
1.5 KiB
Diff
From bf489e54ef3de7de2d9caf896141fd08490a89c9 Mon Sep 17 00:00:00 2001
|
|
From: Raghav Dogra <raghav@freescale.com>
|
|
Date: Wed, 16 Dec 2015 16:11:50 +0530
|
|
Subject: [PATCH 45/70] driver/memory: Update dependency of IFC for Layerscape
|
|
|
|
IFC NAND is not working on ARM layescape platform due to
|
|
undefined macro FSL_SOC.
|
|
This patch fixes the dependency to enable NAND.
|
|
|
|
Signed-off-by: Raghav Dogra <raghav@freescale.com>
|
|
---
|
|
drivers/memory/Kconfig | 2 +-
|
|
drivers/memory/fsl_ifc.c | 4 +++-
|
|
drivers/mtd/nand/Kconfig | 2 +-
|
|
3 files changed, 5 insertions(+), 3 deletions(-)
|
|
|
|
--- a/drivers/memory/Kconfig
|
|
+++ b/drivers/memory/Kconfig
|
|
@@ -103,7 +103,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"
|
|
--- a/drivers/memory/fsl_ifc.c
|
|
+++ b/drivers/memory/fsl_ifc.c
|
|
@@ -32,7 +32,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);
|
|
--- a/drivers/mtd/nand/Kconfig
|
|
+++ b/drivers/mtd/nand/Kconfig
|
|
@@ -436,7 +436,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
|