diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2017-10-19 15:07:40 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2017-10-19 15:07:40 +0200 |
| commit | 7f04124c149fa4d8e8f657907c581f10987003e2 (patch) | |
| tree | d4f9c129f5ef7f4f28231766f449a12fb755b7e6 /include | |
| parent | 71d764a4b05d3ca4ec8d14f71c9149fd0023424e (diff) | |
| parent | 25c3fb28d8017595942115d4dbffc16d96f43930 (diff) | |
| download | barebox-7f04124c149fa4d8e8f657907c581f10987003e2.tar.gz barebox-7f04124c149fa4d8e8f657907c581f10987003e2.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'include')
| -rw-r--r-- | include/elf.h | 2 | ||||
| -rw-r--r-- | include/mci.h | 1 | ||||
| -rw-r--r-- | include/regmap.h | 3 |
3 files changed, 4 insertions, 2 deletions
diff --git a/include/elf.h b/include/elf.h index a749bec34e..ebcec7db0d 100644 --- a/include/elf.h +++ b/include/elf.h @@ -207,7 +207,7 @@ typedef struct elf32_hdr{ } Elf32_Ehdr; typedef struct elf64_hdr { - unsigned char e_ident[16]; /* ELF "magic number" */ + unsigned char e_ident[EI_NIDENT]; /* ELF "magic number" */ Elf64_Half e_type; Elf64_Half e_machine; Elf64_Word e_version; diff --git a/include/mci.h b/include/mci.h index d3115e8cc6..1f6533391a 100644 --- a/include/mci.h +++ b/include/mci.h @@ -403,6 +403,7 @@ struct mci_host { unsigned dsr_val; /**< optional dsr value */ int use_dsr; /**< optional dsr usage flag */ bool non_removable; /**< device is non removable */ + bool no_sd; /**< do not send SD commands during initialization */ struct regulator *supply; /** init the host interface */ diff --git a/include/regmap.h b/include/regmap.h index 9675a17b96..09b7b57d52 100644 --- a/include/regmap.h +++ b/include/regmap.h @@ -62,6 +62,7 @@ int regmap_get_reg_stride(struct regmap *map); int regmap_write_bits(struct regmap *map, unsigned int reg, unsigned int mask, unsigned int val); - +int regmap_update_bits(struct regmap *map, unsigned int reg, + unsigned int mask, unsigned int val); #endif /* __REGMAP_H */ |