diff options
author | Tony Lindgren <tony@atomide.com> | 2012-03-29 13:05:37 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-03-29 13:05:37 -0400 |
commit | a2cb960f171228e17a28ff734289be60b75417c7 (patch) | |
tree | 84bbe5acf032d197e72578486042158ac422ceb9 /arch | |
parent | 335aece5c502672fd0eb26ede5427ab14f4f7948 (diff) | |
parent | e8a30b251bcf1999bea1726b3fc7ae186f551a6b (diff) |
Merge branch 'fix-dss-mux' into fixes
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-omap2/display.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/display.c b/arch/arm/mach-omap2/display.c index 9706c648bc19..db5a88a36c63 100644 --- a/arch/arm/mach-omap2/display.c +++ b/arch/arm/mach-omap2/display.c | |||
@@ -99,7 +99,7 @@ static const struct omap_dss_hwmod_data omap4_dss_hwmod_data[] __initdata = { | |||
99 | { "dss_hdmi", "omapdss_hdmi", -1 }, | 99 | { "dss_hdmi", "omapdss_hdmi", -1 }, |
100 | }; | 100 | }; |
101 | 101 | ||
102 | static void omap4_hdmi_mux_pads(enum omap_hdmi_flags flags) | 102 | static void __init omap4_hdmi_mux_pads(enum omap_hdmi_flags flags) |
103 | { | 103 | { |
104 | u32 reg; | 104 | u32 reg; |
105 | u16 control_i2c_1; | 105 | u16 control_i2c_1; |
@@ -125,7 +125,7 @@ static void omap4_hdmi_mux_pads(enum omap_hdmi_flags flags) | |||
125 | } | 125 | } |
126 | } | 126 | } |
127 | 127 | ||
128 | static int __init omap4_dsi_mux_pads(int dsi_id, unsigned lanes) | 128 | static int omap4_dsi_mux_pads(int dsi_id, unsigned lanes) |
129 | { | 129 | { |
130 | u32 enable_mask, enable_shift; | 130 | u32 enable_mask, enable_shift; |
131 | u32 pipd_mask, pipd_shift; | 131 | u32 pipd_mask, pipd_shift; |
@@ -166,7 +166,7 @@ int __init omap_hdmi_init(enum omap_hdmi_flags flags) | |||
166 | return 0; | 166 | return 0; |
167 | } | 167 | } |
168 | 168 | ||
169 | static int __init omap_dsi_enable_pads(int dsi_id, unsigned lane_mask) | 169 | static int omap_dsi_enable_pads(int dsi_id, unsigned lane_mask) |
170 | { | 170 | { |
171 | if (cpu_is_omap44xx()) | 171 | if (cpu_is_omap44xx()) |
172 | return omap4_dsi_mux_pads(dsi_id, lane_mask); | 172 | return omap4_dsi_mux_pads(dsi_id, lane_mask); |
@@ -174,7 +174,7 @@ static int __init omap_dsi_enable_pads(int dsi_id, unsigned lane_mask) | |||
174 | return 0; | 174 | return 0; |
175 | } | 175 | } |
176 | 176 | ||
177 | static void __init omap_dsi_disable_pads(int dsi_id, unsigned lane_mask) | 177 | static void omap_dsi_disable_pads(int dsi_id, unsigned lane_mask) |
178 | { | 178 | { |
179 | if (cpu_is_omap44xx()) | 179 | if (cpu_is_omap44xx()) |
180 | omap4_dsi_mux_pads(dsi_id, 0); | 180 | omap4_dsi_mux_pads(dsi_id, 0); |