diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-06-04 21:01:40 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-06-04 21:01:40 +0200 |
| commit | 6ec2780419cb1c656a61b29385dc134a06cae287 (patch) | |
| tree | 1a5ab8befd54f60614ea7ee3784be35c8479fe7e /include/mfd | |
| parent | 1022dfecfbcf1e9c36e6d184a8a8540a995c2d28 (diff) | |
| parent | 999802c14ab87dfe670971672df65e3153fc13c5 (diff) | |
| download | barebox-6ec2780419cb1c656a61b29385dc134a06cae287.tar.gz barebox-6ec2780419cb1c656a61b29385dc134a06cae287.tar.xz | |
Merge branch 'for-next/imx'
Conflicts:
arch/arm/configs/tx25stk5_defconfig
Diffstat (limited to 'include/mfd')
| -rw-r--r-- | include/mfd/mc13xxx.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/mfd/mc13xxx.h b/include/mfd/mc13xxx.h index 1946b1a1c3..96a32e4dad 100644 --- a/include/mfd/mc13xxx.h +++ b/include/mfd/mc13xxx.h @@ -171,6 +171,7 @@ extern int mc13xxx_revision(struct mc13xxx *mc13xxx); extern int mc13xxx_reg_read(struct mc13xxx *mc13xxx, u8 reg, u32 *val); extern int mc13xxx_reg_write(struct mc13xxx *mc13xxx, u8 reg, u32 val); extern int mc13xxx_set_bits(struct mc13xxx *mc13xxx, u8 reg, u32 mask, u32 val); +int mc13xxx_register_init_callback(void(*callback)(struct mc13xxx *mc13xxx)); #else static inline struct mc13xxx *mc13xxx_get(void) { @@ -196,6 +197,11 @@ static inline int mc13xxx_set_bits(struct mc13xxx *mc13xxx, u8 reg, u32 mask, u3 { return -ENODEV; } + +static inline int mc13xxx_register_init_callback(void(*callback)(struct mc13xxx *mc13xxx)) +{ + return -ENODEV; +} #endif #endif /* __MFD_MC13XXX_H */ |