projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-spi
[platform/kernel/u-boot.git]
/
drivers
/
mtd
/
nand
/
spi
/
core.c
diff --git
a/drivers/mtd/nand/spi/core.c
b/drivers/mtd/nand/spi/core.c
index
cb8ffa3
..
397dfa4
100644
(file)
--- a/
drivers/mtd/nand/spi/core.c
+++ b/
drivers/mtd/nand/spi/core.c
@@
-24,6
+24,8
@@
#include <errno.h>
#include <spi.h>
#include <spi-mem.h>
#include <errno.h>
#include <spi.h>
#include <spi-mem.h>
+#include <dm/device_compat.h>
+#include <dm/devres.h>
#include <linux/mtd/spinand.h>
#endif
#include <linux/mtd/spinand.h>
#endif
@@
-833,6
+835,7
@@
static const struct spinand_manufacturer *spinand_manufacturers[] = {
&gigadevice_spinand_manufacturer,
¯onix_spinand_manufacturer,
µn_spinand_manufacturer,
&gigadevice_spinand_manufacturer,
¯onix_spinand_manufacturer,
µn_spinand_manufacturer,
+ &toshiba_spinand_manufacturer,
&winbond_spinand_manufacturer,
};
&winbond_spinand_manufacturer,
};
@@
-1021,7
+1024,7
@@
static int spinand_noecc_ooblayout_free(struct mtd_info *mtd, int section,
static const struct mtd_ooblayout_ops spinand_noecc_ooblayout = {
.ecc = spinand_noecc_ooblayout_ecc,
static const struct mtd_ooblayout_ops spinand_noecc_ooblayout = {
.ecc = spinand_noecc_ooblayout_ecc,
- .free = spinand_noecc_ooblayout_free,
+ .
r
free = spinand_noecc_ooblayout_free,
};
static int spinand_init(struct spinand_device *spinand)
};
static int spinand_init(struct spinand_device *spinand)