On Jan 25, 2014, at 6:06 AM, Prabhakar Kushwaha <prabha...@freescale.com> wrote:
> 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.
>
> Signed-off-by: Prabhakar Kushwaha <prabha...@freescale.com>
> Acked-by: Arnd Bergmann <a...@arndb.de>
> ---
> 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%)
>
> diff --git a/Documentation/devicetree/bindings/powerpc/fsl/ifc.txt
> b/Documentation/devicetree/bindings/memory-controllers/fsl/ifc.txt
> similarity index 100%
> rename from Documentation/devicetree/bindings/powerpc/fsl/ifc.txt
> rename to Documentation/devicetree/bindings/memory-controllers/fsl/ifc.txt
> diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
> index fa39517..91dc43c 100644
> --- a/arch/powerpc/Kconfig
> +++ b/arch/powerpc/Kconfig
> @@ -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
> diff --git a/arch/powerpc/sysdev/Makefile b/arch/powerpc/sysdev/Makefile
> index f67ac90..afbcc37 100644
> --- a/arch/powerpc/sysdev/Makefile
> +++ b/arch/powerpc/sysdev/Makefile
> @@ -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
> diff --git a/drivers/memory/Kconfig b/drivers/memory/Kconfig
> index 29a11db..555d26f 100644
> --- a/drivers/memory/Kconfig
> +++ b/drivers/memory/Kconfig
> @@ -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
minor white space nit (spaces instead of tab)
> + 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
- k
_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev
