Merge "target: msm8974: Add JDI QHD video/cmd panel support"
diff --git a/platform/mdmkrypton/acpuclock.c b/platform/mdm9x35/acpuclock.c
similarity index 100%
rename from platform/mdmkrypton/acpuclock.c
rename to platform/mdm9x35/acpuclock.c
diff --git a/platform/mdmkrypton/gpio.c b/platform/mdm9x35/gpio.c
similarity index 100%
rename from platform/mdmkrypton/gpio.c
rename to platform/mdm9x35/gpio.c
diff --git a/platform/mdmkrypton/include/platform/clock.h b/platform/mdm9x35/include/platform/clock.h
similarity index 95%
rename from platform/mdmkrypton/include/platform/clock.h
rename to platform/mdm9x35/include/platform/clock.h
index f066bfd..a45a79e 100755
--- a/platform/mdmkrypton/include/platform/clock.h
+++ b/platform/mdm9x35/include/platform/clock.h
@@ -26,8 +26,8 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef __PLATFORM_MDMKRYPTON_CLOCK_H
-#define __PLATFORM_MDMKRYPTON_CLOCK_H
+#ifndef __PLATFORM_MDM9635_CLOCK_H
+#define __PLATFORM_MDM9635_CLOCK_H
#define UART_DM_CLK_RX_TX_BIT_RATE 0xCC
diff --git a/platform/mdmkrypton/include/platform/gpio.h b/platform/mdm9x35/include/platform/gpio.h
similarity index 96%
rename from platform/mdmkrypton/include/platform/gpio.h
rename to platform/mdm9x35/include/platform/gpio.h
index 4176864..38367c2 100755
--- a/platform/mdmkrypton/include/platform/gpio.h
+++ b/platform/mdm9x35/include/platform/gpio.h
@@ -26,8 +26,8 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef __PLATFORM_MDMKRYPTON_GPIO_H
-#define __PLATFORM_MDMKRYPTON_GPIO_H
+#ifndef __PLATFORM_MDM9635_GPIO_H
+#define __PLATFORM_MDM9635_GPIO_H
/* GPIO TLMM: Direction */
#define GPIO_INPUT 0
diff --git a/platform/mdmkrypton/include/platform/iomap.h b/platform/mdm9x35/include/platform/iomap.h
similarity index 98%
rename from platform/mdmkrypton/include/platform/iomap.h
rename to platform/mdm9x35/include/platform/iomap.h
index 30cc6e6..cf84ee7 100755
--- a/platform/mdmkrypton/include/platform/iomap.h
+++ b/platform/mdm9x35/include/platform/iomap.h
@@ -26,8 +26,8 @@
* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef _PLATFORM_MDMKRYPTON_IOMAP_H_
-#define _PLATFORM_MDMKRYPTON_IOMAP_H_
+#ifndef _PLATFORM_MDM9635_IOMAP_H_
+#define _PLATFORM_MDM9635_IOMAP_H_
#define MSM_IOMAP_BASE 0xF9000000
#define MSM_IOMAP_END 0xFEFFFFFF
diff --git a/platform/mdmkrypton/include/platform/irqs.h b/platform/mdm9x35/include/platform/irqs.h
similarity index 97%
rename from platform/mdmkrypton/include/platform/irqs.h
rename to platform/mdm9x35/include/platform/irqs.h
index f8bb0de..c45f76c 100755
--- a/platform/mdmkrypton/include/platform/irqs.h
+++ b/platform/mdm9x35/include/platform/irqs.h
@@ -26,8 +26,8 @@
*
*/
-#ifndef __IRQS_MDMKRYPTON_H
-#define __IRQS_MDMKRYPTON_H
+#ifndef __IRQS_MDM9635_H
+#define __IRQS_MDM9635_H
/* TBD: The numbers need to be reviewed */
diff --git a/platform/mdmkrypton/mdmkrypton-clock.c b/platform/mdm9x35/mdm9x35-clock.c
similarity index 100%
rename from platform/mdmkrypton/mdmkrypton-clock.c
rename to platform/mdm9x35/mdm9x35-clock.c
diff --git a/platform/mdmkrypton/platform.c b/platform/mdm9x35/platform.c
similarity index 100%
rename from platform/mdmkrypton/platform.c
rename to platform/mdm9x35/platform.c
diff --git a/platform/mdmkrypton/rules.mk b/platform/mdm9x35/rules.mk
similarity index 91%
rename from platform/mdmkrypton/rules.mk
rename to platform/mdm9x35/rules.mk
index 975feeb..556aea9 100755
--- a/platform/mdmkrypton/rules.mk
+++ b/platform/mdm9x35/rules.mk
@@ -12,7 +12,7 @@
$(LOCAL_DIR)/platform.o \
$(LOCAL_DIR)/gpio.o \
$(LOCAL_DIR)/acpuclock.o \
- $(LOCAL_DIR)/mdmkrypton-clock.o
+ $(LOCAL_DIR)/mdm9x35-clock.o
LINKER_SCRIPT += $(BUILDDIR)/system-onesegment.ld
diff --git a/platform/msm_shared/rules.mk b/platform/msm_shared/rules.mk
index 6f5c779..18a4318 100755
--- a/platform/msm_shared/rules.mk
+++ b/platform/msm_shared/rules.mk
@@ -282,7 +282,7 @@
$(LOCAL_DIR)/clock_lib2.o
endif
-ifeq ($(PLATFORM),mdmkrypton)
+ifeq ($(PLATFORM),mdm9x35)
OBJS += $(LOCAL_DIR)/qgic.o \
$(LOCAL_DIR)/uart_dm.o \
$(LOCAL_DIR)/interrupts.o \
diff --git a/platform/msm_shared/smem.h b/platform/msm_shared/smem.h
index 7c36cd7..7146ea1 100644
--- a/platform/msm_shared/smem.h
+++ b/platform/msm_shared/smem.h
@@ -315,7 +315,7 @@
APQ8074 = 184,
MSM8274 = 185,
MSM8674 = 186,
- MDMKRYPTON = 187,
+ MDM9635 = 187,
FSM9900 = 188,
FSM9905 = 189,
FSM9955 = 190,
diff --git a/project/mdmkrypton.mk b/project/mdm9635.mk
similarity index 78%
rename from project/mdmkrypton.mk
rename to project/mdm9635.mk
index e96867d..10abd74 100644
--- a/project/mdmkrypton.mk
+++ b/project/mdm9635.mk
@@ -1,8 +1,8 @@
-# top level project rules for the mdmkrypton project
+# top level project rules for the mdm9635 project
#
LOCAL_DIR := $(GET_LOCAL_DIR)
-TARGET := mdmkrypton
+TARGET := mdm9635
MODULES += app/aboot
diff --git a/target/mdmkrypton/init.c b/target/mdm9635/init.c
similarity index 100%
rename from target/mdmkrypton/init.c
rename to target/mdm9635/init.c
diff --git a/target/mdmkrypton/keypad.c b/target/mdm9635/keypad.c
similarity index 100%
rename from target/mdmkrypton/keypad.c
rename to target/mdm9635/keypad.c
diff --git a/target/mdmkrypton/meminfo.c b/target/mdm9635/meminfo.c
similarity index 100%
rename from target/mdmkrypton/meminfo.c
rename to target/mdm9635/meminfo.c
diff --git a/target/mdmkrypton/rules.mk b/target/mdm9635/rules.mk
similarity index 97%
rename from target/mdmkrypton/rules.mk
rename to target/mdm9635/rules.mk
index b6d36d8..62fb3e2 100644
--- a/target/mdmkrypton/rules.mk
+++ b/target/mdm9635/rules.mk
@@ -2,7 +2,7 @@
INCLUDES += -I$(LOCAL_DIR)/include -I$(LK_TOP_DIR)/platform/msm_shared
-PLATFORM := mdmkrypton
+PLATFORM := mdm9x35
MEMBASE := 0x07E00000
MEMSIZE := 0x00100000 # 1MB
diff --git a/target/mdmkrypton/tools/makefile b/target/mdm9635/tools/makefile
similarity index 100%
rename from target/mdmkrypton/tools/makefile
rename to target/mdm9635/tools/makefile
diff --git a/target/mdmkrypton/tools/mkheader.c b/target/mdm9635/tools/mkheader.c
similarity index 100%
rename from target/mdmkrypton/tools/mkheader.c
rename to target/mdm9635/tools/mkheader.c