diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mtd/nand/Makefile | 6 | ||||
| -rw-r--r-- | drivers/mtd/nand/gpmi/Makefile | 1 | ||||
| -rw-r--r-- | drivers/mtd/nand/gpmi/gpmi-base.c | 2 | ||||
| -rw-r--r-- | drivers/mtd/nand/gpmi/gpmi.h | 2 | ||||
| -rw-r--r-- | drivers/mtd/nand/mxc_nd2.c | 2 | ||||
| -rw-r--r-- | drivers/mtd/nand/nand_device_info.c (renamed from drivers/mtd/nand/gpmi/nand_device_info.c) | 14 | ||||
| -rw-r--r-- | drivers/mtd/nand/nand_device_info.h (renamed from drivers/mtd/nand/gpmi/nand_device_info.h) | 0 |
7 files changed, 13 insertions, 14 deletions
diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile index 5295ddb5c2bf..226015b9a0b0 100644 --- a/drivers/mtd/nand/Makefile +++ b/drivers/mtd/nand/Makefile @@ -39,9 +39,9 @@ obj-$(CONFIG_MTD_NAND_FSL_UPM) += fsl_upm.o obj-$(CONFIG_MTD_NAND_SH_FLCTL) += sh_flctl.o obj-$(CONFIG_MTD_NAND_IMX_NFC) += imx_nfc.o obj-$(CONFIG_MTD_NAND_MXC) += mxc_nand.o -obj-$(CONFIG_MTD_NAND_MXC_V2) += mxc_nd2.o gpmi/nand_device_info.o -obj-$(CONFIG_MTD_NAND_MXC_V3) += mxc_nd2.o gpmi/nand_device_info.o -obj-$(CONFIG_MTD_NAND_GPMI) += gpmi/ +obj-$(CONFIG_MTD_NAND_MXC_V2) += mxc_nd2.o nand_device_info.o +obj-$(CONFIG_MTD_NAND_MXC_V3) += mxc_nd2.o nand_device_info.o +obj-$(CONFIG_MTD_NAND_GPMI) += gpmi/ nand_device_info.o obj-$(CONFIG_MTD_NAND_GPMI_LBA) += lba/ obj-$(CONFIG_MTD_NAND_SOCRATES) += socrates_nand.o obj-$(CONFIG_MTD_NAND_TXX9NDFMC) += txx9ndfmc.o diff --git a/drivers/mtd/nand/gpmi/Makefile b/drivers/mtd/nand/gpmi/Makefile index 175327c330d5..4a4b50d294fa 100644 --- a/drivers/mtd/nand/gpmi/Makefile +++ b/drivers/mtd/nand/gpmi/Makefile @@ -4,4 +4,3 @@ gpmi-objs += gpmi-hamming-22-16.o gpmi-objs += gpmi-hamming-13-8.o gpmi-objs += gpmi-bch.o gpmi-objs += gpmi-ecc8.o -gpmi-objs += nand_device_info.o diff --git a/drivers/mtd/nand/gpmi/gpmi-base.c b/drivers/mtd/nand/gpmi/gpmi-base.c index 035d2e6dcd66..98acd9019b66 100644 --- a/drivers/mtd/nand/gpmi/gpmi-base.c +++ b/drivers/mtd/nand/gpmi/gpmi-base.c @@ -41,7 +41,7 @@ #include <mach/regs-gpmi.h> #include <mach/dma.h> #include "gpmi.h" -#include "nand_device_info.h" +#include "../nand_device_info.h" /* Macro definitions for the i.MX23. Some will be different for other SoC's. */ diff --git a/drivers/mtd/nand/gpmi/gpmi.h b/drivers/mtd/nand/gpmi/gpmi.h index 5c0b6691c654..6d107bd87688 100644 --- a/drivers/mtd/nand/gpmi/gpmi.h +++ b/drivers/mtd/nand/gpmi/gpmi.h @@ -30,7 +30,7 @@ #include <mach/regs-ecc8.h> #include "gpmi-hamming-22-16.h" -#include "nand_device_info.h" +#include "../nand_device_info.h" #define GPMI_ECC4_WR \ (BM_GPMI_ECCCTRL_ENABLE_ECC | \ diff --git a/drivers/mtd/nand/mxc_nd2.c b/drivers/mtd/nand/mxc_nd2.c index 17c6e806b55d..84eb9b29b100 100644 --- a/drivers/mtd/nand/mxc_nd2.c +++ b/drivers/mtd/nand/mxc_nd2.c @@ -26,7 +26,7 @@ #include <asm/mach/flash.h> #include <asm/io.h> #include "mxc_nd2.h" -#include "gpmi/nand_device_info.h" +#include "nand_device_info.h" #define DVR_VER "2.5" diff --git a/drivers/mtd/nand/gpmi/nand_device_info.c b/drivers/mtd/nand/nand_device_info.c index ba3ed9e01bd1..ecd5b21189cc 100644 --- a/drivers/mtd/nand/gpmi/nand_device_info.c +++ b/drivers/mtd/nand/nand_device_info.c @@ -1824,7 +1824,7 @@ static struct nand_device_info *nand_device_info_search( } -static struct nand_device_info *nand_device_info_fn_toshiba(const uint8_t id[]) +static struct nand_device_info * __init nand_device_info_fn_toshiba(const uint8_t id[]) { struct nand_device_info *table; @@ -1866,7 +1866,7 @@ static struct nand_device_info *nand_device_info_fn_toshiba(const uint8_t id[]) } -static struct nand_device_info *nand_device_info_fn_samsung(const uint8_t id[]) +static struct nand_device_info * __init nand_device_info_fn_samsung(const uint8_t id[]) { struct nand_device_info *table; @@ -1942,7 +1942,7 @@ static struct nand_device_info *nand_device_info_fn_samsung(const uint8_t id[]) } -static struct nand_device_info *nand_device_info_fn_stmicro(const uint8_t id[]) +static struct nand_device_info * __init nand_device_info_fn_stmicro(const uint8_t id[]) { struct nand_device_info *table; @@ -1960,7 +1960,7 @@ static struct nand_device_info *nand_device_info_fn_stmicro(const uint8_t id[]) } -static struct nand_device_info *nand_device_info_fn_hynix(const uint8_t id[]) +static struct nand_device_info * __init nand_device_info_fn_hynix(const uint8_t id[]) { struct nand_device_info *table; @@ -2000,7 +2000,7 @@ static struct nand_device_info *nand_device_info_fn_hynix(const uint8_t id[]) } -static struct nand_device_info *nand_device_info_fn_micron(const uint8_t id[]) +static struct nand_device_info * __init nand_device_info_fn_micron(const uint8_t id[]) { struct nand_device_info *table; @@ -2056,7 +2056,7 @@ static struct nand_device_info *nand_device_info_fn_micron(const uint8_t id[]) } -static struct nand_device_info *nand_device_info_fn_sandisk(const uint8_t id[]) +static struct nand_device_info * __init nand_device_info_fn_sandisk(const uint8_t id[]) { struct nand_device_info *table; @@ -2073,7 +2073,7 @@ static struct nand_device_info *nand_device_info_fn_sandisk(const uint8_t id[]) } -static struct nand_device_info *nand_device_info_fn_intel(const uint8_t id[]) +static struct nand_device_info * __init nand_device_info_fn_intel(const uint8_t id[]) { struct nand_device_info *table; diff --git a/drivers/mtd/nand/gpmi/nand_device_info.h b/drivers/mtd/nand/nand_device_info.h index a5f56e913ec6..a5f56e913ec6 100644 --- a/drivers/mtd/nand/gpmi/nand_device_info.h +++ b/drivers/mtd/nand/nand_device_info.h |