msm: devices: Separate and correct 8064 footswitch device list
8064 does not have GFX2D cores as 8960 did, so do not try to probe those
footswitch devices. Do, however, probe the new VCAP core that was not
present on 8960.
The MDP footswitch device on 8064 is temporarily omitted from the table
until stability issues with its integration with the display driver are
resolved.
Change-Id: I60ceaaec1f2da1c6af0f2523c2a2f6f8134ac8bc
Signed-off-by: Matt Wagantall <mattw@codeaurora.org>
diff --git a/arch/arm/mach-msm/board-8064.c b/arch/arm/mach-msm/board-8064.c
index 359befe..fbc9bf5 100644
--- a/arch/arm/mach-msm/board-8064.c
+++ b/arch/arm/mach-msm/board-8064.c
@@ -1923,8 +1923,7 @@
spi_register_board_info(spi_board_info, ARRAY_SIZE(spi_board_info));
apq8064_init_fb();
apq8064_init_gpu();
- platform_add_devices(msm_footswitch_devices,
- msm_num_footswitch_devices);
+ platform_add_devices(apq8064_fs_devices, apq8064_num_fs_devices);
apq8064_init_cam();
if (machine_is_apq8064_cdp() || machine_is_apq8064_liquid())
diff --git a/arch/arm/mach-msm/devices-8064.c b/arch/arm/mach-msm/devices-8064.c
index 6b79fab..dbca6ca 100644
--- a/arch/arm/mach-msm/devices-8064.c
+++ b/arch/arm/mach-msm/devices-8064.c
@@ -31,6 +31,7 @@
#include <linux/ion.h>
#include "clock.h"
#include "devices.h"
+#include "footswitch.h"
#include "msm_watchdog.h"
#include "rpm_stats.h"
#include "rpm_log.h"
@@ -1230,6 +1231,17 @@
.resource = msm_gss_resources,
};
+struct platform_device *apq8064_fs_devices[] = {
+ FS_8X60(FS_ROT, "fs_rot"),
+ FS_8X60(FS_IJPEG, "fs_ijpeg"),
+ FS_8X60(FS_VFE, "fs_vfe"),
+ FS_8X60(FS_VPE, "fs_vpe"),
+ FS_8X60(FS_GFX3D, "fs_gfx3d"),
+ FS_8X60(FS_VED, "fs_ved"),
+ FS_8X60(FS_VCAP, "fs_vcap"),
+};
+unsigned apq8064_num_fs_devices = ARRAY_SIZE(apq8064_fs_devices);
+
static struct clk_lookup msm_clocks_8064_dummy[] = {
CLK_DUMMY("pll2", PLL2, NULL, 0),
CLK_DUMMY("pll8", PLL8, NULL, 0),
diff --git a/arch/arm/mach-msm/devices.h b/arch/arm/mach-msm/devices.h
index 4e05cc1..43d46cd 100644
--- a/arch/arm/mach-msm/devices.h
+++ b/arch/arm/mach-msm/devices.h
@@ -241,6 +241,8 @@
extern struct platform_device *msm_footswitch_devices[];
extern unsigned msm_num_footswitch_devices;
+extern struct platform_device *apq8064_fs_devices[];
+extern unsigned apq8064_num_fs_devices;
extern struct platform_device fsm_qfp_fuse_device;