4045-driver-memory-Update-dependency-of-IFC-for-Layerscap.patch 1.5 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051
  1. From bf489e54ef3de7de2d9caf896141fd08490a89c9 Mon Sep 17 00:00:00 2001
  2. From: Raghav Dogra <raghav@freescale.com>
  3. Date: Wed, 16 Dec 2015 16:11:50 +0530
  4. Subject: [PATCH 45/70] driver/memory: Update dependency of IFC for Layerscape
  5. IFC NAND is not working on ARM layescape platform due to
  6. undefined macro FSL_SOC.
  7. This patch fixes the dependency to enable NAND.
  8. Signed-off-by: Raghav Dogra <raghav@freescale.com>
  9. ---
  10. drivers/memory/Kconfig | 2 +-
  11. drivers/memory/fsl_ifc.c | 4 +++-
  12. drivers/mtd/nand/Kconfig | 2 +-
  13. 3 files changed, 5 insertions(+), 3 deletions(-)
  14. --- a/drivers/memory/Kconfig
  15. +++ b/drivers/memory/Kconfig
  16. @@ -103,7 +103,7 @@ config FSL_CORENET_CF
  17. config FSL_IFC
  18. bool
  19. - depends on FSL_SOC
  20. + depends on FSL_SOC || ARCH_LAYERSCAPE
  21. config JZ4780_NEMC
  22. bool "Ingenic JZ4780 SoC NEMC driver"
  23. --- a/drivers/memory/fsl_ifc.c
  24. +++ b/drivers/memory/fsl_ifc.c
  25. @@ -32,7 +32,9 @@
  26. #include <linux/of_device.h>
  27. #include <linux/platform_device.h>
  28. #include <linux/fsl_ifc.h>
  29. -#include <asm/prom.h>
  30. +#include <linux/irqdomain.h>
  31. +#include <linux/of_address.h>
  32. +#include <linux/of_irq.h>
  33. struct fsl_ifc_ctrl *fsl_ifc_ctrl_dev;
  34. EXPORT_SYMBOL(fsl_ifc_ctrl_dev);
  35. --- a/drivers/mtd/nand/Kconfig
  36. +++ b/drivers/mtd/nand/Kconfig
  37. @@ -436,7 +436,7 @@ config MTD_NAND_FSL_ELBC
  38. config MTD_NAND_FSL_IFC
  39. tristate "NAND support for Freescale IFC controller"
  40. - depends on MTD_NAND && FSL_SOC
  41. + depends on MTD_NAND && (FSL_SOC || ARCH_LAYERSCAPE)
  42. select FSL_IFC
  43. select MEMORY
  44. help