driver/memory:Move Freescale IFC driver to a common driver
Subsystems (6)
PATCH v8 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
Changes for v7:
- Update Kconfig
Changes for v8:
- Update Kconfig help
.../{powerpc => memory-controllers}/fsl/ifc.txt | 0
arch/powerpc/Kconfig | 4 ----
arch/powerpc/sysdev/Makefile | 1 -
drivers/memory/Kconfig | 8 ++++++++
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, 16 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
arch/powerpc/Kconfig +0 -4
@@ -734,10 +734,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
@@ -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 +8 -0
@@ -50,4 +50,12 @@ config TEGRA30_MC analysis, especially for IOMMU/SMMU(System Memory Management Unit) module. +config FSL_IFC + bool "Freescale Integrated Flash Controller" + depends on FSL_SOC + help + This driver is for the Integrated Flash Controller(IFC) module + available in Freescale SoCs. This controller allows to handle + devices such as NOR, NAND, FPGA and ASIC etc. + endif
drivers/memory/Makefile +1 -0
@@ -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
@@ -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
@@ -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
Signature · 1 line
1.7.9.5
Quoted 10 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 and fix the header file includes.
Also remove
module_platform_driver()and instead callplatform_driver_register()fromsubsys_initcall()to make sure this module has been loaded before MTD partition parsing starts.Signed-off-by Prabhakar Kushwaha <[email protected]>Acked-by Arnd Bergmann <[email protected]>
Again, when did Arnd ack this?
Quoted 4 lines
.../{powerpc => memory-controllers}/fsl/ifc.txt | 0
arch/powerpc/Kconfig | 4 ----
arch/powerpc/sysdev/Makefile | 1 -
drivers/memory/Kconfig | 8 ++++++++Quoted 8 lines
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, 16 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%)Do we need a MAINTAINERS entry for this? I don't see anything covering drivers/memory currently.
-Scott
[email protected]
Acked-by Arnd BergmannQuoted 15 lines
-----Original Message-----
From: Wood Scott-B07421
Sent: Tuesday, February 04, 2014 4:52 AM
To: Kushwaha Prabhakar-B32579
Cc: [email protected]; Arnd Bergmann
Subject: Re: [PATCH 1/2][v8] driver/memory:Move Freescale IFC driver to a common driverQuoted 4 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 and fix the header file includes.
Quoted 9 lines
Quoted 6 lines
Also remove
module_platform_driver()and instead callplatform_driver_register()fromsubsys_initcall()to make sure this
module has been loaded before MTD partition parsing starts.Signed-off-by Prabhakar Kushwaha <[email protected]>Acked-by Arnd Bergmann <[email protected]>Again, when did Arnd ack this?
Hi Scott,
I guess you missed his mail on kernel.org. Please find attached mail.
Quoted 14 lines
Quoted 9 lines
.../{powerpc => memory-controllers}/fsl/ifc.txt | 0 arch/powerpc/Kconfig | 4 ---- arch/powerpc/sysdev/Makefile | 1 - drivers/memory/Kconfig | 8 ++++++++ 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, 16 insertions(+), 8 deletions(-) renameQuoted 4 lines
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%)
Quoted 3 lines
Do we need a
MAINTAINERSentry for this? I don't see anything coveringdrivers/memorycurrently.
I am not sure about this.
Regards,
Prabhakar
Quoted 9 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 and fix the header file includes.
Also remove
module_platform_driver()and instead callplatform_driver_register()fromsubsys_initcall()to make sure this module has been loaded before MTD partition parsing starts.Signed-off-by Prabhakar Kushwaha <[email protected]>
provided that you also move the binding from powerpc/fsl/ifc.txt to memory/fsl-ifc.txt.