msm: footswitch-8x60: Move SoC-specific data to device files
The number of footswitch-related differences between SoCs (such as clocks
and bus ports) is large enough that it no longer makes sense to treat
them as exceptions in footswitch_probe().
Instead of using cpu_is_xxx() to manage these differences, move all
SoC-specific data to the SoC-specific device files and pass it to the
footswitch driver through platform data.
Change-Id: I30e2ec885e0340e4efec2bc5adc3fdd255cc7bb0
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 cfaa7da..f9b1e2e 100644
--- a/arch/arm/mach-msm/board-8064.c
+++ b/arch/arm/mach-msm/board-8064.c
@@ -2666,7 +2666,7 @@
}
apq8064_init_fb();
apq8064_init_gpu();
- platform_add_devices(apq8064_fs_devices, apq8064_num_fs_devices);
+ platform_add_devices(apq8064_footswitch, apq8064_num_footswitch);
apq8064_init_cam();
if (machine_is_apq8064_cdp() || machine_is_apq8064_liquid())
diff --git a/arch/arm/mach-msm/board-8930.c b/arch/arm/mach-msm/board-8930.c
index cbb36a1..6fd0f1b 100644
--- a/arch/arm/mach-msm/board-8930.c
+++ b/arch/arm/mach-msm/board-8930.c
@@ -2068,8 +2068,7 @@
msm_spm_init(msm_spm_data, ARRAY_SIZE(msm_spm_data));
msm_spm_l2_init(msm_spm_l2_data);
msm8930_init_buses();
- platform_add_devices(msm_footswitch_devices,
- msm_num_footswitch_devices);
+ platform_add_devices(msm8930_footswitch, msm8930_num_footswitch);
platform_add_devices(common_devices, ARRAY_SIZE(common_devices));
msm8930_add_vidc_device();
/*
diff --git a/arch/arm/mach-msm/board-8960.c b/arch/arm/mach-msm/board-8960.c
index 42dbbee..ade6529 100644
--- a/arch/arm/mach-msm/board-8960.c
+++ b/arch/arm/mach-msm/board-8960.c
@@ -3124,8 +3124,7 @@
msm_spm_init(msm_spm_data, ARRAY_SIZE(msm_spm_data));
msm_spm_l2_init(msm_spm_l2_data);
msm8960_init_buses();
- platform_add_devices(msm_footswitch_devices,
- msm_num_footswitch_devices);
+ platform_add_devices(msm8960_footswitch, msm8960_num_footswitch);
if (machine_is_msm8960_liquid())
platform_device_register(&msm8960_device_ext_3p3v_vreg);
if (machine_is_msm8960_cdp())
diff --git a/arch/arm/mach-msm/board-msm8x60.c b/arch/arm/mach-msm/board-msm8x60.c
index 5fc17df..6ca54ac 100644
--- a/arch/arm/mach-msm/board-msm8x60.c
+++ b/arch/arm/mach-msm/board-msm8x60.c
@@ -10315,8 +10315,8 @@
machine_is_msm8x60_fusn_ffa() || machine_is_msm8x60_dragon()) {
msm8x60_cfg_smsc911x();
if (SOCINFO_VERSION_MAJOR(socinfo_get_version()) != 1)
- platform_add_devices(msm_footswitch_devices,
- msm_num_footswitch_devices);
+ platform_add_devices(msm8660_footswitch,
+ msm8660_num_footswitch);
platform_add_devices(surf_devices,
ARRAY_SIZE(surf_devices));
diff --git a/arch/arm/mach-msm/devices-8064.c b/arch/arm/mach-msm/devices-8064.c
index b51fb83..7028546 100644
--- a/arch/arm/mach-msm/devices-8064.c
+++ b/arch/arm/mach-msm/devices-8064.c
@@ -1548,16 +1548,88 @@
.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"),
+static struct fs_driver_data gfx3d_fs_data = {
+ .clks = (struct fs_clk_data[]){
+ { .name = "core_clk", .reset_rate = 27000000 },
+ { .name = "iface_clk" },
+ { .name = "bus_clk" },
+ { 0 }
+ },
+ .bus_port0 = MSM_BUS_MASTER_GRAPHICS_3D,
+ .bus_port1 = MSM_BUS_MASTER_GRAPHICS_3D_PORT1,
};
-unsigned apq8064_num_fs_devices = ARRAY_SIZE(apq8064_fs_devices);
+
+static struct fs_driver_data ijpeg_fs_data = {
+ .clks = (struct fs_clk_data[]){
+ { .name = "core_clk" },
+ { .name = "iface_clk" },
+ { .name = "bus_clk" },
+ { 0 }
+ },
+ .bus_port0 = MSM_BUS_MASTER_JPEG_ENC,
+};
+
+static struct fs_driver_data rot_fs_data = {
+ .clks = (struct fs_clk_data[]){
+ { .name = "core_clk" },
+ { .name = "iface_clk" },
+ { .name = "bus_clk" },
+ { 0 }
+ },
+ .bus_port0 = MSM_BUS_MASTER_ROTATOR,
+};
+
+static struct fs_driver_data ved_fs_data = {
+ .clks = (struct fs_clk_data[]){
+ { .name = "core_clk" },
+ { .name = "iface_clk" },
+ { .name = "bus_clk" },
+ { 0 }
+ },
+ .bus_port0 = MSM_BUS_MASTER_VIDEO_ENC,
+ .bus_port1 = MSM_BUS_MASTER_VIDEO_DEC,
+};
+
+static struct fs_driver_data vfe_fs_data = {
+ .clks = (struct fs_clk_data[]){
+ { .name = "core_clk" },
+ { .name = "iface_clk" },
+ { .name = "bus_clk" },
+ { 0 }
+ },
+ .bus_port0 = MSM_BUS_MASTER_VFE,
+};
+
+static struct fs_driver_data vpe_fs_data = {
+ .clks = (struct fs_clk_data[]){
+ { .name = "core_clk" },
+ { .name = "iface_clk" },
+ { .name = "bus_clk" },
+ { 0 }
+ },
+ .bus_port0 = MSM_BUS_MASTER_VPE,
+};
+
+static struct fs_driver_data vcap_fs_data = {
+ .clks = (struct fs_clk_data[]){
+ { .name = "core_clk" },
+ { .name = "iface_clk" },
+ { .name = "bus_clk" },
+ { 0 },
+ },
+ .bus_port0 = MSM_BUS_MASTER_VIDEO_CAP,
+};
+
+struct platform_device *apq8064_footswitch[] __initdata = {
+ FS_8X60(FS_ROT, "fs_rot", &rot_fs_data),
+ FS_8X60(FS_IJPEG, "fs_ijpeg", &ijpeg_fs_data),
+ FS_8X60(FS_VFE, "fs_vfe", &vfe_fs_data),
+ FS_8X60(FS_VPE, "fs_vpe", &vpe_fs_data),
+ FS_8X60(FS_GFX3D, "fs_gfx3d", &gfx3d_fs_data),
+ FS_8X60(FS_VED, "fs_ved", &ved_fs_data),
+ FS_8X60(FS_VCAP, "fs_vcap", &vcap_fs_data),
+};
+unsigned apq8064_num_footswitch __initdata = ARRAY_SIZE(apq8064_footswitch);
struct msm_rpm_platform_data apq8064_rpm_data __initdata = {
.reg_base_addrs = {
diff --git a/arch/arm/mach-msm/devices-8930.c b/arch/arm/mach-msm/devices-8930.c
index ae97189..b33387a 100644
--- a/arch/arm/mach-msm/devices-8930.c
+++ b/arch/arm/mach-msm/devices-8930.c
@@ -28,6 +28,7 @@
#include "devices.h"
#include "rpm_log.h"
#include "rpm_stats.h"
+#include "footswitch.h"
#ifdef CONFIG_MSM_MPM
#include <mach/mpm.h>
@@ -352,6 +353,93 @@
.id = MSM_BUS_FAB_CPSS_FPB,
};
+static struct fs_driver_data gfx3d_fs_data = {
+ .clks = (struct fs_clk_data[]){
+ { .name = "core_clk", .reset_rate = 27000000 },
+ { .name = "iface_clk" },
+ { .name = "bus_clk" },
+ { 0 }
+ },
+ .bus_port0 = MSM_BUS_MASTER_GRAPHICS_3D,
+};
+
+static struct fs_driver_data ijpeg_fs_data = {
+ .clks = (struct fs_clk_data[]){
+ { .name = "core_clk" },
+ { .name = "iface_clk" },
+ { .name = "bus_clk" },
+ { 0 }
+ },
+ .bus_port0 = MSM_BUS_MASTER_JPEG_ENC,
+};
+
+static struct fs_driver_data mdp_fs_data = {
+ .clks = (struct fs_clk_data[]){
+ { .name = "core_clk" },
+ { .name = "iface_clk" },
+ { .name = "bus_clk" },
+ { .name = "vsync_clk" },
+ { .name = "lut_clk" },
+ { .name = "tv_src_clk" },
+ { .name = "tv_clk" },
+ { 0 }
+ },
+ .bus_port0 = MSM_BUS_MASTER_MDP_PORT0,
+ .bus_port1 = MSM_BUS_MASTER_MDP_PORT1,
+};
+
+static struct fs_driver_data rot_fs_data = {
+ .clks = (struct fs_clk_data[]){
+ { .name = "core_clk" },
+ { .name = "iface_clk" },
+ { .name = "bus_clk" },
+ { 0 }
+ },
+ .bus_port0 = MSM_BUS_MASTER_ROTATOR,
+};
+
+static struct fs_driver_data ved_fs_data = {
+ .clks = (struct fs_clk_data[]){
+ { .name = "core_clk" },
+ { .name = "iface_clk" },
+ { .name = "bus_clk" },
+ { 0 }
+ },
+ .bus_port0 = MSM_BUS_MASTER_HD_CODEC_PORT0,
+ .bus_port1 = MSM_BUS_MASTER_HD_CODEC_PORT1,
+};
+
+static struct fs_driver_data vfe_fs_data = {
+ .clks = (struct fs_clk_data[]){
+ { .name = "core_clk" },
+ { .name = "iface_clk" },
+ { .name = "bus_clk" },
+ { 0 }
+ },
+ .bus_port0 = MSM_BUS_MASTER_VFE,
+};
+
+static struct fs_driver_data vpe_fs_data = {
+ .clks = (struct fs_clk_data[]){
+ { .name = "core_clk" },
+ { .name = "iface_clk" },
+ { .name = "bus_clk" },
+ { 0 }
+ },
+ .bus_port0 = MSM_BUS_MASTER_VPE,
+};
+
+struct platform_device *msm8930_footswitch[] __initdata = {
+ FS_8X60(FS_MDP, "fs_mdp", &mdp_fs_data),
+ FS_8X60(FS_ROT, "fs_rot", &rot_fs_data),
+ FS_8X60(FS_IJPEG, "fs_ijpeg", &ijpeg_fs_data),
+ FS_8X60(FS_VFE, "fs_vfe", &vfe_fs_data),
+ FS_8X60(FS_VPE, "fs_vpe", &vpe_fs_data),
+ FS_8X60(FS_GFX3D, "fs_gfx3d", &gfx3d_fs_data),
+ FS_8X60(FS_VED, "fs_ved", &ved_fs_data),
+};
+unsigned msm8930_num_footswitch __initdata = ARRAY_SIZE(msm8930_footswitch);
+
/* MSM Video core device */
#ifdef CONFIG_MSM_BUS_SCALING
static struct msm_bus_vectors vidc_init_vectors[] = {
diff --git a/arch/arm/mach-msm/devices-8960.c b/arch/arm/mach-msm/devices-8960.c
index 7fb4b01..5200dd0 100644
--- a/arch/arm/mach-msm/devices-8960.c
+++ b/arch/arm/mach-msm/devices-8960.c
@@ -1977,19 +1977,111 @@
.id = -1,
};
-struct platform_device *msm_footswitch_devices[] = {
- FS_8X60(FS_MDP, "fs_mdp"),
- 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_GFX2D0, "fs_gfx2d0"),
- FS_8X60(FS_GFX2D1, "fs_gfx2d1"),
- FS_8X60(FS_VED, "fs_ved"),
+static struct fs_driver_data gfx2d0_fs_data = {
+ .clks = (struct fs_clk_data[]){
+ { .name = "core_clk" },
+ { .name = "iface_clk" },
+ { 0 }
+ },
+ .bus_port0 = MSM_BUS_MASTER_GRAPHICS_2D_CORE0,
};
-unsigned msm_num_footswitch_devices = ARRAY_SIZE(msm_footswitch_devices);
+static struct fs_driver_data gfx2d1_fs_data = {
+ .clks = (struct fs_clk_data[]){
+ { .name = "core_clk" },
+ { .name = "iface_clk" },
+ { 0 }
+ },
+ .bus_port0 = MSM_BUS_MASTER_GRAPHICS_2D_CORE1,
+};
+
+static struct fs_driver_data gfx3d_fs_data = {
+ .clks = (struct fs_clk_data[]){
+ { .name = "core_clk", .reset_rate = 27000000 },
+ { .name = "iface_clk" },
+ { 0 }
+ },
+ .bus_port0 = MSM_BUS_MASTER_GRAPHICS_3D,
+};
+
+static struct fs_driver_data ijpeg_fs_data = {
+ .clks = (struct fs_clk_data[]){
+ { .name = "core_clk" },
+ { .name = "iface_clk" },
+ { .name = "bus_clk" },
+ { 0 }
+ },
+ .bus_port0 = MSM_BUS_MASTER_JPEG_ENC,
+};
+
+static struct fs_driver_data mdp_fs_data = {
+ .clks = (struct fs_clk_data[]){
+ { .name = "core_clk" },
+ { .name = "iface_clk" },
+ { .name = "bus_clk" },
+ { .name = "vsync_clk" },
+ { .name = "lut_clk" },
+ { .name = "tv_src_clk" },
+ { .name = "tv_clk" },
+ { 0 }
+ },
+ .bus_port0 = MSM_BUS_MASTER_MDP_PORT0,
+ .bus_port1 = MSM_BUS_MASTER_MDP_PORT1,
+};
+
+static struct fs_driver_data rot_fs_data = {
+ .clks = (struct fs_clk_data[]){
+ { .name = "core_clk" },
+ { .name = "iface_clk" },
+ { .name = "bus_clk" },
+ { 0 }
+ },
+ .bus_port0 = MSM_BUS_MASTER_ROTATOR,
+};
+
+static struct fs_driver_data ved_fs_data = {
+ .clks = (struct fs_clk_data[]){
+ { .name = "core_clk" },
+ { .name = "iface_clk" },
+ { .name = "bus_clk" },
+ { 0 }
+ },
+ .bus_port0 = MSM_BUS_MASTER_HD_CODEC_PORT0,
+ .bus_port1 = MSM_BUS_MASTER_HD_CODEC_PORT1,
+};
+
+static struct fs_driver_data vfe_fs_data = {
+ .clks = (struct fs_clk_data[]){
+ { .name = "core_clk" },
+ { .name = "iface_clk" },
+ { .name = "bus_clk" },
+ { 0 }
+ },
+ .bus_port0 = MSM_BUS_MASTER_VFE,
+};
+
+static struct fs_driver_data vpe_fs_data = {
+ .clks = (struct fs_clk_data[]){
+ { .name = "core_clk" },
+ { .name = "iface_clk" },
+ { .name = "bus_clk" },
+ { 0 }
+ },
+ .bus_port0 = MSM_BUS_MASTER_VPE,
+};
+
+struct platform_device *msm8960_footswitch[] __initdata = {
+ FS_8X60(FS_MDP, "fs_mdp", &mdp_fs_data),
+ FS_8X60(FS_ROT, "fs_rot", &rot_fs_data),
+ FS_8X60(FS_IJPEG, "fs_ijpeg", &ijpeg_fs_data),
+ FS_8X60(FS_VFE, "fs_vfe", &vfe_fs_data),
+ FS_8X60(FS_VPE, "fs_vpe", &vpe_fs_data),
+ FS_8X60(FS_GFX3D, "fs_gfx3d", &gfx3d_fs_data),
+ FS_8X60(FS_GFX2D0, "fs_gfx2d0", &gfx2d0_fs_data),
+ FS_8X60(FS_GFX2D1, "fs_gfx2d1", &gfx2d1_fs_data),
+ FS_8X60(FS_VED, "fs_ved", &ved_fs_data),
+};
+unsigned msm8960_num_footswitch __initdata = ARRAY_SIZE(msm8960_footswitch);
#ifdef CONFIG_MSM_ROTATOR
static struct msm_bus_vectors rotator_init_vectors[] = {
diff --git a/arch/arm/mach-msm/devices-msm8x60.c b/arch/arm/mach-msm/devices-msm8x60.c
index e19beb8..7b15833 100644
--- a/arch/arm/mach-msm/devices-msm8x60.c
+++ b/arch/arm/mach-msm/devices-msm8x60.c
@@ -2562,18 +2562,112 @@
};
#endif
-struct platform_device *msm_footswitch_devices[] = {
- FS_8X60(FS_IJPEG, "fs_ijpeg"),
- FS_8X60(FS_MDP, "fs_mdp"),
- FS_8X60(FS_ROT, "fs_rot"),
- FS_8X60(FS_VED, "fs_ved"),
- FS_8X60(FS_VFE, "fs_vfe"),
- FS_8X60(FS_VPE, "fs_vpe"),
- FS_8X60(FS_GFX3D, "fs_gfx3d"),
- FS_8X60(FS_GFX2D0, "fs_gfx2d0"),
- FS_8X60(FS_GFX2D1, "fs_gfx2d1"),
+static struct fs_driver_data gfx2d0_fs_data = {
+ .clks = (struct fs_clk_data[]){
+ { .name = "core_clk" },
+ { .name = "iface_clk" },
+ { 0 }
+ },
+ .bus_port0 = MSM_BUS_MASTER_GRAPHICS_2D_CORE0,
};
-unsigned msm_num_footswitch_devices = ARRAY_SIZE(msm_footswitch_devices);
+
+static struct fs_driver_data gfx2d1_fs_data = {
+ .clks = (struct fs_clk_data[]){
+ { .name = "core_clk" },
+ { .name = "iface_clk" },
+ { 0 }
+ },
+ .bus_port0 = MSM_BUS_MASTER_GRAPHICS_2D_CORE1,
+};
+
+static struct fs_driver_data gfx3d_fs_data = {
+ .clks = (struct fs_clk_data[]){
+ { .name = "core_clk", .reset_rate = 27000000 },
+ { .name = "iface_clk" },
+ { 0 }
+ },
+ .bus_port0 = MSM_BUS_MASTER_GRAPHICS_3D,
+};
+
+static struct fs_driver_data ijpeg_fs_data = {
+ .clks = (struct fs_clk_data[]){
+ { .name = "core_clk" },
+ { .name = "iface_clk" },
+ { .name = "bus_clk" },
+ { 0 }
+ },
+ .bus_port0 = MSM_BUS_MASTER_JPEG_ENC,
+};
+
+static struct fs_driver_data mdp_fs_data = {
+ .clks = (struct fs_clk_data[]){
+ { .name = "core_clk" },
+ { .name = "iface_clk" },
+ { .name = "bus_clk" },
+ { .name = "vsync_clk" },
+ { .name = "tv_src_clk" },
+ { .name = "tv_clk" },
+ { .name = "pixel_mdp_clk" },
+ { .name = "pixel_lcdc_clk" },
+ { 0 }
+ },
+ .bus_port0 = MSM_BUS_MASTER_MDP_PORT0,
+ .bus_port1 = MSM_BUS_MASTER_MDP_PORT1,
+};
+
+static struct fs_driver_data rot_fs_data = {
+ .clks = (struct fs_clk_data[]){
+ { .name = "core_clk" },
+ { .name = "iface_clk" },
+ { .name = "bus_clk" },
+ { 0 }
+ },
+ .bus_port0 = MSM_BUS_MASTER_ROTATOR,
+};
+
+static struct fs_driver_data ved_fs_data = {
+ .clks = (struct fs_clk_data[]){
+ { .name = "core_clk" },
+ { .name = "iface_clk" },
+ { .name = "bus_clk" },
+ { 0 }
+ },
+ .bus_port0 = MSM_BUS_MASTER_HD_CODEC_PORT0,
+ .bus_port1 = MSM_BUS_MASTER_HD_CODEC_PORT1,
+};
+
+static struct fs_driver_data vfe_fs_data = {
+ .clks = (struct fs_clk_data[]){
+ { .name = "core_clk" },
+ { .name = "iface_clk" },
+ { .name = "bus_clk" },
+ { 0 }
+ },
+ .bus_port0 = MSM_BUS_MASTER_VFE,
+};
+
+static struct fs_driver_data vpe_fs_data = {
+ .clks = (struct fs_clk_data[]){
+ { .name = "core_clk" },
+ { .name = "iface_clk" },
+ { .name = "bus_clk" },
+ { 0 }
+ },
+ .bus_port0 = MSM_BUS_MASTER_VPE,
+};
+
+struct platform_device *msm8660_footswitch[] __initdata = {
+ FS_8X60(FS_IJPEG, "fs_ijpeg", &ijpeg_fs_data),
+ FS_8X60(FS_MDP, "fs_mdp", &mdp_fs_data),
+ FS_8X60(FS_ROT, "fs_rot", &rot_fs_data),
+ FS_8X60(FS_VED, "fs_ved", &ved_fs_data),
+ FS_8X60(FS_VFE, "fs_vfe", &vfe_fs_data),
+ FS_8X60(FS_VPE, "fs_vpe", &vpe_fs_data),
+ FS_8X60(FS_GFX3D, "fs_gfx3d", &gfx3d_fs_data),
+ FS_8X60(FS_GFX2D0, "fs_gfx2d0", &gfx2d0_fs_data),
+ FS_8X60(FS_GFX2D1, "fs_gfx2d1", &gfx2d1_fs_data),
+};
+unsigned msm8660_num_footswitch __initdata = ARRAY_SIZE(msm8660_footswitch);
struct msm_rpm_platform_data msm8660_rpm_data __initdata = {
.reg_base_addrs = {
diff --git a/arch/arm/mach-msm/devices.h b/arch/arm/mach-msm/devices.h
index f7f0611..e86c226 100644
--- a/arch/arm/mach-msm/devices.h
+++ b/arch/arm/mach-msm/devices.h
@@ -269,8 +269,14 @@
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 *msm8660_footswitch[];
+extern unsigned msm8660_num_footswitch;
+extern struct platform_device *msm8960_footswitch[];
+extern unsigned msm8960_num_footswitch;
+extern struct platform_device *apq8064_footswitch[];
+extern unsigned apq8064_num_footswitch;
+extern struct platform_device *msm8930_footswitch[];
+extern unsigned msm8930_num_footswitch;
extern struct platform_device fsm_qfp_fuse_device;
diff --git a/arch/arm/mach-msm/footswitch-8x60.c b/arch/arm/mach-msm/footswitch-8x60.c
index eb334b9..72361a6 100644
--- a/arch/arm/mach-msm/footswitch-8x60.c
+++ b/arch/arm/mach-msm/footswitch-8x60.c
@@ -21,10 +21,8 @@
#include <linux/regulator/machine.h>
#include <linux/clk.h>
#include <mach/msm_iomap.h>
-#include <mach/msm_bus_board.h>
#include <mach/msm_bus.h>
#include <mach/scm-io.h>
-#include <mach/socinfo.h>
#include "clock.h"
#include "footswitch.h"
@@ -51,6 +49,8 @@
#define ENABLE_BIT BIT(8)
#define RETENTION_BIT BIT(9)
+#define GFS_DELAY_CNT 31
+
#define RESET_DELAY_US 1
/* Clock rate to use if one has not previously been set. */
#define DEFAULT_RATE 27000000
@@ -62,14 +62,6 @@
*/
static DEFINE_MUTEX(claim_lock);
-struct clk_data {
- const char *name;
- struct clk *clk;
- unsigned long rate;
- unsigned long reset_rate;
- bool enabled;
-};
-
struct footswitch {
struct regulator_dev *rdev;
struct regulator_desc desc;
@@ -77,15 +69,14 @@
int bus_port0, bus_port1;
bool is_enabled;
bool is_claimed;
- struct clk_data *clk_data;
+ struct fs_clk_data *clk_data;
struct clk *core_clk;
- unsigned int gfs_delay_cnt:5;
};
static int setup_clocks(struct footswitch *fs)
{
int rc = 0;
- struct clk_data *clock;
+ struct fs_clk_data *clock;
long rate;
/*
@@ -124,7 +115,7 @@
static void restore_clocks(struct footswitch *fs)
{
- struct clk_data *clock;
+ struct fs_clk_data *clock;
/* Restore clocks to their orignal states before setup_clocks(). */
for (clock = fs->clk_data; clock->clk; clock++) {
@@ -146,7 +137,7 @@
static int footswitch_enable(struct regulator_dev *rdev)
{
struct footswitch *fs = rdev_get_drvdata(rdev);
- struct clk_data *clock;
+ struct fs_clk_data *clock;
uint32_t regval, rc = 0;
mutex_lock(&claim_lock);
@@ -232,7 +223,7 @@
static int footswitch_disable(struct regulator_dev *rdev)
{
struct footswitch *fs = rdev_get_drvdata(rdev);
- struct clk_data *clock;
+ struct fs_clk_data *clock;
uint32_t regval, rc = 0;
/* Return early if already disabled. */
@@ -308,7 +299,7 @@
static int gfx2d_footswitch_enable(struct regulator_dev *rdev)
{
struct footswitch *fs = rdev_get_drvdata(rdev);
- struct clk_data *clock;
+ struct fs_clk_data *clock;
uint32_t regval, rc = 0;
mutex_lock(&claim_lock);
@@ -384,7 +375,7 @@
static int gfx2d_footswitch_disable(struct regulator_dev *rdev)
{
struct footswitch *fs = rdev_get_drvdata(rdev);
- struct clk_data *clock;
+ struct fs_clk_data *clock;
uint32_t regval, rc = 0;
/* Return early if already disabled. */
@@ -461,108 +452,7 @@
.disable = gfx2d_footswitch_disable,
};
-/*
- * Lists of required clocks for the collapse and restore sequences.
- *
- * Order matters here. Clocks are listed in the same order as their
- * resets will be de-asserted when the core is restored. Also, rate-
- * settable clocks must be listed before any of the branches that
- * are derived from them. Otherwise, the branches may fail to enable
- * if their parent's rate is not yet set.
- */
-
-static struct clk_data gfx2d0_clks[] = {
- { .name = "core_clk" },
- { .name = "iface_clk" },
- { 0 }
-};
-
-static struct clk_data gfx2d1_clks[] = {
- { .name = "core_clk" },
- { .name = "iface_clk" },
- { 0 }
-};
-
-static struct clk_data gfx3d_8660_clks[] = {
- { .name = "core_clk", .reset_rate = 27000000 },
- { .name = "iface_clk" },
- { 0 }
-};
-
-static struct clk_data gfx3d_8064_clks[] = {
- { .name = "core_clk", .reset_rate = 27000000 },
- { .name = "iface_clk" },
- { .name = "bus_clk" },
- { 0 }
-};
-
-static struct clk_data ijpeg_clks[] = {
- { .name = "core_clk" },
- { .name = "iface_clk" },
- { .name = "bus_clk" },
- { 0 }
-};
-
-static struct clk_data mdp_8960_clks[] = {
- { .name = "core_clk" },
- { .name = "iface_clk" },
- { .name = "bus_clk" },
- { .name = "vsync_clk" },
- { .name = "lut_clk" },
- { .name = "tv_src_clk" },
- { .name = "tv_clk" },
- { 0 }
-};
-
-static struct clk_data mdp_8660_clks[] = {
- { .name = "core_clk" },
- { .name = "iface_clk" },
- { .name = "bus_clk" },
- { .name = "vsync_clk" },
- { .name = "tv_src_clk" },
- { .name = "tv_clk" },
- { .name = "pixel_mdp_clk" },
- { .name = "pixel_lcdc_clk" },
- { 0 }
-};
-
-static struct clk_data rot_clks[] = {
- { .name = "core_clk" },
- { .name = "iface_clk" },
- { .name = "bus_clk" },
- { 0 }
-};
-
-static struct clk_data ved_clks[] = {
- { .name = "core_clk" },
- { .name = "iface_clk" },
- { .name = "bus_clk" },
- { 0 }
-};
-
-static struct clk_data vfe_clks[] = {
- { .name = "core_clk" },
- { .name = "iface_clk" },
- { .name = "bus_clk" },
- { 0 }
-};
-
-static struct clk_data vpe_clks[] = {
- { .name = "core_clk" },
- { .name = "iface_clk" },
- { .name = "bus_clk" },
- { 0 }
-};
-
-static struct clk_data vcap_clks[] = {
- { .name = "core_clk" },
- { .name = "iface_clk" },
- { .name = "bus_clk" },
- { 0 }
-};
-
-#define FOOTSWITCH(_id, _name, _ops, _gfs_ctl_reg, _dc, _clk_data, \
- _bp1, _bp2) \
+#define FOOTSWITCH(_id, _name, _ops, _gfs_ctl_reg) \
[(_id)] = { \
.desc = { \
.id = (_id), \
@@ -572,51 +462,26 @@
.owner = THIS_MODULE, \
}, \
.gfs_ctl_reg = (_gfs_ctl_reg), \
- .gfs_delay_cnt = (_dc), \
- .clk_data = (_clk_data), \
- .bus_port0 = (_bp1), \
- .bus_port1 = (_bp2), \
}
static struct footswitch footswitches[] = {
- FOOTSWITCH(FS_GFX2D0, "fs_gfx2d0", &gfx2d_fs_ops,
- GFX2D0_GFS_CTL_REG, 31, gfx2d0_clks,
- MSM_BUS_MASTER_GRAPHICS_2D_CORE0, 0),
- FOOTSWITCH(FS_GFX2D1, "fs_gfx2d1", &gfx2d_fs_ops,
- GFX2D1_GFS_CTL_REG, 31, gfx2d1_clks,
- MSM_BUS_MASTER_GRAPHICS_2D_CORE1, 0),
- FOOTSWITCH(FS_GFX3D, "fs_gfx3d", &standard_fs_ops,
- GFX3D_GFS_CTL_REG, 31, gfx3d_8660_clks,
- MSM_BUS_MASTER_GRAPHICS_3D, 0),
- FOOTSWITCH(FS_IJPEG, "fs_ijpeg", &standard_fs_ops,
- GEMINI_GFS_CTL_REG, 31, ijpeg_clks,
- MSM_BUS_MASTER_JPEG_ENC, 0),
- FOOTSWITCH(FS_MDP, "fs_mdp", &standard_fs_ops,
- MDP_GFS_CTL_REG, 31, NULL,
- MSM_BUS_MASTER_MDP_PORT0,
- MSM_BUS_MASTER_MDP_PORT1),
- FOOTSWITCH(FS_ROT, "fs_rot", &standard_fs_ops,
- ROT_GFS_CTL_REG, 31, rot_clks,
- MSM_BUS_MASTER_ROTATOR, 0),
- FOOTSWITCH(FS_VED, "fs_ved", &standard_fs_ops,
- VED_GFS_CTL_REG, 31, ved_clks,
- MSM_BUS_MASTER_HD_CODEC_PORT0,
- MSM_BUS_MASTER_HD_CODEC_PORT1),
- FOOTSWITCH(FS_VFE, "fs_vfe", &standard_fs_ops,
- VFE_GFS_CTL_REG, 31, vfe_clks,
- MSM_BUS_MASTER_VFE, 0),
- FOOTSWITCH(FS_VPE, "fs_vpe", &standard_fs_ops,
- VPE_GFS_CTL_REG, 31, vpe_clks,
- MSM_BUS_MASTER_VPE, 0),
- FOOTSWITCH(FS_VCAP, "fs_vcap", &standard_fs_ops,
- VCAP_GFS_CTL_REG, 31, vcap_clks,
- MSM_BUS_MASTER_VIDEO_CAP, 0),
+ FOOTSWITCH(FS_GFX2D0, "fs_gfx2d0", &gfx2d_fs_ops, GFX2D0_GFS_CTL_REG),
+ FOOTSWITCH(FS_GFX2D1, "fs_gfx2d1", &gfx2d_fs_ops, GFX2D1_GFS_CTL_REG),
+ FOOTSWITCH(FS_GFX3D, "fs_gfx3d", &standard_fs_ops, GFX3D_GFS_CTL_REG),
+ FOOTSWITCH(FS_IJPEG, "fs_ijpeg", &standard_fs_ops, GEMINI_GFS_CTL_REG),
+ FOOTSWITCH(FS_MDP, "fs_mdp", &standard_fs_ops, MDP_GFS_CTL_REG),
+ FOOTSWITCH(FS_ROT, "fs_rot", &standard_fs_ops, ROT_GFS_CTL_REG),
+ FOOTSWITCH(FS_VED, "fs_ved", &standard_fs_ops, VED_GFS_CTL_REG),
+ FOOTSWITCH(FS_VFE, "fs_vfe", &standard_fs_ops, VFE_GFS_CTL_REG),
+ FOOTSWITCH(FS_VPE, "fs_vpe", &standard_fs_ops, VPE_GFS_CTL_REG),
+ FOOTSWITCH(FS_VCAP, "fs_vcap", &standard_fs_ops, VCAP_GFS_CTL_REG),
};
static int footswitch_probe(struct platform_device *pdev)
{
struct footswitch *fs;
struct regulator_init_data *init_data;
- struct clk_data *clock;
+ struct fs_driver_data *driver_data;
+ struct fs_clk_data *clock;
uint32_t regval, rc = 0;
if (pdev == NULL)
@@ -625,29 +490,12 @@
if (pdev->id >= MAX_FS)
return -ENODEV;
- fs = &footswitches[pdev->id];
init_data = pdev->dev.platform_data;
-
- if (pdev->id == FS_MDP) {
- if (cpu_is_msm8960() || cpu_is_msm8930() || cpu_is_apq8064())
- fs->clk_data = mdp_8960_clks;
- else
- fs->clk_data = mdp_8660_clks;
- } else if (pdev->id == FS_GFX3D) {
- if (cpu_is_apq8064()) {
- fs->clk_data = gfx3d_8064_clks;
- fs->bus_port1 = MSM_BUS_MASTER_GRAPHICS_3D_PORT1;
- } else if (cpu_is_msm8930()) {
- fs->clk_data = gfx3d_8064_clks;
- } else {
- fs->clk_data = gfx3d_8660_clks;
- }
- } else if (pdev->id == FS_VED) {
- if (cpu_is_apq8064()) {
- fs->bus_port0 = MSM_BUS_MASTER_VIDEO_ENC;
- fs->bus_port1 = MSM_BUS_MASTER_VIDEO_DEC;
- }
- }
+ driver_data = init_data->driver_data;
+ fs = &footswitches[pdev->id];
+ fs->clk_data = driver_data->clks;
+ fs->bus_port0 = driver_data->bus_port0;
+ fs->bus_port1 = driver_data->bus_port1;
for (clock = fs->clk_data; clock->name; clock++) {
clock->clk = clk_get(&pdev->dev, clock->name);
@@ -667,7 +515,7 @@
* clear so disabling the footswitch will power-collapse the core.
*/
regval = readl_relaxed(fs->gfs_ctl_reg);
- regval |= fs->gfs_delay_cnt;
+ regval |= GFS_DELAY_CNT;
regval &= ~RETENTION_BIT;
writel_relaxed(regval, fs->gfs_ctl_reg);
@@ -692,7 +540,7 @@
static int __devexit footswitch_remove(struct platform_device *pdev)
{
struct footswitch *fs = &footswitches[pdev->id];
- struct clk_data *clock;
+ struct fs_clk_data *clock;
for (clock = fs->clk_data; clock->clk; clock++)
clk_put(clock->clk);
diff --git a/arch/arm/mach-msm/footswitch.h b/arch/arm/mach-msm/footswitch.h
index 4882ff0..4f179bc 100644
--- a/arch/arm/mach-msm/footswitch.h
+++ b/arch/arm/mach-msm/footswitch.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2011 Code Aurora Forum. All rights reserved.
+/* Copyright (c) 2010-2012 Code Aurora Forum. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -30,7 +30,20 @@
#define FS_VCAP 10
#define MAX_FS 11
-#define FS_GENERIC(_drv_name, _id, _name) (&(struct platform_device){ \
+struct fs_clk_data {
+ const char *name;
+ struct clk *clk;
+ unsigned long rate;
+ unsigned long reset_rate;
+ bool enabled;
+};
+
+struct fs_driver_data {
+ int bus_port0, bus_port1;
+ struct fs_clk_data *clks;
+};
+
+#define FS_GENERIC(_drv_name, _id, _name, _data) (&(struct platform_device){ \
.name = (_drv_name), \
.id = (_id), \
.dev = { \
@@ -43,10 +56,13 @@
.consumer_supplies = \
&(struct regulator_consumer_supply) \
REGULATOR_SUPPLY((_name), NULL), \
+ .driver_data = (_data), \
} \
}, \
})
-#define FS_PCOM(_id, _name) FS_GENERIC("footswitch-pcom", (_id), (_name))
-#define FS_8X60(_id, _name) FS_GENERIC("footswitch-8x60", (_id), (_name))
+#define FS_PCOM(_id, _name) \
+ FS_GENERIC("footswitch-pcom", (_id), (_name), NULL)
+#define FS_8X60(_id, _name, _data) \
+ FS_GENERIC("footswitch-8x60", (_id), (_name), (_data))
#endif