diff options
| author | Mark Brown <broonie@linaro.org> | 2013-06-17 17:20:14 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-06-17 17:20:14 +0100 |
| commit | 9912b30f95e22d5722abc225c1c3784a51643aef (patch) | |
| tree | f73c69fd2406c63743716b2f8ff4937a5cb340cd /drivers/mfd/arizona.h | |
| parent | e768f4e12f6aaa991fb07e9ac05073bd8cb280cd (diff) | |
| parent | 7c470373e097822ce6ca7bbac44b3afec0e7c1f8 (diff) | |
Merge remote-tracking branch 'asoc/topic/arizona' into asoc-next
Diffstat (limited to 'drivers/mfd/arizona.h')
| -rw-r--r-- | drivers/mfd/arizona.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/mfd/arizona.h b/drivers/mfd/arizona.h index 9798ae5da67..db55d9854a5 100644 --- a/drivers/mfd/arizona.h +++ b/drivers/mfd/arizona.h @@ -13,6 +13,7 @@ #ifndef _WM5102_H #define _WM5102_H +#include <linux/of.h> #include <linux/regmap.h> #include <linux/pm.h> @@ -26,6 +27,8 @@ extern const struct regmap_config wm5110_spi_regmap; extern const struct dev_pm_ops arizona_pm_ops; +extern const struct of_device_id arizona_of_match[]; + extern const struct regmap_irq_chip wm5102_aod; extern const struct regmap_irq_chip wm5102_irq; @@ -37,4 +40,13 @@ int arizona_dev_exit(struct arizona *arizona); int arizona_irq_init(struct arizona *arizona); int arizona_irq_exit(struct arizona *arizona); +#ifdef CONFIG_OF +int arizona_of_get_type(struct device *dev); +#else +static inline int arizona_of_get_type(struct device *dev) +{ + return 0; +} +#endif + #endif |