msm: smd_debug: Update version detection.
Removes SMD version checks that probe modem and other processors
since that does not apply to all architectures. Instead, use
the same static SMD version configuration used in SMD itself.
Change-Id: Id01ea79203ee50d55343939e398df16de28dd261
Signed-off-by: Eric Holmberg <eholmber@codeaurora.org>
diff --git a/arch/arm/mach-msm/smd_debug.c b/arch/arm/mach-msm/smd_debug.c
index 855482b..d7602f2 100644
--- a/arch/arm/mach-msm/smd_debug.c
+++ b/arch/arm/mach-msm/smd_debug.c
@@ -431,7 +431,8 @@
return i;
}
-static int debug_read_ch_v1(char *buf, int max)
+#if (!defined(CONFIG_MSM_SMD_PKG4) && !defined(CONFIG_MSM_SMD_PKG3))
+static int debug_read_ch(char *buf, int max)
{
void *shared;
int n, i = 0;
@@ -450,8 +451,8 @@
return i;
}
-
-static int debug_read_ch_v2(char *buf, int max)
+#else
+static int debug_read_ch(char *buf, int max)
{
void *shared, *buffer;
unsigned buffer_sz;
@@ -476,20 +477,7 @@
return i;
}
-
-static int debug_read_ch(char *buf, int max)
-{
- uint32_t *smd_ver;
-
- smd_ver = smem_alloc(SMEM_VERSION_SMD, 32 * sizeof(uint32_t));
-
- if (smd_ver && (((smd_ver[VERSION_MODEM] >> 16) >= 1) ||
- ((smd_ver[VERSION_QDSP6] >> 16) >= 1) ||
- ((smd_ver[VERSION_DSPS] >> 16) >= 1)))
- return debug_read_ch_v2(buf, max);
- else
- return debug_read_ch_v1(buf, max);
-}
+#endif
static int debug_read_smem_version(char *buf, int max)
{