aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2012-10-25 14:42:10 -0400
committerTomi Valkeinen <tomi.valkeinen@ti.com>2012-10-26 01:41:36 -0400
commitf65e384bec59ef35dfa77455181af2ecf7a7ef44 (patch)
treed52a07289dd4cf5bf879fa07dbf95d2c27a20a71 /drivers
parentea29c4ea2b04462e92f409cd852dfe0d6d04f0fc (diff)
omapdss: dss: Fix clocks on OMAP363x
Commit 185bae1095188aa199c9be64d6030d8dbfc65e0a ("OMAPDSS: DSS: Cleanup cpu_is_xxxx checks") broke the DSS clocks configuration by erroneously using the clock parameters applicable to all other OMAP34xx SoCs for the OMAP363x. This went unnoticed probably because the cpu_is_omap34xx() class check wasn't seen as matching the OMAP363x subclass. Fix it by checking for the OMAP363x subclass before checking for the OMAP34xx class. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/video/omap2/dss/dss.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/omap2/dss/dss.c b/drivers/video/omap2/dss/dss.c
index 2ab1c3e96553..0bb7406bdbb8 100644
--- a/drivers/video/omap2/dss/dss.c
+++ b/drivers/video/omap2/dss/dss.c
@@ -805,10 +805,10 @@ static int __init dss_init_features(struct device *dev)
805 805
806 if (cpu_is_omap24xx()) 806 if (cpu_is_omap24xx())
807 src = &omap24xx_dss_feats; 807 src = &omap24xx_dss_feats;
808 else if (cpu_is_omap34xx())
809 src = &omap34xx_dss_feats;
810 else if (cpu_is_omap3630()) 808 else if (cpu_is_omap3630())
811 src = &omap3630_dss_feats; 809 src = &omap3630_dss_feats;
810 else if (cpu_is_omap34xx())
811 src = &omap34xx_dss_feats;
812 else if (cpu_is_omap44xx()) 812 else if (cpu_is_omap44xx())
813 src = &omap44xx_dss_feats; 813 src = &omap44xx_dss_feats;
814 else if (soc_is_omap54xx()) 814 else if (soc_is_omap54xx())