Skip to contentSkip to conversation

driver/memory:Move Freescale IFC driver to a common driver

PATCH Superseded Prabhakar Kushwaha 3 participants 3 messages Jan 25, 2014 – Jan 27, 2014

Subsystems (6)

v6 of 8 Superseded Latest is v8 →

lore
Share & tools
lore
#0 lore raw

PATCH v6 1/2 driver/memory:Move Freescale IFC driver to a common driver

Freescale IFC controller has been used for mpc8xxx. It will be used for ARM-based SoC as well. This patch moves the driver to driver/memory and fix the header file includes.

Also remove module_platform_driver() and instead call platform_driver_register() from subsys_initcall() to make sure this module has been loaded before MTD partition parsing starts.

---
Based upon git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git
Branch next

Changes for v2:
- Move fsl_ifc in driver/memory

Changes for v3:
- move device tree bindings to memory

Changes for v4: Rebased to
git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux.git

Changes for v5:
- Moved powerpc/Kconfig option to driver/memory

Changes for v6:
- Update Kconfig details

 .../{powerpc => memory-controllers}/fsl/ifc.txt    |    0
 arch/powerpc/Kconfig                               |    4 ----
 arch/powerpc/sysdev/Makefile                       |    1 -
 drivers/memory/Kconfig                             |    9 +++++++++
 drivers/memory/Makefile                            |    1 +
 {arch/powerpc/sysdev => drivers/memory}/fsl_ifc.c  |    8 ++++++--
 drivers/mtd/nand/fsl_ifc_nand.c                    |    2 +-
 .../include/asm => include/linux}/fsl_ifc.h        |    0
 8 files changed, 17 insertions(+), 8 deletions(-)
 rename Documentation/devicetree/bindings/{powerpc => memory-controllers}/fsl/ifc.txt (100%)
 rename {arch/powerpc/sysdev => drivers/memory}/fsl_ifc.c (98%)
 rename {arch/powerpc/include/asm => include/linux}/fsl_ifc.h (100%)
Documentation/devicetree/bindings/memory-controllers/fsl/ifc.txt renamed from Documentation/devicetree/bindings/powerpc/fsl/ifc.txt +0 -0
similarity index 100%
rename from Documentation/devicetree/bindings/powerpc/fsl/ifc.txt
rename to Documentation/devicetree/bindings/memory-controllers/fsl/ifc.txt
arch/powerpc/Kconfig +0 -4
index fa39517..91dc43c 100644
@@ -727,10 +727,6 @@ config FSL_LBC
 	  controller.  Also contains some common code used by
 	  drivers for specific local bus peripherals.
 
-config FSL_IFC
-	bool
-        depends on FSL_SOC
-
 config FSL_GTM
 	bool
 	depends on PPC_83xx || QUICC_ENGINE || CPM2
arch/powerpc/sysdev/Makefile +0 -1
index f67ac90..afbcc37 100644
@@ -21,7 +21,6 @@ obj-$(CONFIG_FSL_SOC)		+= fsl_soc.o fsl_mpic_err.o
 obj-$(CONFIG_FSL_PCI)		+= fsl_pci.o $(fsl-msi-obj-y)
 obj-$(CONFIG_FSL_PMC)		+= fsl_pmc.o
 obj-$(CONFIG_FSL_LBC)		+= fsl_lbc.o
-obj-$(CONFIG_FSL_IFC)		+= fsl_ifc.o
 obj-$(CONFIG_FSL_GTM)		+= fsl_gtm.o
 obj-$(CONFIG_FSL_85XX_CACHE_SRAM)	+= fsl_85xx_l2ctlr.o fsl_85xx_cache_sram.o
 obj-$(CONFIG_SIMPLE_GPIO)	+= simple_gpio.o
drivers/memory/Kconfig +9 -0
index 29a11db..555d26f 100644
@@ -50,4 +50,13 @@ config TEGRA30_MC
 	  analysis, especially for IOMMU/SMMU(System Memory Management
 	  Unit) module.
 
+config FSL_IFC
+	bool "Freescale Integrated Flash Controller"
+	default y
+        depends on FSL_SOC
+	help
+	  This driver is for the Integrated Flash Controller Controller(IFC) 
+	  module available in Freescale SoCs. This controller allows to handle flash
+	  devices such as NOR, NAND, FPGA and ASIC etc
+
 endif
