ssbi: Cleanup ssbi dependency from gpio_keypad
SSBI declarations were in the gpio_keypad files
resulting in needing to add gpio_keypad to use
ssbi for pmic functions.
Change-Id: Ic62a499a3cbd5fab9b8235e469b93103d207b20e
diff --git a/target/apq8064/init.c b/target/apq8064/init.c
index c5f475c..5bea927 100644
--- a/target/apq8064/init.c
+++ b/target/apq8064/init.c
@@ -36,7 +36,7 @@
#include <baseband.h>
#include <dev/keys.h>
#include <dev/pm8921.h>
-#include <dev/gpio_keypad.h>
+#include <dev/ssbi.h>
#include <platform/iomap.h>
#include <lib/ptable.h>
diff --git a/target/apq8064/keypad.c b/target/apq8064/keypad.c
index c2d01fe..2fec00f 100644
--- a/target/apq8064/keypad.c
+++ b/target/apq8064/keypad.c
@@ -29,6 +29,7 @@
#include <string.h>
#include <dev/keys.h>
+#include <dev/ssbi.h>
#include <dev/gpio_keypad.h>
#define NUM_OF_ROWS 1
diff --git a/target/apq8064/rules.mk b/target/apq8064/rules.mk
index 9e54d77..72dc708 100644
--- a/target/apq8064/rules.mk
+++ b/target/apq8064/rules.mk
@@ -14,6 +14,7 @@
MODULES += \
dev/keys \
+ dev/ssbi \
dev/pmic/pm8921 \
lib/ptable
diff --git a/target/msm7627_surf/init.c b/target/msm7627_surf/init.c
index fd713fb..fb92be7 100644
--- a/target/msm7627_surf/init.c
+++ b/target/msm7627_surf/init.c
@@ -33,7 +33,6 @@
#include <reg.h>
#include <debug.h>
#include <dev/keys.h>
-#include <dev/gpio_keypad.h>
#include <lib/ptable.h>
#include <dev/flash.h>
#include <smem.h>
diff --git a/target/msm7627_surf/keypad.c b/target/msm7627_surf/keypad.c
index fed7056..a77e267 100644
--- a/target/msm7627_surf/keypad.c
+++ b/target/msm7627_surf/keypad.c
@@ -31,6 +31,7 @@
*/
#include <dev/keys.h>
+#include <dev/ssbi.h>
#include <dev/gpio_keypad.h>
#define ARRAY_SIZE(x) (sizeof(x)/sizeof((x)[0]))
diff --git a/target/msm7627_surf/rules.mk b/target/msm7627_surf/rules.mk
index 701feaa..cf40a97 100644
--- a/target/msm7627_surf/rules.mk
+++ b/target/msm7627_surf/rules.mk
@@ -22,6 +22,7 @@
MODULES += \
dev/keys \
+ dev/ssbi \
lib/ptable
DEFINES += \
diff --git a/target/msm7627a/init.c b/target/msm7627a/init.c
index eace109..505cbd0 100644
--- a/target/msm7627a/init.c
+++ b/target/msm7627a/init.c
@@ -33,7 +33,7 @@
#include <reg.h>
#include <debug.h>
#include <dev/keys.h>
-#include <dev/gpio_keypad.h>
+#include <dev/ssbi.h>
#include <lib/ptable.h>
#include <dev/flash.h>
#include <smem.h>
diff --git a/target/msm7627a/keypad.c b/target/msm7627a/keypad.c
index 2657e02..15aef13 100644
--- a/target/msm7627a/keypad.c
+++ b/target/msm7627a/keypad.c
@@ -31,6 +31,7 @@
*/
#include <dev/keys.h>
+#include <dev/ssbi.h>
#include <dev/gpio_keypad.h>
#define ARRAY_SIZE(x) (sizeof(x)/sizeof((x)[0]))
diff --git a/target/msm7627a/rules.mk b/target/msm7627a/rules.mk
index 0a0e672..055e4cc 100644
--- a/target/msm7627a/rules.mk
+++ b/target/msm7627a/rules.mk
@@ -24,6 +24,7 @@
MODULES += \
dev/keys \
+ dev/ssbi \
lib/ptable
DEFINES += \
diff --git a/target/msm7630_surf/init.c b/target/msm7630_surf/init.c
index fcae4ca..42673e0 100644
--- a/target/msm7630_surf/init.c
+++ b/target/msm7630_surf/init.c
@@ -33,7 +33,7 @@
#include <debug.h>
#include <dev/keys.h>
#include <dev/gpio.h>
-#include <dev/gpio_keypad.h>
+#include <dev/ssbi.h>
#include <lib/ptable.h>
#include <dev/flash.h>
#include <smem.h>
diff --git a/target/msm7630_surf/keypad.c b/target/msm7630_surf/keypad.c
index 46c51c8..5733a86 100644
--- a/target/msm7630_surf/keypad.c
+++ b/target/msm7630_surf/keypad.c
@@ -31,6 +31,7 @@
*/
#include <dev/keys.h>
+#include <dev/ssbi.h>
#include <dev/gpio_keypad.h>
#define ARRAY_SIZE(x) (sizeof(x)/sizeof((x)[0]))
diff --git a/target/msm7630_surf/rules.mk b/target/msm7630_surf/rules.mk
index 3c1efac..76d5edb 100644
--- a/target/msm7630_surf/rules.mk
+++ b/target/msm7630_surf/rules.mk
@@ -24,6 +24,7 @@
MODULES += \
dev/keys \
+ dev/ssbi \
lib/ptable
DEFINES += \
diff --git a/target/msm8660_surf/init.c b/target/msm8660_surf/init.c
index f0c49f6..46aa665 100755
--- a/target/msm8660_surf/init.c
+++ b/target/msm8660_surf/init.c
@@ -32,7 +32,7 @@
#include <debug.h>
#include <dev/keys.h>
-#include <dev/gpio_keypad.h>
+#include <dev/ssbi.h>
#include <dev/gpio.h>
#include <lib/ptable.h>
#include <dev/flash.h>
diff --git a/target/msm8660_surf/keypad.c b/target/msm8660_surf/keypad.c
index ba1374c..246039e 100644
--- a/target/msm8660_surf/keypad.c
+++ b/target/msm8660_surf/keypad.c
@@ -28,6 +28,7 @@
*/
#include <dev/keys.h>
+#include <dev/ssbi.h>
#include <dev/gpio_keypad.h>
#include <platform.h>
diff --git a/target/msm8660_surf/rules.mk b/target/msm8660_surf/rules.mk
index 5313ff0..7be16a4 100755
--- a/target/msm8660_surf/rules.mk
+++ b/target/msm8660_surf/rules.mk
@@ -25,6 +25,7 @@
MODULES += \
dev/keys \
+ dev/ssbi \
lib/ptable
DEFINES += \
diff --git a/target/msm8960/init.c b/target/msm8960/init.c
index 4267381..3ed6719 100644
--- a/target/msm8960/init.c
+++ b/target/msm8960/init.c
@@ -39,7 +39,7 @@
#include <reg.h>
#include <dev/keys.h>
#include <dev/pm8921.h>
-#include <dev/gpio_keypad.h>
+#include <dev/ssbi.h>
#include <gsbi.h>
#include <target.h>
#include <platform.h>
diff --git a/target/msm8960/keypad.c b/target/msm8960/keypad.c
index 4ad9495..5cc0b87 100755
--- a/target/msm8960/keypad.c
+++ b/target/msm8960/keypad.c
@@ -29,6 +29,7 @@
#include <string.h>
#include <dev/keys.h>
+#include <dev/ssbi.h>
#include <dev/gpio_keypad.h>
#define NUM_OF_ROWS 1
diff --git a/target/msm8960/rules.mk b/target/msm8960/rules.mk
index 829fada..7a28bb4 100644
--- a/target/msm8960/rules.mk
+++ b/target/msm8960/rules.mk
@@ -23,6 +23,7 @@
MODULES += \
dev/keys \
dev/pmic/pm8921 \
+ dev/ssbi \
lib/ptable
DEFINES += \