msm: mdm: add a parameter for the name used to register for SSR
The name that that mdm driver uses to register with SSR is used
by other drivers to register for notifications, so it must be a
system-wide, known string. The mdm driver was previously generating
an arbitrary string that only it knew about. The name needs to be
passed to the mdm driver instead of it being auto-generated.
Change-Id: If8dab185b5599e95f2087bab97d48e5c72311279
Signed-off-by: Joel King <joelking@codeaurora.org>
diff --git a/arch/arm/mach-msm/board-8064.c b/arch/arm/mach-msm/board-8064.c
index bd44608..eeb3ec6 100644
--- a/arch/arm/mach-msm/board-8064.c
+++ b/arch/arm/mach-msm/board-8064.c
@@ -1845,6 +1845,7 @@
.sysmon_subsys_id_valid = 1,
.sysmon_subsys_id = SYSMON_SS_EXT_MODEM,
.no_a2m_errfatal_on_ssr = 1,
+ .subsys_name = "external_modem_mdm",
};
static struct mdm_platform_data sglte2_qsc_platform_data = {
@@ -1856,6 +1857,7 @@
.no_a2m_errfatal_on_ssr = 1,
.no_reset_on_first_powerup = 1,
.kpd_not_inverted = 1,
+ .subsys_name = "external_modem",
};
static struct tsens_platform_data apq_tsens_pdata = {
diff --git a/arch/arm/mach-msm/include/mach/mdm2.h b/arch/arm/mach-msm/include/mach/mdm2.h
index eb7e63a..1afc763 100644
--- a/arch/arm/mach-msm/include/mach/mdm2.h
+++ b/arch/arm/mach-msm/include/mach/mdm2.h
@@ -42,6 +42,7 @@
int no_a2m_errfatal_on_ssr;
int no_reset_on_first_powerup;
int kpd_not_inverted;
+ char *subsys_name;
};
#endif
diff --git a/arch/arm/mach-msm/mdm_common.c b/arch/arm/mach-msm/mdm_common.c
index ec36c43..9e53002 100644
--- a/arch/arm/mach-msm/mdm_common.c
+++ b/arch/arm/mach-msm/mdm_common.c
@@ -772,12 +772,18 @@
memset((void *)&mdev->mdm_subsys, 0,
sizeof(struct subsys_desc));
- if (mdev->mdm_data.device_id <= 0)
- snprintf(mdev->subsys_name, sizeof(mdev->subsys_name),
- "%s", EXTERNAL_MODEM);
- else
- snprintf(mdev->subsys_name, sizeof(mdev->subsys_name),
- "%s.%d", EXTERNAL_MODEM, mdev->mdm_data.device_id);
+ if (mdm_drv->pdata->subsys_name) {
+ strlcpy(mdev->subsys_name, mdm_drv->pdata->subsys_name,
+ sizeof(mdev->subsys_name));
+ } else {
+ if (mdev->mdm_data.device_id <= 0)
+ snprintf(mdev->subsys_name, sizeof(mdev->subsys_name),
+ "%s", EXTERNAL_MODEM);
+ else
+ snprintf(mdev->subsys_name, sizeof(mdev->subsys_name),
+ "%s.%d", EXTERNAL_MODEM,
+ mdev->mdm_data.device_id);
+ }
mdev->mdm_subsys.shutdown = mdm_subsys_shutdown;
mdev->mdm_subsys.ramdump = mdm_subsys_ramdumps;
mdev->mdm_subsys.powerup = mdm_subsys_powerup;