From ff03034eb779e457d735b2c12d8619f93568182e Mon Sep 17 00:00:00 2001 From: Alexander Shiyan Date: Sat, 21 Jul 2012 08:50:07 +0400 Subject: [PATCH] mc13xxx: Added dummy definitions if CONFIG_MFD_MC13XXX is not set Signed-off-by: Alexander Shiyan Signed-off-by: Sascha Hauer --- arch/arm/boards/pcm038/pcm038.c | 2 -- include/mfd/mc13xxx.h | 23 ++++++++++++++++++++++- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/arch/arm/boards/pcm038/pcm038.c b/arch/arm/boards/pcm038/pcm038.c index f081ee34a..1047f6d3e 100644 --- a/arch/arm/boards/pcm038/pcm038.c +++ b/arch/arm/boards/pcm038/pcm038.c @@ -126,7 +126,6 @@ static inline uint32_t get_pll_spctl10(void) */ static int pcm038_power_init(void) { -#ifdef CONFIG_MFD_MC13XXX uint32_t spctl0 = get_pll_spctl10(); struct mc13xxx *mc13xxx = mc13xxx_get(); @@ -176,7 +175,6 @@ static int pcm038_power_init(void) printf("Failed to initialize PMIC. Will continue with low CPU speed\n"); } } -#endif /* clock gating enable */ GPCR = 0x00050f08; diff --git a/include/mfd/mc13xxx.h b/include/mfd/mc13xxx.h index 2880307a2..632c9fbe4 100644 --- a/include/mfd/mc13xxx.h +++ b/include/mfd/mc13xxx.h @@ -163,10 +163,31 @@ struct mc13xxx { int revision; }; +#ifdef CONFIG_MFD_MC13XXX extern struct mc13xxx *mc13xxx_get(void); - 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); +#else +static inline struct mc13xxx *mc13xxx_get(void) +{ + return NULL; +} + +static inline int mc13xxx_reg_read(struct mc13xxx *mc13xxx, u8 reg, u32 *val) +{ + return -ENODEV; +} + +static inline int mc13xxx_reg_write(struct mc13xxx *mc13xxx, u8 reg, u32 val) +{ + return -ENODEV; +} + +static inline int mc13xxx_set_bits(struct mc13xxx *mc13xxx, u8 reg, u32 mask, u32 val) +{ + return -ENODEV; +} +#endif #endif /* __MFD_MC13XXX_H */