diff options
author | Samuel Ortiz <sameo@linux.intel.com> | 2013-06-13 09:19:45 (GMT) |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2013-06-13 09:19:45 (GMT) |
commit | 734f935afad0f1f640a922f17609823c740d36ec (patch) | |
tree | 432b3f7e480bc4bf4a77cc9d60e27872ae4658a7 /drivers/mfd/arizona.h | |
parent | f7d3210e8b45eea8561c08d35502d2baca07593a (diff) | |
parent | e5657054ff508c9e547a8ceb931de07838ee3ba0 (diff) | |
download | linux-fsl-qoriq-734f935afad0f1f640a922f17609823c740d36ec.tar.xz |
Merge tag 'mfd-arizona-v3.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc
mfd: arizona: Updates for v3.10
A bunch of enhancements and fixes for the arizona devices, adding a few
new features (the main one being device tree) and improving robustness.
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 9798ae5..db55d98 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 |