mirror of
https://xff.cz/git/u-boot/
synced 2025-10-18 00:11:48 +02:00
Merge commit 'ac30d240dbb520d0980f0687630feb702a14f51a' of https://source.denx.de/u-boot/custodians/u-boot-nand-flash into next
Re-sync again on some linux part, add some fixes for fsl_elbc from Pali and switch imx8mn bsh to use nand base ident For nand subsystem tested on: - imx8mn Macronix MX30LF4G18AC - P2020 based board Turris 1.1 for fsl_elbc
This commit is contained in:
@@ -29,9 +29,8 @@ struct nand_flash_dev;
|
||||
struct device_node;
|
||||
|
||||
/* Get the flash and manufacturer id and lookup if the type is supported. */
|
||||
struct nand_flash_dev *nand_get_flash_type(struct nand_chip *chip,
|
||||
int *maf_id, int *dev_id,
|
||||
struct nand_flash_dev *type);
|
||||
int nand_detect(struct nand_chip *chip, int *maf_id, int *dev_id,
|
||||
struct nand_flash_dev *type);
|
||||
|
||||
/* Scan and identify a NAND device */
|
||||
int nand_scan(struct mtd_info *mtd, int max_chips);
|
||||
@@ -976,7 +975,7 @@ struct nand_chip {
|
||||
void *priv;
|
||||
|
||||
struct {
|
||||
const struct nand_manufacturers *desc;
|
||||
const struct nand_manufacturer *desc;
|
||||
void *priv;
|
||||
} manufacturer;
|
||||
};
|
||||
@@ -1124,19 +1123,19 @@ struct nand_flash_dev {
|
||||
};
|
||||
|
||||
/**
|
||||
* struct nand_manufacturers - NAND Flash Manufacturer ID Structure
|
||||
* struct nand_manufacturer - NAND Flash Manufacturer ID Structure
|
||||
* @name: Manufacturer name
|
||||
* @id: manufacturer ID code of device.
|
||||
* @ops: manufacturer operations
|
||||
*/
|
||||
struct nand_manufacturers {
|
||||
struct nand_manufacturer {
|
||||
int id;
|
||||
char *name;
|
||||
const struct nand_manufacturer_ops *ops;
|
||||
};
|
||||
|
||||
extern struct nand_flash_dev nand_flash_ids[];
|
||||
extern struct nand_manufacturers nand_manuf_ids[];
|
||||
extern struct nand_manufacturer nand_manuf_ids[];
|
||||
|
||||
extern const struct nand_manufacturer_ops toshiba_nand_manuf_ops;
|
||||
extern const struct nand_manufacturer_ops samsung_nand_manuf_ops;
|
||||
|
Reference in New Issue
Block a user