msm_fb: display: Add DTV bus scaling support for 8960
Signed-off-by: Ravishangar Kalyanam <rkalya@codeaurora.org>
diff --git a/arch/arm/mach-msm/board-msm8960.c b/arch/arm/mach-msm/board-msm8960.c
index b7c7730..3b3fc41 100644
--- a/arch/arm/mach-msm/board-msm8960.c
+++ b/arch/arm/mach-msm/board-msm8960.c
@@ -1137,21 +1137,20 @@
#ifdef CONFIG_MSM_BUS_SCALING
static struct msm_bus_vectors mdp_init_vectors[] = {
- /* For now, 0th array entry is reserved.
- * Please leave 0 as is and don't use it
- */
{
.src = MSM_BUS_MASTER_MDP_PORT0,
.dst = MSM_BUS_SLAVE_EBI_CH0,
.ab = 0,
.ib = 0,
},
- /* Master and slaves can be from different fabrics */
+};
+
+static struct msm_bus_vectors mdp_ui_vectors[] = {
{
.src = MSM_BUS_MASTER_MDP_PORT0,
.dst = MSM_BUS_SLAVE_EBI_CH0,
- .ab = 0,
- .ib = 0,
+ .ab = 216000000 * 2,
+ .ib = 270000000 * 2,
},
};
@@ -1160,14 +1159,8 @@
{
.src = MSM_BUS_MASTER_MDP_PORT0,
.dst = MSM_BUS_SLAVE_EBI_CH0,
- .ab = 175110000,
- .ib = 218887500,
- },
- {
- .src = MSM_BUS_MASTER_MDP_PORT0,
- .dst = MSM_BUS_SLAVE_EBI_CH0,
- .ab = 175110000,
- .ib = 218887500,
+ .ab = 216000000 * 2,
+ .ib = 270000000 * 2,
},
};
@@ -1176,15 +1169,8 @@
{
.src = MSM_BUS_MASTER_MDP_PORT0,
.dst = MSM_BUS_SLAVE_EBI_CH0,
- .ab = 230400000,
- .ib = 288000000,
- },
- /* Master and slaves can be from different fabrics */
- {
- .src = MSM_BUS_MASTER_MDP_PORT0,
- .dst = MSM_BUS_SLAVE_EBI_CH0,
- .ab = 230400000,
- .ib = 288000000,
+ .ab = 230400000 * 2,
+ .ib = 288000000 * 2,
},
};
@@ -1193,32 +1179,8 @@
{
.src = MSM_BUS_MASTER_MDP_PORT0,
.dst = MSM_BUS_SLAVE_EBI_CH0,
- .ab = 334080000,
- .ib = 417600000,
- },
- /* Master and slaves can be from different fabrics */
- {
- .src = MSM_BUS_MASTER_MDP_PORT0,
- .dst = MSM_BUS_SLAVE_EBI_CH0,
- .ab = 334080000,
- .ib = 417600000,
- },
-};
-
-static struct msm_bus_vectors mdp_rgb_vectors[] = {
- /* RGB playing on VG or RGB pipe, might be on EBI */
- {
- .src = MSM_BUS_MASTER_MDP_PORT0,
- .dst = MSM_BUS_SLAVE_EBI_CH0,
- .ab = 334080000,
- .ib = 417600000,
- },
- /* FB on EBI, request for EBI too*/
- {
- .src = MSM_BUS_MASTER_MDP_PORT0,
- .dst = MSM_BUS_SLAVE_EBI_CH0,
- .ab = 334080000,
- .ib = 417600000,
+ .ab = 334080000 * 2,
+ .ib = 417600000 * 2,
},
};
@@ -1228,6 +1190,14 @@
mdp_init_vectors,
},
{
+ ARRAY_SIZE(mdp_ui_vectors),
+ mdp_ui_vectors,
+ },
+ {
+ ARRAY_SIZE(mdp_ui_vectors),
+ mdp_ui_vectors,
+ },
+ {
ARRAY_SIZE(mdp_vga_vectors),
mdp_vga_vectors,
},
@@ -1239,10 +1209,6 @@
ARRAY_SIZE(mdp_1080p_vectors),
mdp_1080p_vectors,
},
- {
- ARRAY_SIZE(mdp_rgb_vectors),
- mdp_rgb_vectors,
- },
};
static struct msm_bus_scale_pdata mdp_bus_scale_pdata = {
@@ -1329,6 +1295,44 @@
};
#endif /* CONFIG_FB_MSM_HDMI_MSM_PANEL */
+#ifdef CONFIG_MSM_BUS_SCALING
+static struct msm_bus_vectors dtv_bus_init_vectors[] = {
+ {
+ .src = MSM_BUS_MASTER_MDP_PORT0,
+ .dst = MSM_BUS_SLAVE_EBI_CH0,
+ .ab = 0,
+ .ib = 0,
+ },
+};
+static struct msm_bus_vectors dtv_bus_def_vectors[] = {
+ {
+ .src = MSM_BUS_MASTER_MDP_PORT0,
+ .dst = MSM_BUS_SLAVE_EBI_CH0,
+ .ab = 566092800 * 2,
+ .ib = 707616000 * 2,
+ },
+};
+static struct msm_bus_paths dtv_bus_scale_usecases[] = {
+ {
+ ARRAY_SIZE(dtv_bus_init_vectors),
+ dtv_bus_init_vectors,
+ },
+ {
+ ARRAY_SIZE(dtv_bus_def_vectors),
+ dtv_bus_def_vectors,
+ },
+};
+static struct msm_bus_scale_pdata dtv_bus_scale_pdata = {
+ dtv_bus_scale_usecases,
+ ARRAY_SIZE(dtv_bus_scale_usecases),
+ .name = "dtv",
+};
+
+static struct lcdc_platform_data dtv_pdata = {
+ .bus_scale_table = &dtv_bus_scale_pdata,
+};
+#endif
+
static void __init msm_fb_add_devices(void)
{
if (machine_is_msm8x60_rumi3()) {
@@ -1337,6 +1341,9 @@
} else
msm_fb_register_device("mdp", &mdp_pdata);
msm_fb_register_device("mipi_dsi", &mipi_dsi_pdata);
+#ifdef CONFIG_MSM_BUS_SCALING
+ msm_fb_register_device("dtv", &dtv_pdata);
+#endif
}
#ifdef CONFIG_FB_MSM_HDMI_MSM_PANEL