summaryrefslogtreecommitdiff
path: root/drivers/mtd/nand/raw/nand_ids.c
diff options
context:
space:
mode:
authorMichael Trimarchi <michael@amarulasolutions.com>2022-07-20 18:22:09 +0200
committerMichael Trimarchi <michael@amarulasolutions.com>2022-07-22 13:29:06 +0200
commita1286a1fc41633f45a4fa9dbf0be5eba3deadc09 (patch)
treeaf09a47ee2ce3d184ebedaab1d373ee1d3f225d9 /drivers/mtd/nand/raw/nand_ids.c
parentbded7d819ff3b8a364ff57ab00a90d6e20bb6850 (diff)
mtd: nand: Move Samsung specific init/detection logic in nand_samsung.c
Upstream linux commit c51d0ac59f2420. Move Samsung specific initialization and detection logic into nand_samsung.c. This is part of the "separate vendor specific code from core" cleanup process. Signed-off-by: Michael Trimarchi <michael@amarulasolutions.com> Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
Diffstat (limited to 'drivers/mtd/nand/raw/nand_ids.c')
-rw-r--r--drivers/mtd/nand/raw/nand_ids.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/nand/raw/nand_ids.c b/drivers/mtd/nand/raw/nand_ids.c
index 2a50f0b214..f4126c3a5a 100644
--- a/drivers/mtd/nand/raw/nand_ids.c
+++ b/drivers/mtd/nand/raw/nand_ids.c
@@ -10,7 +10,7 @@
#include <linux/mtd/rawnand.h>
#include <linux/sizes.h>
-#define LP_OPTIONS NAND_SAMSUNG_LP_OPTIONS
+#define LP_OPTIONS 0
#define LP_OPTIONS16 (LP_OPTIONS | NAND_BUSWIDTH_16)
#define SP_OPTIONS NAND_NEED_READRDY
@@ -189,7 +189,7 @@ struct nand_flash_dev nand_flash_ids[] = {
/* Manufacturer IDs */
struct nand_manufacturers nand_manuf_ids[] = {
{NAND_MFR_TOSHIBA, "Toshiba"},
- {NAND_MFR_SAMSUNG, "Samsung"},
+ {NAND_MFR_SAMSUNG, "Samsung", &samsung_nand_manuf_ops},
{NAND_MFR_FUJITSU, "Fujitsu"},
{NAND_MFR_NATIONAL, "National"},
{NAND_MFR_RENESAS, "Renesas"},