From patchwork Mon Jan 3 12:51:02 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Senthilvadivu Guruswamy X-Patchwork-Id: 447531 X-Patchwork-Delegate: tomi.valkeinen@nokia.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p03Cpkoq027260 for ; Mon, 3 Jan 2011 12:51:47 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754447Ab1ACMvq (ORCPT ); Mon, 3 Jan 2011 07:51:46 -0500 Received: from arroyo.ext.ti.com ([192.94.94.40]:57625 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754841Ab1ACMvo (ORCPT ); Mon, 3 Jan 2011 07:51:44 -0500 Received: from dbdp31.itg.ti.com ([172.24.170.98]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id p03CpIwh004372 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 3 Jan 2011 06:51:24 -0600 Received: from linfarm476.india.ti.com (localhost [127.0.0.1]) by dbdp31.itg.ti.com (8.13.8/8.13.8) with ESMTP id p03CpFZS021530; Mon, 3 Jan 2011 18:21:15 +0530 (IST) Received: from linfarm476.india.ti.com (localhost [127.0.0.1]) by linfarm476.india.ti.com (8.12.11/8.12.11) with ESMTP id p03CpDRl027060; Mon, 3 Jan 2011 18:21:13 +0530 Received: (from a0876342@localhost) by linfarm476.india.ti.com (8.12.11/8.12.11/Submit) id p03CpDGK027058; Mon, 3 Jan 2011 18:21:13 +0530 From: Guruswamy Senthilvadivu To: tomi.valkeinen@nokia.com, paul@pwsan.com, khilman@deeprootsystems.com, v-hiremath@ti.com, a0919096@ti.com, linux-omap@vger.kernel.org Cc: Senthilvadivu Guruswamy Subject: [PATCH v3 10/17] OMAP2,3: DSS2: Move dss_feature_init to dss Date: Mon, 3 Jan 2011 18:21:02 +0530 Message-Id: <1294059069-26737-11-git-send-email-svadivu@ti.com> X-Mailer: git-send-email 1.5.6.6 In-Reply-To: <1294059069-26737-1-git-send-email-svadivu@ti.com> References: <1294059069-26737-1-git-send-email-svadivu@ti.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Mon, 03 Jan 2011 12:51:47 +0000 (UTC) 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 #include #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;