diff options
| author | Tom Rini <[email protected]> | 2021-09-28 13:57:56 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2021-09-28 13:57:56 -0400 |
| commit | b5d7a200a81097fddef7ba5ec42e330d49fa2f33 (patch) | |
| tree | 1fa564e36db8678724af5817e5163060f2852d54 /include/linux/mtd/rawnand.h | |
| parent | 0b9bcf665cd98fe9db0956c894006b250a7d465f (diff) | |
| parent | 24ea366add54b8ca753eb3259bff8b50693dc8ef (diff) | |
Merge branch '2021-09-28-regression-fixes'
- Reintroduce creating internally the "nor%d" style names, in order to
fix some use U-Boot use-cases involving the "mtd" command.
- Fix a regression over the default SPI bus mode shown by having the
compiled default actually start being used. The correct default here
is 0.
- Fix ethernet on imx7d-sdb
- Fix a regression with MTD NAND devices when OF_LIVE is enabled
Diffstat (limited to 'include/linux/mtd/rawnand.h')
| -rw-r--r-- | include/linux/mtd/rawnand.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/mtd/rawnand.h b/include/linux/mtd/rawnand.h index 66febc6b721..2fba9dc317e 100644 --- a/include/linux/mtd/rawnand.h +++ b/include/linux/mtd/rawnand.h @@ -891,7 +891,7 @@ struct nand_chip { void __iomem *IO_ADDR_R; void __iomem *IO_ADDR_W; - int flash_node; + ofnode flash_node; uint8_t (*read_byte)(struct mtd_info *mtd); u16 (*read_word)(struct mtd_info *mtd); @@ -973,12 +973,12 @@ struct nand_chip { static inline void nand_set_flash_node(struct nand_chip *chip, ofnode node) { - chip->flash_node = ofnode_to_offset(node); + chip->flash_node = node; } static inline ofnode nand_get_flash_node(struct nand_chip *chip) { - return offset_to_ofnode(chip->flash_node); + return chip->flash_node; } static inline struct nand_chip *mtd_to_nand(struct mtd_info *mtd) |