msm: Drop prefixes from board files
Remove the MSM / APQ prefixes from 8930, 8960, and 8064
board files.
Change-Id: I8368be0b80385a40616fa2fcd2f108df66faf6ee
Signed-off-by: Stepan Moskovchenko <stepanm@codeaurora.org>
diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile
index 76ce97f..f7f48b5 100644
--- a/arch/arm/mach-msm/Makefile
+++ b/arch/arm/mach-msm/Makefile
@@ -226,20 +226,20 @@
obj-$(CONFIG_ARCH_MSM8960) += saw-regulator.o rpm-regulator.o rpm-regulator-8960.o
obj-$(CONFIG_ARCH_MSM8960) += devices-8960.o
obj-$(CONFIG_ARCH_APQ8064) += devices-8960.o devices-8064.o
-board-msm8960-all-objs += board-msm8960.o board-msm8960-camera.o board-msm8960-display.o board-msm8960-pmic.o board-msm8960-storage.o board-msm8960-gpiomux.o
-board-msm8930-all-objs += board-msm8930.o board-msm8930-camera.o board-msm8930-display.o board-msm8930-pmic.o board-msm8930-storage.o board-msm8930-gpiomux.o
-board-apq8064-all-objs += board-apq8064.o board-apq8064-storage.o
-obj-$(CONFIG_MACH_MSM8960_SIM) += board-msm8960-all.o board-msm8960-regulator.o
-obj-$(CONFIG_MACH_MSM8960_RUMI3) += board-msm8960-all.o board-msm8960-regulator.o
-obj-$(CONFIG_MACH_MSM8960_CDP) += board-msm8960-all.o board-msm8960-regulator.o
-obj-$(CONFIG_MACH_MSM8960_MTP) += board-msm8960-all.o board-msm8960-regulator.o
-obj-$(CONFIG_MACH_MSM8960_FLUID) += board-msm8960-all.o board-msm8960-regulator.o
-obj-$(CONFIG_MACH_MSM8930_CDP) += board-msm8930-all.o board-msm8960-regulator.o
-obj-$(CONFIG_MACH_MSM8930_MTP) += board-msm8930-all.o board-msm8960-regulator.o
-obj-$(CONFIG_MACH_MSM8930_FLUID) += board-msm8930-all.o board-msm8960-regulator.o
+board-8960-all-objs += board-8960.o board-8960-camera.o board-8960-display.o board-8960-pmic.o board-8960-storage.o board-8960-gpiomux.o
+board-8930-all-objs += board-8930.o board-8930-camera.o board-8930-display.o board-8930-pmic.o board-8930-storage.o board-8930-gpiomux.o
+board-8064-all-objs += board-8064.o board-8064-storage.o
+obj-$(CONFIG_MACH_MSM8960_SIM) += board-8960-all.o board-8960-regulator.o
+obj-$(CONFIG_MACH_MSM8960_RUMI3) += board-8960-all.o board-8960-regulator.o
+obj-$(CONFIG_MACH_MSM8960_CDP) += board-8960-all.o board-8960-regulator.o
+obj-$(CONFIG_MACH_MSM8960_MTP) += board-8960-all.o board-8960-regulator.o
+obj-$(CONFIG_MACH_MSM8960_FLUID) += board-8960-all.o board-8960-regulator.o
+obj-$(CONFIG_MACH_MSM8930_CDP) += board-8930-all.o board-8960-regulator.o
+obj-$(CONFIG_MACH_MSM8930_MTP) += board-8930-all.o board-8960-regulator.o
+obj-$(CONFIG_MACH_MSM8930_FLUID) += board-8930-all.o board-8960-regulator.o
obj-$(CONFIG_ARCH_MSM8960) += bms-batterydata.o
-obj-$(CONFIG_MACH_APQ8064_SIM) += board-apq8064-all.o board-apq8064-regulator.o
-obj-$(CONFIG_MACH_APQ8064_RUMI3) += board-apq8064-all.o board-apq8064-regulator.o
+obj-$(CONFIG_MACH_APQ8064_SIM) += board-8064-all.o board-8064-regulator.o
+obj-$(CONFIG_MACH_APQ8064_RUMI3) += board-8064-all.o board-8064-regulator.o
obj-$(CONFIG_ARCH_MSM9615) += board-9615.o devices-9615.o board-9615-regulator.o
obj-$(CONFIG_ARCH_MSM9615) += clock-local.o clock-9615.o acpuclock-9615.o clock-rpm.o
obj-$(CONFIG_ARCH_MSM9615) += rpm-regulator.o rpm-regulator-9615.o
diff --git a/arch/arm/mach-msm/board-apq8064-regulator.c b/arch/arm/mach-msm/board-8064-regulator.c
similarity index 99%
rename from arch/arm/mach-msm/board-apq8064-regulator.c
rename to arch/arm/mach-msm/board-8064-regulator.c
index 90a9df1..4873258 100644
--- a/arch/arm/mach-msm/board-apq8064-regulator.c
+++ b/arch/arm/mach-msm/board-8064-regulator.c
@@ -13,7 +13,7 @@
#include <linux/regulator/pm8921-regulator.h>
-#include "board-apq8064.h"
+#include "board-8064.h"
#define VREG_CONSUMERS(_id) \
static struct regulator_consumer_supply vreg_consumers_##_id[]
diff --git a/arch/arm/mach-msm/board-apq8064-storage.c b/arch/arm/mach-msm/board-8064-storage.c
similarity index 99%
rename from arch/arm/mach-msm/board-apq8064-storage.c
rename to arch/arm/mach-msm/board-8064-storage.c
index 1d0b628..8a3b958 100644
--- a/arch/arm/mach-msm/board-apq8064-storage.c
+++ b/arch/arm/mach-msm/board-8064-storage.c
@@ -22,7 +22,7 @@
#include <mach/gpio.h>
#include <mach/gpiomux.h>
#include "devices.h"
-#include "board-apq8064.h"
+#include "board-8064.h"
/* APQ8064 has 4 SDCC controllers */
diff --git a/arch/arm/mach-msm/board-apq8064.c b/arch/arm/mach-msm/board-8064.c
similarity index 99%
rename from arch/arm/mach-msm/board-apq8064.c
rename to arch/arm/mach-msm/board-8064.c
index 2283746..6e2c044 100644
--- a/arch/arm/mach-msm/board-apq8064.c
+++ b/arch/arm/mach-msm/board-8064.c
@@ -44,7 +44,7 @@
#include <mach/dma.h>
#include "msm_watchdog.h"
-#include "board-apq8064.h"
+#include "board-8064.h"
#define MSM_PMEM_KERNEL_EBI1_SIZE 0x600000
#define MSM_PMEM_ADSP_SIZE 0x3800000
diff --git a/arch/arm/mach-msm/board-apq8064.h b/arch/arm/mach-msm/board-8064.h
similarity index 100%
rename from arch/arm/mach-msm/board-apq8064.h
rename to arch/arm/mach-msm/board-8064.h
diff --git a/arch/arm/mach-msm/board-msm8930-camera.c b/arch/arm/mach-msm/board-8930-camera.c
similarity index 99%
rename from arch/arm/mach-msm/board-msm8930-camera.c
rename to arch/arm/mach-msm/board-8930-camera.c
index b15f2f1..9161fbf 100644
--- a/arch/arm/mach-msm/board-msm8930-camera.c
+++ b/arch/arm/mach-msm/board-8930-camera.c
@@ -19,7 +19,7 @@
#include <mach/gpio.h>
#include <mach/gpiomux.h>
#include "devices.h"
-#include "board-msm8930.h"
+#include "board-8930.h"
#if (defined(CONFIG_GPIO_SX150X) || defined(CONFIG_GPIO_SX150X_MODULE)) && \
defined(CONFIG_I2C)
diff --git a/arch/arm/mach-msm/board-msm8930-display.c b/arch/arm/mach-msm/board-8930-display.c
similarity index 99%
rename from arch/arm/mach-msm/board-msm8930-display.c
rename to arch/arm/mach-msm/board-8930-display.c
index 2c2c6d4..ca21fac 100644
--- a/arch/arm/mach-msm/board-msm8930-display.c
+++ b/arch/arm/mach-msm/board-8930-display.c
@@ -22,7 +22,7 @@
#include <mach/gpiomux.h>
#include <mach/socinfo.h>
#include "devices.h"
-#include "board-msm8930.h"
+#include "board-8930.h"
#ifdef CONFIG_FB_MSM_TRIPLE_BUFFER
#define MSM_FB_PRIM_BUF_SIZE (1376 * 768 * 4 * 3) /* 4 bpp x 3 pages */
diff --git a/arch/arm/mach-msm/board-msm8930-gpiomux.c b/arch/arm/mach-msm/board-8930-gpiomux.c
similarity index 99%
rename from arch/arm/mach-msm/board-msm8930-gpiomux.c
rename to arch/arm/mach-msm/board-8930-gpiomux.c
index fc85b00..e872d64 100644
--- a/arch/arm/mach-msm/board-msm8930-gpiomux.c
+++ b/arch/arm/mach-msm/board-8930-gpiomux.c
@@ -16,7 +16,7 @@
#include <mach/gpiomux.h>
#include <mach/socinfo.h>
#include "devices.h"
-#include "board-msm8930.h"
+#include "board-8930.h"
/* The SPI configurations apply to GSBI 1*/
static struct gpiomux_setting spi_active = {
diff --git a/arch/arm/mach-msm/board-msm8930-pmic.c b/arch/arm/mach-msm/board-8930-pmic.c
similarity index 99%
rename from arch/arm/mach-msm/board-msm8930-pmic.c
rename to arch/arm/mach-msm/board-8930-pmic.c
index 82b26e4..cfb2347 100644
--- a/arch/arm/mach-msm/board-msm8930-pmic.c
+++ b/arch/arm/mach-msm/board-8930-pmic.c
@@ -21,7 +21,7 @@
#include <mach/msm_bus_board.h>
#include <mach/restart.h>
#include "devices.h"
-#include "board-msm8930.h"
+#include "board-8930.h"
struct pm8xxx_gpio_init {
unsigned gpio;
diff --git a/arch/arm/mach-msm/board-msm8930-storage.c b/arch/arm/mach-msm/board-8930-storage.c
similarity index 99%
rename from arch/arm/mach-msm/board-msm8930-storage.c
rename to arch/arm/mach-msm/board-8930-storage.c
index 58bd8e5..032d3d0 100644
--- a/arch/arm/mach-msm/board-msm8930-storage.c
+++ b/arch/arm/mach-msm/board-8930-storage.c
@@ -22,7 +22,7 @@
#include <mach/gpio.h>
#include <mach/gpiomux.h>
#include "devices.h"
-#include "board-msm8930.h"
+#include "board-8930.h"
/* MSM8960 has 5 SDCC controllers */
enum sdcc_controllers {
diff --git a/arch/arm/mach-msm/board-msm8930.c b/arch/arm/mach-msm/board-8930.c
similarity index 99%
rename from arch/arm/mach-msm/board-msm8930.c
rename to arch/arm/mach-msm/board-8930.c
index f703d39..cc020b5 100644
--- a/arch/arm/mach-msm/board-msm8930.c
+++ b/arch/arm/mach-msm/board-8930.c
@@ -81,7 +81,7 @@
#include "devices.h"
#include "devices-msm8x60.h"
#include "spm.h"
-#include "board-msm8930.h"
+#include "board-8930.h"
#include "pm.h"
#include "cpuidle.h"
#include "rpm_resources.h"
diff --git a/arch/arm/mach-msm/board-msm8930.h b/arch/arm/mach-msm/board-8930.h
similarity index 100%
rename from arch/arm/mach-msm/board-msm8930.h
rename to arch/arm/mach-msm/board-8930.h
diff --git a/arch/arm/mach-msm/board-msm8960-camera.c b/arch/arm/mach-msm/board-8960-camera.c
similarity index 99%
rename from arch/arm/mach-msm/board-msm8960-camera.c
rename to arch/arm/mach-msm/board-8960-camera.c
index a17008b..e827b2b 100644
--- a/arch/arm/mach-msm/board-msm8960-camera.c
+++ b/arch/arm/mach-msm/board-8960-camera.c
@@ -19,7 +19,7 @@
#include <mach/gpio.h>
#include <mach/gpiomux.h>
#include "devices.h"
-#include "board-msm8960.h"
+#include "board-8960.h"
#if (defined(CONFIG_GPIO_SX150X) || defined(CONFIG_GPIO_SX150X_MODULE)) && \
defined(CONFIG_I2C)
diff --git a/arch/arm/mach-msm/board-msm8960-display.c b/arch/arm/mach-msm/board-8960-display.c
similarity index 99%
rename from arch/arm/mach-msm/board-msm8960-display.c
rename to arch/arm/mach-msm/board-8960-display.c
index 1ae6c3a..ee230b3 100644
--- a/arch/arm/mach-msm/board-msm8960-display.c
+++ b/arch/arm/mach-msm/board-8960-display.c
@@ -21,7 +21,7 @@
#include <mach/gpio.h>
#include <mach/gpiomux.h>
#include "devices.h"
-#include "board-msm8960.h"
+#include "board-8960.h"
#ifdef CONFIG_FB_MSM_TRIPLE_BUFFER
#define MSM_FB_PRIM_BUF_SIZE (1376 * 768 * 4 * 3) /* 4 bpp x 3 pages */
diff --git a/arch/arm/mach-msm/board-msm8960-gpiomux.c b/arch/arm/mach-msm/board-8960-gpiomux.c
similarity index 99%
rename from arch/arm/mach-msm/board-msm8960-gpiomux.c
rename to arch/arm/mach-msm/board-8960-gpiomux.c
index 48ba6b5..9be65bb 100644
--- a/arch/arm/mach-msm/board-msm8960-gpiomux.c
+++ b/arch/arm/mach-msm/board-8960-gpiomux.c
@@ -16,7 +16,7 @@
#include <mach/gpiomux.h>
#include <mach/socinfo.h>
#include "devices.h"
-#include "board-msm8960.h"
+#include "board-8960.h"
/* The SPI configurations apply to GSBI 1*/
static struct gpiomux_setting spi_active = {
diff --git a/arch/arm/mach-msm/board-msm8960-pmic.c b/arch/arm/mach-msm/board-8960-pmic.c
similarity index 99%
rename from arch/arm/mach-msm/board-msm8960-pmic.c
rename to arch/arm/mach-msm/board-8960-pmic.c
index 298956b..44f7be6 100644
--- a/arch/arm/mach-msm/board-msm8960-pmic.c
+++ b/arch/arm/mach-msm/board-8960-pmic.c
@@ -21,7 +21,7 @@
#include <mach/msm_bus_board.h>
#include <mach/restart.h>
#include "devices.h"
-#include "board-msm8960.h"
+#include "board-8960.h"
struct pm8xxx_gpio_init {
unsigned gpio;
diff --git a/arch/arm/mach-msm/board-msm8960-regulator.c b/arch/arm/mach-msm/board-8960-regulator.c
similarity index 99%
rename from arch/arm/mach-msm/board-msm8960-regulator.c
rename to arch/arm/mach-msm/board-8960-regulator.c
index 976534e..53fe93e 100644
--- a/arch/arm/mach-msm/board-msm8960-regulator.c
+++ b/arch/arm/mach-msm/board-8960-regulator.c
@@ -15,7 +15,7 @@
#include <linux/regulator/gpio-regulator.h>
#include <mach/rpm-regulator.h>
-#include "board-msm8960.h"
+#include "board-8960.h"
#define VREG_CONSUMERS(_id) \
static struct regulator_consumer_supply vreg_consumers_##_id[]
diff --git a/arch/arm/mach-msm/board-msm8960-storage.c b/arch/arm/mach-msm/board-8960-storage.c
similarity index 99%
rename from arch/arm/mach-msm/board-msm8960-storage.c
rename to arch/arm/mach-msm/board-8960-storage.c
index 357a9d0..dfcafd4 100644
--- a/arch/arm/mach-msm/board-msm8960-storage.c
+++ b/arch/arm/mach-msm/board-8960-storage.c
@@ -22,7 +22,7 @@
#include <mach/gpio.h>
#include <mach/gpiomux.h>
#include "devices.h"
-#include "board-msm8960.h"
+#include "board-8960.h"
/* MSM8960 has 5 SDCC controllers */
enum sdcc_controllers {
diff --git a/arch/arm/mach-msm/board-msm8960.c b/arch/arm/mach-msm/board-8960.c
similarity index 99%
rename from arch/arm/mach-msm/board-msm8960.c
rename to arch/arm/mach-msm/board-8960.c
index 378c384..83fa49e 100644
--- a/arch/arm/mach-msm/board-msm8960.c
+++ b/arch/arm/mach-msm/board-8960.c
@@ -83,7 +83,7 @@
#include "devices.h"
#include "devices-msm8x60.h"
#include "spm.h"
-#include "board-msm8960.h"
+#include "board-8960.h"
#include "pm.h"
#include "cpuidle.h"
#include "rpm_resources.h"
diff --git a/arch/arm/mach-msm/board-msm8960.h b/arch/arm/mach-msm/board-8960.h
similarity index 100%
rename from arch/arm/mach-msm/board-msm8960.h
rename to arch/arm/mach-msm/board-8960.h