msm8226: Rename msm8x26 board to msm8226.
Change-Id: Ifd35078391c79dd26a30bb9419566f39a68161bc
diff --git a/platform/msm8x26/acpuclock.c b/platform/msm8226/acpuclock.c
similarity index 100%
rename from platform/msm8x26/acpuclock.c
rename to platform/msm8226/acpuclock.c
diff --git a/platform/msm8x26/gpio.c b/platform/msm8226/gpio.c
similarity index 100%
rename from platform/msm8x26/gpio.c
rename to platform/msm8226/gpio.c
diff --git a/platform/msm8x26/include/platform/clock.h b/platform/msm8226/include/platform/clock.h
similarity index 97%
rename from platform/msm8x26/include/platform/clock.h
rename to platform/msm8226/include/platform/clock.h
index 96e355f..118428a 100644
--- a/platform/msm8x26/include/platform/clock.h
+++ b/platform/msm8226/include/platform/clock.h
@@ -26,8 +26,8 @@
* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef __MSM8x26_CLOCK_H
-#define __MSM8x26_CLOCK_H
+#ifndef __MSM8226_CLOCK_H
+#define __MSM8226_CLOCK_H
#include <clock.h>
#include <clock_lib2.h>
diff --git a/platform/msm8x26/include/platform/clock.h b/platform/msm8226/include/platform/gpio.h
similarity index 71%
copy from platform/msm8x26/include/platform/clock.h
copy to platform/msm8226/include/platform/gpio.h
index 96e355f..51a1ce0 100644
--- a/platform/msm8x26/include/platform/clock.h
+++ b/platform/msm8226/include/platform/gpio.h
@@ -26,20 +26,33 @@
* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef __MSM8x26_CLOCK_H
-#define __MSM8x26_CLOCK_H
+#ifndef __PLATFORM_MSM8226_GPIO_H
+#define __PLATFORM_MSM8226_GPIO_H
-#include <clock.h>
-#include <clock_lib2.h>
+/* GPIO TLMM: Direction */
+#define GPIO_INPUT 0
+#define GPIO_OUTPUT 1
-#define UART_DM_CLK_RX_TX_BIT_RATE 0xCC
+/* GPIO TLMM: Pullup/Pulldown */
+#define GPIO_NO_PULL 0
+#define GPIO_PULL_DOWN 1
+#define GPIO_KEEPER 2
+#define GPIO_PULL_UP 3
-void platform_clock_init(void);
+/* GPIO TLMM: Drive Strength */
+#define GPIO_2MA 0
+#define GPIO_4MA 1
+#define GPIO_6MA 2
+#define GPIO_8MA 3
+#define GPIO_10MA 4
+#define GPIO_12MA 5
+#define GPIO_14MA 6
+#define GPIO_16MA 7
-void clock_init_mmc(uint32_t interface);
-void clock_config_mmc(uint32_t interface, uint32_t freq);
-void clock_config_uart_dm(uint8_t id);
-void hsusb_clock_init(void);
-void clock_config_ce(uint8_t instance);
+/* GPIO TLMM: Status */
+#define GPIO_ENABLE 0
+#define GPIO_DISABLE 1
+
+void gpio_config_uart_dm(uint8_t id);
#endif
diff --git a/platform/msm8x26/include/platform/iomap.h b/platform/msm8226/include/platform/iomap.h
similarity index 98%
rename from platform/msm8x26/include/platform/iomap.h
rename to platform/msm8226/include/platform/iomap.h
index 51c4e4d..9d47d11 100644
--- a/platform/msm8x26/include/platform/iomap.h
+++ b/platform/msm8226/include/platform/iomap.h
@@ -26,8 +26,8 @@
* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef _PLATFORM_MSM8x26_IOMAP_H_
-#define _PLATFORM_MSM8x26_IOMAP_H_
+#ifndef _PLATFORM_MSM8226_IOMAP_H_
+#define _PLATFORM_MSM8226_IOMAP_H_
#define MSM_IOMAP_BASE 0xF9000000
#define MSM_IOMAP_END 0xFEFFFFFF
diff --git a/platform/msm8x26/include/platform/irqs.h b/platform/msm8226/include/platform/irqs.h
similarity index 96%
rename from platform/msm8x26/include/platform/irqs.h
rename to platform/msm8226/include/platform/irqs.h
index 7f0be2a..c490a0b 100644
--- a/platform/msm8x26/include/platform/irqs.h
+++ b/platform/msm8226/include/platform/irqs.h
@@ -26,8 +26,8 @@
* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef __IRQS_MSM8x26_H
-#define __IRQS_MSM8x26_H
+#ifndef __IRQS_MSM8226_H
+#define __IRQS_MSM8226_H
/* MSM ACPU Interrupt Numbers */
@@ -58,4 +58,4 @@
#define NR_IRQS (NR_MSM_IRQS + NR_GPIO_IRQS + \
NR_BOARD_IRQS)
-#endif /* __IRQS_MSM8x26_H */
+#endif /* __IRQS_MSM8226_H */
diff --git a/platform/msm8x26/platform.c b/platform/msm8226/platform.c
similarity index 100%
rename from platform/msm8x26/platform.c
rename to platform/msm8226/platform.c
diff --git a/platform/msm8x26/rules.mk b/platform/msm8226/rules.mk
similarity index 100%
rename from platform/msm8x26/rules.mk
rename to platform/msm8226/rules.mk
diff --git a/platform/msm8x26/include/platform/gpio.h b/platform/msm8x26/include/platform/gpio.h
deleted file mode 100644
index e690703..0000000
--- a/platform/msm8x26/include/platform/gpio.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* Copyright (c) 2012-2013, Code Aurora Forum. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided
- * with the distribution.
- * * Neither the name of Code Aurora Forum, Inc. nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __PLATFORM_MSM8x26_GPIO_H
-#define __PLATFORM_MSM8x26_GPIO_H
-
-/* GPIO TLMM: Direction */
-#define GPIO_INPUT 0
-#define GPIO_OUTPUT 1
-
-/* GPIO TLMM: Pullup/Pulldown */
-#define GPIO_NO_PULL 0
-#define GPIO_PULL_DOWN 1
-#define GPIO_KEEPER 2
-#define GPIO_PULL_UP 3
-
-/* GPIO TLMM: Drive Strength */
-#define GPIO_2MA 0
-#define GPIO_4MA 1
-#define GPIO_6MA 2
-#define GPIO_8MA 3
-#define GPIO_10MA 4
-#define GPIO_12MA 5
-#define GPIO_14MA 6
-#define GPIO_16MA 7
-
-/* GPIO TLMM: Status */
-#define GPIO_ENABLE 0
-#define GPIO_DISABLE 1
-
-void gpio_config_uart_dm(uint8_t id);
-
-#endif
diff --git a/platform/msm_shared/rules.mk b/platform/msm_shared/rules.mk
index 911c789..6a226bd 100644
--- a/platform/msm_shared/rules.mk
+++ b/platform/msm_shared/rules.mk
@@ -86,7 +86,7 @@
$(LOCAL_DIR)/i2c_qup.o
endif
-ifeq ($(PLATFORM),msm8x26)
+ifeq ($(PLATFORM),msm8226)
OBJS += $(LOCAL_DIR)/qgic.o \
$(LOCAL_DIR)/qtimer.o \
$(LOCAL_DIR)/qtimer_mmap.o \
diff --git a/project/msm8x26.mk b/project/msm8226.mk
similarity index 77%
rename from project/msm8x26.mk
rename to project/msm8226.mk
index 977800f..0ba5aaa 100644
--- a/project/msm8x26.mk
+++ b/project/msm8226.mk
@@ -1,8 +1,8 @@
-# top level project rules for the msm8x26 project
+# top level project rules for the msm8226 project
#
LOCAL_DIR := $(GET_LOCAL_DIR)
-TARGET := msm8x26
+TARGET := msm8226
MODULES += app/aboot
diff --git a/target/msm8x26/init.c b/target/msm8226/init.c
similarity index 100%
rename from target/msm8x26/init.c
rename to target/msm8226/init.c
diff --git a/target/msm8x26/meminfo.c b/target/msm8226/meminfo.c
similarity index 100%
rename from target/msm8x26/meminfo.c
rename to target/msm8226/meminfo.c
diff --git a/target/msm8x26/rules.mk b/target/msm8226/rules.mk
similarity index 96%
rename from target/msm8x26/rules.mk
rename to target/msm8226/rules.mk
index e99f647..cdd9a35 100644
--- a/target/msm8x26/rules.mk
+++ b/target/msm8226/rules.mk
@@ -2,7 +2,7 @@
INCLUDES += -I$(LOCAL_DIR)/include -I$(LK_TOP_DIR)/platform/msm_shared
-PLATFORM := msm8x26
+PLATFORM := msm8226
MEMBASE := 0x0FF00000 # SDRAM
MEMSIZE := 0x00100000 # 1MB
diff --git a/target/msm8x26/tools/makefile b/target/msm8226/tools/makefile
similarity index 100%
rename from target/msm8x26/tools/makefile
rename to target/msm8226/tools/makefile
diff --git a/target/msm8x26/tools/mkheader.c b/target/msm8226/tools/mkheader.c
similarity index 84%
rename from target/msm8x26/tools/mkheader.c
rename to target/msm8226/tools/mkheader.c
index 8c29f9c..7b27dbb 100644
--- a/target/msm8x26/tools/mkheader.c
+++ b/target/msm8226/tools/mkheader.c
@@ -2,33 +2,32 @@
* Copyright (c) 2007, Google Inc.
* All rights reserved.
*
- * Copyright (c) 2009-2011, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2009-2011, The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google, Inc. nor the names of its contributors
- * may be used to endorse or promote products derived from this
- * software without specific prior written permission.
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided
+ * with the distribution.
+ * * Neither the name of The Linux Foundation nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
*
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <stdio.h>