aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2011-06-15 08:21:12 -0400
committerTomi Valkeinen <tomi.valkeinen@ti.com>2011-09-30 09:16:17 -0400
commit5bc416cba15f43c799fc02727c6d6887f3e35a4e (patch)
treec53e4104537b3189d54c9f7254936e277ab096a5 /arch/arm/mach-omap2
parent4e6a0ab0f9d4c8062bd84f3fc95b175001d46ebf (diff)
OMAP: DSS2: DSI: Improve dsi_mux_pads parameters
dsi_mux_pads() needs to know about the DSI HW module and the DSI lanes used. Split the function into two, enable and disable, which take necessary arguments, and add empty implementations for both. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'arch/arm/mach-omap2')
-rw-r--r--arch/arm/mach-omap2/display.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/display.c b/arch/arm/mach-omap2/display.c
index c42df111c9d2..7c6011df80a8 100644
--- a/arch/arm/mach-omap2/display.c
+++ b/arch/arm/mach-omap2/display.c
@@ -74,6 +74,15 @@ static const struct omap_dss_hwmod_data omap4_dss_hwmod_data[] __initdata = {
74 { "dss_hdmi", "omapdss_hdmi", -1 }, 74 { "dss_hdmi", "omapdss_hdmi", -1 },
75}; 75};
76 76
77static int omap_dsi_enable_pads(int dsi_id, unsigned lane_mask)
78{
79 return 0;
80}
81
82static void omap_dsi_disable_pads(int dsi_id, unsigned lane_mask)
83{
84}
85
77int __init omap_display_init(struct omap_dss_board_info *board_data) 86int __init omap_display_init(struct omap_dss_board_info *board_data)
78{ 87{
79 int r = 0; 88 int r = 0;
@@ -96,6 +105,11 @@ int __init omap_display_init(struct omap_dss_board_info *board_data)
96 oh_count = ARRAY_SIZE(omap4_dss_hwmod_data); 105 oh_count = ARRAY_SIZE(omap4_dss_hwmod_data);
97 } 106 }
98 107
108 if (board_data->dsi_enable_pads == NULL)
109 board_data->dsi_enable_pads = omap_dsi_enable_pads;
110 if (board_data->dsi_disable_pads == NULL)
111 board_data->dsi_disable_pads = omap_dsi_disable_pads;
112
99 pdata.board_data = board_data; 113 pdata.board_data = board_data;
100 pdata.board_data->get_context_loss_count = 114 pdata.board_data->get_context_loss_count =
101 omap_pm_get_dev_context_loss_count; 115 omap_pm_get_dev_context_loss_count;