diff options
| author | Philippe Langlais <philippe.langlais@stericsson.com> | 2011-10-14 11:49:26 +0200 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-05-22 10:59:49 +0200 |
| commit | c48df53c8bc8405eaab8c6ac020f105efd622013 (patch) | |
| tree | d35a1c80a95ce0bf98674c41eee04e196cf73429 | |
| parent | 8c95c326c57c95241fc1567e51bf71580f3260b1 (diff) | |
arm: ux500: common dbx500 prcmu driver api
This patch updates the PRCMU driver API to be the same
(as far as possible) in U8500 and U4500.
- <mach/prcmu-fw-api.h> has been renamed <mach/prcmu.h>.
- The platform specific APIs have moved to <mach/prcmu-db5500.h>
and <mach/prcmu-db8500.h> (but these should not be directly
included).
- The PRCMU QoS API has been put in <mach/prcmu-qos.h>.
ST Ericsson ID: 334772
ST Ericsson FOSS-OUT ID: trivial
ST Ericsson Linux next: 318371
Change-Id: I6ce117ec35ebf2e987178ccacce09afb554d2736
Signed-off-by: Mattias Nilsson <mattias.i.nilsson@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/23863
Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
| -rwxr-xr-x | drivers/hwmon/db8500.c | 2 | ||||
| -rw-r--r-- | drivers/mfd/ab8500-i2c.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/hwmon/db8500.c b/drivers/hwmon/db8500.c index b9b4312b8c1..c08ab033ada 100755 --- a/drivers/hwmon/db8500.c +++ b/drivers/hwmon/db8500.c @@ -13,7 +13,7 @@ #include <linux/module.h> #include <linux/slab.h> #include <linux/platform_device.h> -#include <mach/prcmu-fw-api.h> +#include <mach/prcmu.h> #include <linux/hwmon.h> #include <linux/sysfs.h> #include <linux/hwmon-sysfs.h> diff --git a/drivers/mfd/ab8500-i2c.c b/drivers/mfd/ab8500-i2c.c index b83045f102b..5ee90fd125e 100644 --- a/drivers/mfd/ab8500-i2c.c +++ b/drivers/mfd/ab8500-i2c.c @@ -13,6 +13,7 @@ #include <linux/mfd/abx500/ab8500.h> #include <linux/mfd/dbx500-prcmu.h> + static int ab8500_i2c_write(struct ab8500 *ab8500, u16 addr, u8 data) { int ret; |