diff options
| author | Tom Rini <[email protected]> | 2021-09-28 16:36:25 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2021-09-28 16:36:25 -0400 |
| commit | 68545c1ac123520598eacc0e5078da2730a1916a (patch) | |
| tree | 4594fa0eca427dfcdfa98c9188e5aa7290da06e4 /include/linux | |
| parent | 1d1f98c8eed7bb4792300e655c2cb70136928f74 (diff) | |
| parent | a70c3f9fb84524243eabefd28e0aa539f22e6226 (diff) | |
Merge tag '20210928-for-next' of https://source.denx.de/u-boot/custodians/u-boot-i2c into next
i2c changes for 20210928-for-next
- i2c: rcar_i2c: Enable configuring SCL rise and fall times
- i2c: mvtwsi: Add support for DM clocks and resets
- mtd: nand: raw: convert nand_dt_init() to ofnode_xx() interface
Diffstat (limited to 'include/linux')
| -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) |