drivers/memory/Makefile +1 -0
index 969d923..f2bf25c 100644
@@ -6,6 +6,7 @@ ifeq ($(CONFIG_DDR),y)
 obj-$(CONFIG_OF)		+= of_memory.o
 endif
 obj-$(CONFIG_TI_EMIF)		+= emif.o
+obj-$(CONFIG_FSL_IFC)		+= fsl_ifc.o
 obj-$(CONFIG_MVEBU_DEVBUS)	+= mvebu-devbus.o
 obj-$(CONFIG_TEGRA20_MC)	+= tegra20-mc.o
 obj-$(CONFIG_TEGRA30_MC)	+= tegra30-mc.o
drivers/memory/fsl_ifc.c renamed from arch/powerpc/sysdev/fsl_ifc.c +6 -2
similarity index 98%
rename from arch/powerpc/sysdev/fsl_ifc.c
rename to drivers/memory/fsl_ifc.c
index fbc885b..3d5d792 100644
@@ -29,8 +29,8 @@
 #include <linux/of.h>
 #include <linux/of_device.h>
 #include <linux/platform_device.h>
+#include <linux/fsl_ifc.h>
 #include <asm/prom.h>
-#include <asm/fsl_ifc.h>
 
 struct fsl_ifc_ctrl *fsl_ifc_ctrl_dev;
 EXPORT_SYMBOL(fsl_ifc_ctrl_dev);
@@ -298,7 +298,11 @@ static struct platform_driver fsl_ifc_ctrl_driver = {
 	.remove      = fsl_ifc_ctrl_remove,
 };
 
-module_platform_driver(fsl_ifc_ctrl_driver);
+static int __init fsl_ifc_init(void)
+{
+	return platform_driver_register(&fsl_ifc_ctrl_driver);
+}
+subsys_initcall(fsl_ifc_init);
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Freescale Semiconductor");
drivers/mtd/nand/fsl_ifc_nand.c +1 -1
index 4335577..865b323 100644
@@ -30,7 +30,7 @@
 #include <linux/mtd/nand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/nand_ecc.h>
-#include <asm/fsl_ifc.h>
+#include <linux/fsl_ifc.h>
 
 #define FSL_IFC_V1_1_0	0x01010000
 #define ERR_BYTE		0xFF /* Value returned for read
include/linux/fsl_ifc.h renamed from arch/powerpc/include/asm/fsl_ifc.h +0 -0
similarity index 100%
rename from arch/powerpc/include/asm/fsl_ifc.h
rename to include/linux/fsl_ifc.h
Signature · 1 line
1.7.9.5
#1 lore raw
Quoted 2 lines · Prabhakar Kushwaha =

Freescale IFC controller has been used for mpc8xxx. It will be used for ARM-based SoC as well. This patch moves the driver to =

driver/memory

Quoted 4 lines

and fix the header file includes.
=20
Also remove module_platform_driver() and instead call platform_driver_register() from subsys_initcall() to make sure this =

module

Quoted 6 lines

has been loaded before MTD partition parsing starts. =20

---
Based upon =

git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git

Quoted 10 lines

Branch next
=20
Changes for v2:
- Move fsl_ifc in driver/memory
=20
Changes for v3:
- move device tree bindings to memory
=20
Changes for v4: Rebased to=20

	=

git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux.git

Quoted 16 lines

=20
Changes for v5:=20
- Moved powerpc/Kconfig option to driver/memory
=20
Changes for v6:
- Update Kconfig details
=20
.../{powerpc =3D> memory-controllers}/fsl/ifc.txt | 0

arch/powerpc/Kconfig                               |    4 ----
arch/powerpc/sysdev/Makefile                       |    1 -
drivers/memory/Kconfig                             |    9 +++++++++
drivers/memory/Makefile                            |    1 +
{arch/powerpc/sysdev =3D> drivers/memory}/fsl_ifc.c  |    8 ++++++--
drivers/mtd/nand/fsl_ifc_nand.c                    |    2 +-
.../include/asm =3D> include/linux}/fsl_ifc.h        |    0
8 files changed, 17 insertions(+), 8 deletions(-)
Quoted 1 line

