From: Senthilvadivu Guruswamy <svad...@ti.com>
Move dss_feature_init call from core to dss as it involves DSS HW related
configuration. This movement is must since dsshw_probe would be called
first in which the registers are accessed.
Signed-off-by: Senthilvadivu Guruswamy <svad...@ti.com>
---
drivers/video/omap2/dss/core.c | 2 --
drivers/video/omap2/dss/dss.c | 3 +++
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/video/omap2/dss/core.c b/drivers/video/omap2/dss/core.c
index a6b3b61..0d5f6dd 100644
--- a/drivers/video/omap2/dss/core.c
+++ b/drivers/video/omap2/dss/core.c
@@ -187,8 +187,6 @@ static int omap_dss_probe(struct platform_device *pdev)
core.pdev = pdev;
- dss_features_init();
-
dss_init_overlay_managers(pdev);
dss_init_overlays(pdev);
diff --git a/drivers/video/omap2/dss/dss.c b/drivers/video/omap2/dss/dss.c
index 59a632d..99dd490 100644
--- a/drivers/video/omap2/dss/dss.c
+++ b/drivers/video/omap2/dss/dss.c
@@ -33,6 +33,7 @@
#include <plat/display.h>
#include <plat/clock.h>
#include "dss.h"
+#include "dss_features.h"
#define DSS_BASE 0x48050000
@@ -966,6 +967,8 @@ static int omap_dsshw_probe(struct platform_device *pdev)
dss.pdev = pdev;
+ dss_features_init();
+
r = dss_get_clocks();
if (r)
goto err_clocks;
--
1.6.3.3
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
