Signed-off-by: Imre Deak <imre.deak@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
return __raw_readl(rfbi.base + idx);
}
return __raw_readl(rfbi.base + idx);
}
-static int ns_to_dss_ticks(int time)
+static int ns_to_l4_ticks(int time)
{
unsigned long tick_ps;
int ret;
{
unsigned long tick_ps;
int ret;
static void print_timings(void)
{
u32 l;
static void print_timings(void)
{
u32 l;
"ACCESSTIME %d\n",
(l & 0x3f), (l >> 6) & 0x3f, (l >> 12) & 0x3f, (l >> 22) & 0x3f);
}
"ACCESSTIME %d\n",
(l & 0x3f), (l >> 6) & 0x3f, (l >> 12) & 0x3f, (l >> 22) & 0x3f);
}
static void rfbi_set_timings(const struct extif_timings *t)
{
static void rfbi_set_timings(const struct extif_timings *t)
{
BUG_ON(callback == NULL);
BUG_ON(callback == NULL);
- dispc_set_lcd_size(width, height);
+ omap_dispc_set_lcd_size(width, height);
rfbi.lcdc_callback = callback;
rfbi.lcdc_callback_data = data;
rfbi.lcdc_callback = callback;
rfbi.lcdc_callback_data = data;
/* Enable, Internal trigger */
rfbi_write_reg(RFBI_CONTROL, w | (1 << 0) | (1 << 4));
/* Enable, Internal trigger */
rfbi_write_reg(RFBI_CONTROL, w | (1 << 0) | (1 << 4));
- dispc_enable_lcd_out(1);
+ omap_dispc_enable_lcd_out(1);
}
static inline void _stop_transfer(void)
}
static inline void _stop_transfer(void)
l = (0x01 << 2);
rfbi_write_reg(RFBI_CONTROL, l);
l = (0x01 << 2);
rfbi_write_reg(RFBI_CONTROL, l);
- if ((r = dispc_request_irq(rfbi_dma_callback, NULL)) < 0) {
+ if ((r = omap_dispc_request_irq(rfbi_dma_callback, NULL)) < 0) {
pr_err("can't get DISPC irq\n");
return r;
}
pr_err("can't get DISPC irq\n");
return r;
}
static void rfbi_cleanup(void)
{
static void rfbi_cleanup(void)
{
}
struct lcd_ctrl_extif rfbi_extif = {
}
struct lcd_ctrl_extif rfbi_extif = {
struct lcd_ctrl_extif {
int (*init) (void);
void (*cleanup) (void);
struct lcd_ctrl_extif {
int (*init) (void);
void (*cleanup) (void);
- void (*set_timings) (struct extif_timings timings);
+ void (*set_timings) (const struct extif_timings *timings);
void (*write_command) (u32 cmd);
u32 (*read_data) (void);
void (*write_data) (u32 data);
void (*write_command) (u32 cmd);
u32 (*read_data) (void);
void (*write_data) (u32 data);