rename Documentation/devicetree/bindings/{powerpc =3D> =

memory-controllers}/fsl/ifc.txt (100%)

=

Quoted 4 lines

rename {arch/powerpc/sysdev =3D> drivers/memory}/fsl_ifc.c (98%) rename {arch/powerpc/include/asm =3D> include/linux}/fsl_ifc.h (100%) =20

= renamed from Documentation/devicetree/bindings/powerpc/fsl/ifc.txt +0 -0

b/Documentation/devicetree/bindings/memory-controllers/fsl/ifc.txt

Quoted 3 lines

similarity index 100%
rename from Documentation/devicetree/bindings/powerpc/fsl/ifc.txt rename to =

Documentation/devicetree/bindings/memory-controllers/fsl/ifc.txt

=

Quoted 16 lines
arch/powerpc/Kconfig +0 -0
index fa39517..91dc43c 100644
@@ -727,10 +727,6 @@ config FSL_LBC
 	  controller.  Also contains some common code used by
 	  drivers for specific local bus peripherals.

=20

arch/powerpc/Kconfig +0 -4
-config FSL_IFC
-	bool
-        depends on FSL_SOC
-

config FSL_GTM

	bool
	depends on PPC_83xx || QUICC_ENGINE || CPM2
= renamed from arch/powerpc/sysdev/Makefile +0 -0

b/arch/powerpc/sysdev/Makefile

arch/powerpc/sysdev/Makefile obj-$(CONFIG_FSL_SOC) +=3D fsl_soc.o =

Quoted 4 lines

index f67ac90..afbcc37 100644

arch/powerpc/sysdev/Makefile +0 -0
@@ -21,7 +21,6 @@ obj-$(CONFIG_FSL_SOC)		+=3D fsl_soc.o =

fsl_mpic_err.o

Quoted 6 lines
arch/powerpc/sysdev/Makefile +0 -0
 obj-$(CONFIG_FSL_PCI)		+=3D fsl_pci.o $(fsl-msi-obj-y)

obj-$(CONFIG_FSL_PMC) +=3D fsl_pmc.o
obj-$(CONFIG_FSL_LBC) +=3D fsl_lbc.o
-obj-$(CONFIG_FSL_IFC) +=3D fsl_ifc.o
obj-$(CONFIG_FSL_GTM) +=3D fsl_gtm.o
obj-$(CONFIG_FSL_85XX_CACHE_SRAM) +=3D fsl_85xx_l2ctlr.o =

fsl_85xx_cache_sram.o

drivers/memory/Kconfig config TEGRA30_MC · line 56

Quoted 13 lines

obj-$(CONFIG_SIMPLE_GPIO) +=3D simple_gpio.o

drivers/memory/Kconfig +0 -0
index 29a11db..555d26f 100644
@@ -50,4 +50,13 @@ config TEGRA30_MC
 	  analysis, especially for IOMMU/SMMU(System Memory Management
 	  Unit) module.

=20

drivers/memory/Kconfig +4 -0
+config FSL_IFC
+	bool "Freescale Integrated Flash Controller"
+	default y
+        depends on FSL_SOC

minor white space nit (spaces instead of tab)

drivers/memory/Kconfig

Quoted 2 lines
drivers/memory/Kconfig +2 -0
+	help
+	  This driver is for the Integrated Flash Controller =

Controller(IFC)=20

drivers/memory/Kconfig

Quoted 1 line
drivers/memory/Kconfig +1 -0
+	  module available in Freescale SoCs. This controller allows to =

handle flash

Quoted 3 lines
drivers/memory/Kconfig +2 -0
+	  devices such as NOR, NAND, FPGA and ASIC etc
+

endif

- k

#2 lore raw
In reply to Prabhakar Kushwaha

drivers/memory/Kconfig config TEGRA30_MC · line 55

Quoted 11 lines · Prabhakar Kushwaha
drivers/memory/Kconfig +3 -0
index 29a11db..555d26f 100644
@@ -50,4 +50,13 @@ config TEGRA30_MC
 	  analysis, especially for IOMMU/SMMU(System Memory Management
 	  Unit) module.
 
+config FSL_IFC
+	bool "Freescale Integrated Flash Controller"
+	default y

Don't use "default y".

-Scott