Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d2ae2e20 authored by Prabhakar Kushwaha's avatar Prabhakar Kushwaha Committed by Greg Kroah-Hartman
Browse files

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.

Signed-off-by: default avatarPrabhakar Kushwaha <prabhakar@freescale.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3503958c

arch/powerpc/sysdev/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -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/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -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

arch/powerpc/sysdev/fsl_ifc.c→drivers/memory/fsl_ifc.c

+6 −2
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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