summaryrefslogtreecommitdiffstats
path: root/drivers/video/omap2/dss/core.c
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2011-03-02 12:29:27 +0200
committerTomi Valkeinen <tomi.valkeinen@ti.com>2011-03-11 15:46:27 +0200
commit42c9dee82129d965bc8ca02170150817317c0135 (patch)
treef90404dfff058d84033171467248be665ec6d053 /drivers/video/omap2/dss/core.c
parent1bb478350670fadf708d3cbd6137c32dfbe3fd5f (diff)
downloadop-kernel-dev-42c9dee82129d965bc8ca02170150817317c0135.zip
op-kernel-dev-42c9dee82129d965bc8ca02170150817317c0135.tar.gz
OMAP: DSS2: Remove FB_OMAP_BOOTLOADER_INIT support
FB_OMAP_BOOTLOADER_INIT does not work, and it was only partially implemented for SDI. This patch removes support for FB_OMAP_BOOTLOADER_INIT to clean up the code and to remove any assumptions that FB_OMAP_BOOTLOADER_INIT would work. Proper implementation is much more complex, requiring early boot time register and clock handling to keep the DSS running. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video/omap2/dss/core.c')
-rw-r--r--drivers/video/omap2/dss/core.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/video/omap2/dss/core.c b/drivers/video/omap2/dss/core.c
index bcf69a4..02db5f1 100644
--- a/drivers/video/omap2/dss/core.c
+++ b/drivers/video/omap2/dss/core.c
@@ -166,7 +166,6 @@ static inline void dss_uninitialize_debugfs(void)
static int omap_dss_probe(struct platform_device *pdev)
{
struct omap_dss_board_info *pdata = pdev->dev.platform_data;
- int skip_init = 0;
int r;
int i;
@@ -210,13 +209,8 @@ static int omap_dss_probe(struct platform_device *pdev)
goto err_venc;
}
-#ifdef CONFIG_FB_OMAP_BOOTLOADER_INIT
- /* DISPC_CONTROL */
- if (omap_readl(0x48050440) & 1) /* LCD enabled? */
- skip_init = 1;
-#endif
if (cpu_is_omap34xx()) {
- r = sdi_init(skip_init);
+ r = sdi_init();
if (r) {
DSSERR("Failed to initialize SDI\n");
goto err_sdi;
OpenPOWER on IntegriCloud