Merge "[msm8660]: Enable crypto driver in 8660"
diff --git a/platform/msm8x60/acpuclock.c b/platform/msm8x60/acpuclock.c
index 8cb6be7..4721a40 100644
--- a/platform/msm8x60/acpuclock.c
+++ b/platform/msm8x60/acpuclock.c
@@ -270,3 +270,9 @@
writel(val, USB_HS1_XVCR_FS_CLK_NS);
}
+void ce_clock_init(void)
+{
+ /* Enable clock branch for CE2 */
+ writel((1<<4), CE2_HCLK_CTL);
+ return;
+}
diff --git a/platform/msm8x60/include/platform/clock.h b/platform/msm8x60/include/platform/clock.h
index d53a950..59b42ca 100644
--- a/platform/msm8x60/include/platform/clock.h
+++ b/platform/msm8x60/include/platform/clock.h
@@ -85,6 +85,7 @@
#define BB_PLL8_M_VAL_REG (MSM_CLK_CTL_BASE + 0x3148)
#define BB_PLL8_MODE_REG (MSM_CLK_CTL_BASE + 0x3140)
#define BB_PLL8_N_VAL_REG (MSM_CLK_CTL_BASE + 0x314C)
+#define CE2_HCLK_CTL (MSM_CLK_CTL_BASE + 0x2740)
enum clk_sources {
diff --git a/platform/msm8x60/include/platform/iomap.h b/platform/msm8x60/include/platform/iomap.h
index abce04a..1c3f167 100755
--- a/platform/msm8x60/include/platform/iomap.h
+++ b/platform/msm8x60/include/platform/iomap.h
@@ -63,6 +63,7 @@
#define MSM_SDC1_BASE 0x12400000
+#define MSM_CRYPTO_BASE 0x18500000
#define MSM_SHARED_BASE 0x40000000
diff --git a/platform/msm8x60/platform.c b/platform/msm8x60/platform.c
index f071dcf..645b8aa 100644
--- a/platform/msm8x60/platform.c
+++ b/platform/msm8x60/platform.c
@@ -77,6 +77,9 @@
void platform_init(void)
{
dprintf(INFO, "platform_init()\n");
+#ifndef PLATFORM_MSM8960
+ ce_clock_init();
+#endif
}
void display_init(void)
diff --git a/platform/msm_shared/rules.mk b/platform/msm_shared/rules.mk
index a1c7646..2ac4a5d 100644
--- a/platform/msm_shared/rules.mk
+++ b/platform/msm_shared/rules.mk
@@ -35,3 +35,8 @@
OBJS += $(LOCAL_DIR)/crypto_eng.o \
$(LOCAL_DIR)/crypto_hash.o
endif
+
+ifeq ($(PLATFORM),msm8x60)
+ OBJS += $(LOCAL_DIR)/crypto_eng.o \
+ $(LOCAL_DIR)/crypto_hash.o
+endif