mirror of
https://github.com/torvalds/linux.git
synced 2026-05-30 01:53:29 +02:00
fbdev: omapfb: Remove some deadcode
commit f76ee892a9 ("omapfb: copy omapdss & displays for omapfb")
took a copy of the omapdrm code into omapfb, however at that point
a couple of functions were already unused at that point.
Remove dispc_mgr_get_clock_div() and dispc_enable_fifomerge() from
the omapfb copy.
Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org>
Signed-off-by: Helge Deller <deller@gmx.de>
This commit is contained in:
parent
f89d17ae2a
commit
8d7493133b
|
|
@ -1230,17 +1230,6 @@ void dispc_ovl_set_fifo_threshold(enum omap_plane plane, u32 low, u32 high)
|
|||
dispc_write_reg(DISPC_OVL_PRELOAD(plane), min(high, 0xfffu));
|
||||
}
|
||||
|
||||
void dispc_enable_fifomerge(bool enable)
|
||||
{
|
||||
if (!dss_has_feature(FEAT_FIFO_MERGE)) {
|
||||
WARN_ON(enable);
|
||||
return;
|
||||
}
|
||||
|
||||
DSSDBG("FIFO merge %s\n", enable ? "enabled" : "disabled");
|
||||
REG_FLD_MOD(DISPC_CONFIG, enable ? 1 : 0, 14, 14);
|
||||
}
|
||||
|
||||
void dispc_ovl_compute_fifo_thresholds(enum omap_plane plane,
|
||||
u32 *fifo_low, u32 *fifo_high, bool use_fifomerge,
|
||||
bool manual_update)
|
||||
|
|
@ -3656,22 +3645,6 @@ void dispc_mgr_set_clock_div(enum omap_channel channel,
|
|||
dispc_mgr_set_lcd_divisor(channel, cinfo->lck_div, cinfo->pck_div);
|
||||
}
|
||||
|
||||
int dispc_mgr_get_clock_div(enum omap_channel channel,
|
||||
struct dispc_clock_info *cinfo)
|
||||
{
|
||||
unsigned long fck;
|
||||
|
||||
fck = dispc_fclk_rate();
|
||||
|
||||
cinfo->lck_div = REG_GET(DISPC_DIVISORo(channel), 23, 16);
|
||||
cinfo->pck_div = REG_GET(DISPC_DIVISORo(channel), 7, 0);
|
||||
|
||||
cinfo->lck = fck / cinfo->lck_div;
|
||||
cinfo->pck = cinfo->lck / cinfo->pck_div;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
u32 dispc_read_irqstatus(void)
|
||||
{
|
||||
return dispc_read_reg(DISPC_IRQSTATUS);
|
||||
|
|
|
|||
|
|
@ -366,7 +366,6 @@ void dispc_disable_sidle(void);
|
|||
|
||||
void dispc_lcd_enable_signal(bool enable);
|
||||
void dispc_pck_free_enable(bool enable);
|
||||
void dispc_enable_fifomerge(bool enable);
|
||||
void dispc_enable_gamma_table(bool enable);
|
||||
|
||||
typedef bool (*dispc_div_calc_func)(int lckd, int pckd, unsigned long lck,
|
||||
|
|
@ -388,8 +387,6 @@ void dispc_ovl_compute_fifo_thresholds(enum omap_plane plane,
|
|||
|
||||
void dispc_mgr_set_clock_div(enum omap_channel channel,
|
||||
const struct dispc_clock_info *cinfo);
|
||||
int dispc_mgr_get_clock_div(enum omap_channel channel,
|
||||
struct dispc_clock_info *cinfo);
|
||||
void dispc_set_tv_pclk(unsigned long pclk);
|
||||
|
||||
u32 dispc_read_irqstatus(void);
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user