diff options
| author | Jonas Aaberg <jonas.aberg@stericsson.com> | 2011-09-15 08:07:10 +0200 |
|---|---|---|
| committer | Robert Marklund <robert.marklund@stericsson.com> | 2011-10-05 12:59:49 +0200 |
| commit | 2c1652c7b2315210600593cfc29508ce729f343a (patch) | |
| tree | 1402610384ae7764675b2ab808193252476df308 /drivers/modem | |
| parent | efe7c3e5b550cc9509a007f8b058e30c298d7704 (diff) | |
ARM: ux500: Replace mach prcmu driver with mainlined version
The prcmu driver now exists in drivers/mfd
Change-Id: I0c8d97679ee186ca8205aeeafa0030568f540d2e
Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32057
Diffstat (limited to 'drivers/modem')
| -rw-r--r-- | drivers/modem/modem_u8500.c | 2 | ||||
| -rw-r--r-- | drivers/modem/shrm/shrm_protocol.c | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/drivers/modem/modem_u8500.c b/drivers/modem/modem_u8500.c index 20b5fe78ef7..2f5288d07bf 100644 --- a/drivers/modem/modem_u8500.c +++ b/drivers/modem/modem_u8500.c @@ -11,7 +11,7 @@ #include <linux/modem/modem.h> #include <linux/platform_device.h> #include <linux/err.h> -#include <mach/prcmu.h> +#include <linux/mfd/dbx500-prcmu.h> static void u8500_modem_request(struct modem_dev *mdev) { diff --git a/drivers/modem/shrm/shrm_protocol.c b/drivers/modem/shrm/shrm_protocol.c index 3b7abf7da61..137b70e9cbf 100644 --- a/drivers/modem/shrm/shrm_protocol.c +++ b/drivers/modem/shrm/shrm_protocol.c @@ -16,8 +16,7 @@ #include <linux/modem/shrm/shrm_private.h> #include <linux/modem/shrm/shrm_net.h> #include <linux/modem/modem_client.h> -#include <mach/prcmu.h> -#include <mach/prcmu-regs.h> +#include <linux/mfd/dbx500-prcmu.h> #include <mach/reboot_reasons.h> #define L2_HEADER_ISI 0x0 @@ -31,6 +30,8 @@ #define L2_HEADER_CIQ 0xC3 #define MAX_PAYLOAD 1024 +#define PRCM_HOSTACCESS_REQ (_PRCMU_BASE + 0x334) + static u8 boot_state = BOOT_INIT; static u8 recieve_common_msg[8*1024]; static u8 recieve_audio_msg[8*1024]; |