source: trunk/target/linux/omap24xx/patches-2.6.37/700-video-omap.patch @ 23888

Last change on this file since 23888 was 23888, checked in by mb, 6 years ago

omap24xx: Add linux 2.6.37 config/patches

File size: 6.0 KB
  • drivers/video/omap/dispc.c

    old new  
    190190        struct omapfb_color_key color_key; 
    191191} dispc; 
    192192 
     193struct platform_device omapdss_device = { 
     194        .name           = "omapdss", 
     195        .id             = -1, 
     196}; 
     197 
    193198static void enable_lcd_clocks(int enable); 
    194199 
    195200static void inline dispc_write_reg(int idx, u32 val) 
     
    916921 
    917922static int get_dss_clocks(void) 
    918923{ 
    919         dispc.dss_ick = clk_get(&dispc.fbdev->dssdev->dev, "ick"); 
     924        dispc.dss_ick = clk_get(&omapdss_device.dev, "ick"); 
    920925        if (IS_ERR(dispc.dss_ick)) { 
    921926                dev_err(dispc.fbdev->dev, "can't get ick\n"); 
    922927                return PTR_ERR(dispc.dss_ick); 
    923928        } 
    924929 
    925         dispc.dss1_fck = clk_get(&dispc.fbdev->dssdev->dev, "dss1_fck"); 
     930        dispc.dss1_fck = clk_get(&omapdss_device.dev, "dss1_fck"); 
    926931        if (IS_ERR(dispc.dss1_fck)) { 
    927932                dev_err(dispc.fbdev->dev, "can't get dss1_fck\n"); 
    928933                clk_put(dispc.dss_ick); 
    929934                return PTR_ERR(dispc.dss1_fck); 
    930935        } 
    931936 
    932         dispc.dss_54m_fck = clk_get(&dispc.fbdev->dssdev->dev, "tv_fck"); 
     937        dispc.dss_54m_fck = clk_get(&omapdss_device.dev, "tv_fck"); 
    933938        if (IS_ERR(dispc.dss_54m_fck)) { 
    934939                dev_err(dispc.fbdev->dev, "can't get tv_fck\n"); 
    935940                clk_put(dispc.dss_ick); 
     
    13811386        int skip_init = 0; 
    13821387        int i; 
    13831388 
     1389        r = platform_device_register(&omapdss_device); 
     1390        if (r) { 
     1391                dev_err(fbdev->dev, "can't register omapdss device\n"); 
     1392                return r; 
     1393        } 
     1394 
    13841395        memset(&dispc, 0, sizeof(dispc)); 
    13851396 
    13861397        dispc.base = ioremap(DISPC_BASE, SZ_1K); 
     
    15241535        free_irq(INT_24XX_DSS_IRQ, dispc.fbdev); 
    15251536        put_dss_clocks(); 
    15261537        iounmap(dispc.base); 
     1538        platform_device_unregister(&omapdss_device); 
    15271539} 
    15281540 
    15291541const struct lcd_ctrl omap2_int_ctrl = { 
  • drivers/video/omap/lcd_htcherald.c

    old new  
    115115        }, 
    116116}; 
    117117 
    118 static int __init htcherald_panel_drv_init(void) 
     118static int htcherald_panel_drv_init(void) 
    119119{ 
    120120        return platform_driver_register(&htcherald_panel_driver); 
    121121} 
    122122 
    123 static void __exit htcherald_panel_drv_cleanup(void) 
     123static void htcherald_panel_drv_cleanup(void) 
    124124{ 
    125125        platform_driver_unregister(&htcherald_panel_driver); 
    126126} 
  • drivers/video/omap/lcd_mipid.c

    old new  
    551551                md->esd_check = ls041y3_esd_check; 
    552552                break; 
    553553        default: 
    554                 md->panel.name = "unknown"; 
    555                 dev_err(&md->spi->dev, "invalid display ID\n"); 
    556                 return -ENODEV; 
     554                dev_err(&md->spi->dev, "FIXME: LCD panel detection failed! ID: %02x%02x%02x\n", display_id[0], display_id[1], display_id[2]); 
     555                md->panel.name = "ls041y3"; 
     556                md->esd_check = ls041y3_esd_check; 
    557557        } 
    558558 
    559559        md->revision = display_id[1]; 
  • drivers/video/omap/omapfb.h

    old new  
    203203 
    204204        struct omapfb_mem_desc          mem_desc; 
    205205        struct fb_info                  *fb_info[OMAPFB_PLANE_NUM]; 
    206  
    207         struct platform_device  *dssdev;        /* dummy dev for clocks */ 
    208206}; 
    209207 
    210208#ifdef CONFIG_ARCH_OMAP1 
     
    226224                                       void (*callback)(void *), 
    227225                                       void *callback_data); 
    228226 
     227extern struct platform_device omapdss_device; 
     228 
    229229#endif /* __OMAPFB_H */ 
  • drivers/video/omap/omapfb_main.c

    old new  
    8484        { 1 << OMAPFB_COLOR_YUY422,     "YUY422", }, 
    8585}; 
    8686 
    87 static void omapdss_release(struct device *dev) 
    88 { 
    89 } 
    90  
    91 /* dummy device for clocks */ 
    92 static struct platform_device omapdss_device = { 
    93         .name           = "omapdss", 
    94         .id             = -1, 
    95         .dev            = { 
    96                 .release = omapdss_release, 
    97         }, 
    98 }; 
    99  
    10087/* 
    10188 * --------------------------------------------------------------------------- 
    10289 * LCD panel 
     
    17151702 
    17161703        fbdev->dev = &pdev->dev; 
    17171704        fbdev->panel = panel; 
    1718         fbdev->dssdev = &omapdss_device; 
    17191705        platform_set_drvdata(pdev, fbdev); 
    17201706 
    17211707        mutex_init(&fbdev->rqueue_mutex); 
     
    18301816 
    18311817static int omapfb_probe(struct platform_device *pdev) 
    18321818{ 
    1833         int r; 
    1834  
    18351819        BUG_ON(fbdev_pdev != NULL); 
    18361820 
    1837         r = platform_device_register(&omapdss_device); 
    1838         if (r) { 
    1839                 dev_err(&pdev->dev, "can't register omapdss device\n"); 
    1840                 return r; 
    1841         } 
    1842  
    18431821        /* Delay actual initialization until the LCD is registered */ 
    18441822        fbdev_pdev = pdev; 
    18451823        if (fbdev_panel != NULL) 
     
    18671845        fbdev->state = OMAPFB_DISABLED; 
    18681846        omapfb_free_resources(fbdev, saved_state); 
    18691847 
    1870         platform_device_unregister(&omapdss_device); 
    1871         fbdev->dssdev = NULL; 
    1872  
    18731848        return 0; 
    18741849} 
    18751850 
  • drivers/video/omap/rfbi.c

    old new  
    8484 
    8585static int rfbi_get_clocks(void) 
    8686{ 
    87         rfbi.dss_ick = clk_get(&rfbi.fbdev->dssdev->dev, "ick"); 
     87        rfbi.dss_ick = clk_get(&omapdss_device.dev, "ick"); 
    8888        if (IS_ERR(rfbi.dss_ick)) { 
    8989                dev_err(rfbi.fbdev->dev, "can't get ick\n"); 
    9090                return PTR_ERR(rfbi.dss_ick); 
    9191        } 
    9292 
    93         rfbi.dss1_fck = clk_get(&rfbi.fbdev->dssdev->dev, "dss1_fck"); 
     93        rfbi.dss1_fck = clk_get(&omapdss_device.dev, "dss1_fck"); 
    9494        if (IS_ERR(rfbi.dss1_fck)) { 
    9595                dev_err(rfbi.fbdev->dev, "can't get dss1_fck\n"); 
    9696                clk_put(rfbi.dss_ick); 
Note: See TracBrowser for help on using the repository browser.