aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDima Zavin <dima@android.com>2010-04-11 17:34:19 -0700
committerDima Zavin <dima@android.com>2010-04-11 23:35:42 -0700
commit086e1c521d6084f21e9aadcb5e4642976b0f4810 (patch)
tree0ab38516018228d160829f6921b428a2dece3657
parent6922049e884401ebc10c4c836e258c317f884a81 (diff)
downloadlk-086e1c521d6084f21e9aadcb5e4642976b0f4810.tar.gz
7x30: don't hardcode smem in keypad
Signed-off-by: Dima Zavin <dima@android.com>
-rw-r--r--dev/keys/gpio_keypad.c3
-rw-r--r--include/dev/gpio_keypad.h1
2 files changed, 2 insertions, 2 deletions
diff --git a/dev/keys/gpio_keypad.c b/dev/keys/gpio_keypad.c
index bb95f77c..cf2817a8 100644
--- a/dev/keys/gpio_keypad.c
+++ b/dev/keys/gpio_keypad.c
@@ -40,6 +40,7 @@
#include <dev/gpio_keypad.h>
#include <kernel/event.h>
#include <kernel/timer.h>
+#include <platform/iomap.h>
#include <reg.h>
struct gpio_kp {
@@ -455,7 +456,7 @@ void ssbi_gpio_init(void)
void ssbi_keypad_init(struct qwerty_keypad_info *qwerty_kp)
{
- int *modem_stat_check = (SMEM_BASE + 0x14);
+ int *modem_stat_check = (MSM_SHARED_BASE + 0x14);
int len;
/* Wait for modem to be ready before keypad init */
diff --git a/include/dev/gpio_keypad.h b/include/dev/gpio_keypad.h
index 8c006d3c..77990bac 100644
--- a/include/dev/gpio_keypad.h
+++ b/include/dev/gpio_keypad.h
@@ -59,7 +59,6 @@ void gpio_keypad_init(struct gpio_keypad_info *kpinfo);
/* SSBI 2.0 controller registers */
#define MSM_SSBI_BASE 0xAD900000
-#define SMEM_BASE 0x100000
#define SSBI_TIMEOUT_US 100