|
@@ -189,11 +189,6 @@ static struct {
|
|
|
struct omapfb_color_key color_key;
|
|
|
} dispc;
|
|
|
|
|
|
-static struct platform_device omapdss_device = {
|
|
|
- .name = "omapdss",
|
|
|
- .id = -1,
|
|
|
-};
|
|
|
-
|
|
|
static void enable_lcd_clocks(int enable);
|
|
|
|
|
|
static void inline dispc_write_reg(int idx, u32 val)
|
|
@@ -920,20 +915,20 @@ static irqreturn_t omap_dispc_irq_handler(int irq, void *dev)
|
|
|
|
|
|
static int get_dss_clocks(void)
|
|
|
{
|
|
|
- dispc.dss_ick = clk_get(&omapdss_device.dev, "ick");
|
|
|
+ dispc.dss_ick = clk_get(&dispc.fbdev->dssdev->dev, "ick");
|
|
|
if (IS_ERR(dispc.dss_ick)) {
|
|
|
dev_err(dispc.fbdev->dev, "can't get ick\n");
|
|
|
return PTR_ERR(dispc.dss_ick);
|
|
|
}
|
|
|
|
|
|
- dispc.dss1_fck = clk_get(&omapdss_device.dev, "dss1_fck");
|
|
|
+ dispc.dss1_fck = clk_get(&dispc.fbdev->dssdev->dev, "dss1_fck");
|
|
|
if (IS_ERR(dispc.dss1_fck)) {
|
|
|
dev_err(dispc.fbdev->dev, "can't get dss1_fck\n");
|
|
|
clk_put(dispc.dss_ick);
|
|
|
return PTR_ERR(dispc.dss1_fck);
|
|
|
}
|
|
|
|
|
|
- dispc.dss_54m_fck = clk_get(&omapdss_device.dev, "tv_fck");
|
|
|
+ dispc.dss_54m_fck = clk_get(&dispc.fbdev->dssdev->dev, "tv_fck");
|
|
|
if (IS_ERR(dispc.dss_54m_fck)) {
|
|
|
dev_err(dispc.fbdev->dev, "can't get tv_fck\n");
|
|
|
clk_put(dispc.dss_ick);
|
|
@@ -1385,12 +1380,6 @@ static int omap_dispc_init(struct omapfb_device *fbdev, int ext_mode,
|
|
|
int skip_init = 0;
|
|
|
int i;
|
|
|
|
|
|
- r = platform_device_register(&omapdss_device);
|
|
|
- if (r) {
|
|
|
- dev_err(fbdev->dev, "can't register omapdss device\n");
|
|
|
- return r;
|
|
|
- }
|
|
|
-
|
|
|
memset(&dispc, 0, sizeof(dispc));
|
|
|
|
|
|
dispc.base = ioremap(DISPC_BASE, SZ_1K);
|
|
@@ -1534,7 +1523,6 @@ static void omap_dispc_cleanup(void)
|
|
|
free_irq(INT_24XX_DSS_IRQ, dispc.fbdev);
|
|
|
put_dss_clocks();
|
|
|
iounmap(dispc.base);
|
|
|
- platform_device_unregister(&omapdss_device);
|
|
|
}
|
|
|
|
|
|
const struct lcd_ctrl omap2_int_ctrl = {
|