diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-02-04 19:09:15 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-02-04 19:09:15 +0100 |
| commit | 2afe398a62d8e89c97b559d154699e7dc494437a (patch) | |
| tree | ea2a17f8a41ca0c99db5d6fffff7ba30cd545042 /include | |
| parent | 1b95290433eca0f8190da377547df0743099ec84 (diff) | |
| parent | e1f025671d2225c7215b5b3df74c89b6e3531ac8 (diff) | |
| download | barebox-2afe398a62d8e89c97b559d154699e7dc494437a.tar.gz barebox-2afe398a62d8e89c97b559d154699e7dc494437a.tar.xz | |
Merge branch 'for-next/raspberry-pi'
Diffstat (limited to 'include')
| -rw-r--r-- | include/driver.h | 2 | ||||
| -rw-r--r-- | include/regulator.h | 10 |
2 files changed, 12 insertions, 0 deletions
diff --git a/include/driver.h b/include/driver.h index 46aae4f433..76fd4b1720 100644 --- a/include/driver.h +++ b/include/driver.h @@ -409,6 +409,8 @@ int platform_driver_register(struct driver_d *drv); } \ level##_initcall(drv##_register) +#define postcore_platform_driver(drv) \ + register_driver_macro(postcore,platform,drv) #define coredevice_platform_driver(drv) \ register_driver_macro(coredevice,platform,drv) #define device_platform_driver(drv) \ diff --git a/include/regulator.h b/include/regulator.h index 26a5e56046..a43d3df540 100644 --- a/include/regulator.h +++ b/include/regulator.h @@ -15,7 +15,17 @@ struct regulator_ops { int (*is_enabled) (struct regulator_dev *); }; +#ifdef CONFIG_OFDEVICE int of_regulator_register(struct regulator_dev *rd, struct device_node *node); +#else +static inline int of_regulator_register(struct regulator_dev *rd, + struct device_node *node) +{ + return -ENOSYS; +} +#endif +int dev_regulator_register(struct regulator_dev *rd, const char * name, + const char* supply); void regulators_print(void); |