diff options
author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-03-08 05:37:58 -0500 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-04-23 03:48:03 -0400 |
commit | 62c1dcfc7451a8e42104776705a317e06a8e24a3 (patch) | |
tree | 77c152a64cef29e450e36a12f5425bd78e5ef392 | |
parent | 66f75a5d028beaf67c931435fdc3e7823125730c (diff) |
OMAPDSS: add set_min_bus_tput pointer to omapdss's platform data
omapdss driver needs to use the omap_pm_set_min_bus_tput(), so add a new
entry for that in omapdss's platform data, and set it.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: Paul Walmsley <paul@pwsan.com>
Acked-by: Kevin Hilman <khilman@ti.com>
-rw-r--r-- | arch/arm/mach-omap2/display.c | 6 | ||||
-rw-r--r-- | include/video/omapdss.h | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/display.c b/arch/arm/mach-omap2/display.c index db5a88a36c63..60cded4738a0 100644 --- a/arch/arm/mach-omap2/display.c +++ b/arch/arm/mach-omap2/display.c | |||
@@ -180,6 +180,11 @@ static void omap_dsi_disable_pads(int dsi_id, unsigned lane_mask) | |||
180 | omap4_dsi_mux_pads(dsi_id, 0); | 180 | omap4_dsi_mux_pads(dsi_id, 0); |
181 | } | 181 | } |
182 | 182 | ||
183 | static int omap_dss_set_min_bus_tput(struct device *dev, unsigned long tput) | ||
184 | { | ||
185 | return omap_pm_set_min_bus_tput(dev, OCP_INITIATOR_AGENT, tput); | ||
186 | } | ||
187 | |||
183 | int __init omap_display_init(struct omap_dss_board_info *board_data) | 188 | int __init omap_display_init(struct omap_dss_board_info *board_data) |
184 | { | 189 | { |
185 | int r = 0; | 190 | int r = 0; |
@@ -210,6 +215,7 @@ int __init omap_display_init(struct omap_dss_board_info *board_data) | |||
210 | pdata.board_data = board_data; | 215 | pdata.board_data = board_data; |
211 | pdata.board_data->get_context_loss_count = | 216 | pdata.board_data->get_context_loss_count = |
212 | omap_pm_get_dev_context_loss_count; | 217 | omap_pm_get_dev_context_loss_count; |
218 | pdata.board_data->set_min_bus_tput = omap_dss_set_min_bus_tput; | ||
213 | 219 | ||
214 | for (i = 0; i < oh_count; i++) { | 220 | for (i = 0; i < oh_count; i++) { |
215 | oh = omap_hwmod_lookup(curr_dss_hwmod[i].oh_name); | 221 | oh = omap_hwmod_lookup(curr_dss_hwmod[i].oh_name); |
diff --git a/include/video/omapdss.h b/include/video/omapdss.h index 483f67caa7ad..7aecadbb1d9c 100644 --- a/include/video/omapdss.h +++ b/include/video/omapdss.h | |||
@@ -309,6 +309,7 @@ struct omap_dss_board_info { | |||
309 | struct omap_dss_device *default_device; | 309 | struct omap_dss_device *default_device; |
310 | int (*dsi_enable_pads)(int dsi_id, unsigned lane_mask); | 310 | int (*dsi_enable_pads)(int dsi_id, unsigned lane_mask); |
311 | void (*dsi_disable_pads)(int dsi_id, unsigned lane_mask); | 311 | void (*dsi_disable_pads)(int dsi_id, unsigned lane_mask); |
312 | int (*set_min_bus_tput)(struct device *dev, unsigned long r); | ||
312 | }; | 313 | }; |
313 | 314 | ||
314 | /* Init with the board info */ | 315 | /* Init with the board info */ |