From patchwork Mon Aug 23 15:57:54 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Senthilvadivu Guruswamy X-Patchwork-Id: 124621 X-Patchwork-Delegate: tomi.valkeinen@nokia.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o7NFwQVQ016508 for ; Mon, 23 Aug 2010 15:59:05 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754265Ab0HWP6a (ORCPT ); Mon, 23 Aug 2010 11:58:30 -0400 Received: from bear.ext.ti.com ([192.94.94.41]:35123 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754243Ab0HWP6Z (ORCPT ); Mon, 23 Aug 2010 11:58:25 -0400 Received: from dbdp31.itg.ti.com ([172.24.170.98]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id o7NFwE4C026596 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 23 Aug 2010 10:58:16 -0500 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 o7NFwAqg001708; Mon, 23 Aug 2010 21:28:10 +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 o7NFwAnP011215; Mon, 23 Aug 2010 21:28:10 +0530 Received: (from a0876342@localhost) by linfarm476.india.ti.com (8.12.11/8.12.11/Submit) id o7NFwAkD011213; Mon, 23 Aug 2010 21:28:10 +0530 From: Guruswamy Senthilvadivu To: linux-omap@vger.kernel.org, tomi.valkeinen@nokia.com, paul@pwsan.com, khilman@ti.com Cc: Senthilvadivu Guruswamy Subject: [PATCH 05/20] Move dss platform driver to dss.c Date: Mon, 23 Aug 2010 21:27:54 +0530 Message-Id: <1282579089-10487-6-git-send-email-svadivu@ti.com> X-Mailer: git-send-email 1.5.6.6 In-Reply-To: <1282579089-10487-5-git-send-email-svadivu@ti.com> References: <1282579089-10487-1-git-send-email-svadivu@ti.com> <1282579089-10487-2-git-send-email-svadivu@ti.com> <1282579089-10487-3-git-send-email-svadivu@ti.com> <1282579089-10487-4-git-send-email-svadivu@ti.com> <1282579089-10487-5-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 (demeter.kernel.org [140.211.167.41]); Mon, 23 Aug 2010 15:59:05 +0000 (UTC) diff --git a/drivers/video/omap2/dss/core.c b/drivers/video/omap2/dss/core.c index 3b6a309..f01e8e6 100644 --- a/drivers/video/omap2/dss/core.c +++ b/drivers/video/omap2/dss/core.c @@ -707,17 +707,6 @@ static int omap_dss_resume(struct platform_device *pdev) return dss_resume_all_devices(); } -/* DSS HW IP initialisation */ -static int omap_dsshw_probe(struct platform_device *pdev) -{ - return 0; -} - -static int omap_dsshw_remove(struct platform_device *pdev) -{ - return 0; -} - /* DISPC HW IP initialisation */ static int omap_dispchw_probe(struct platform_device *pdev) { @@ -775,18 +764,6 @@ static struct platform_driver omap_dss_driver = { }, }; -static struct platform_driver omap_dsshw_driver = { - .probe = omap_dsshw_probe, - .remove = omap_dsshw_remove, - .shutdown = NULL, - .suspend = NULL, - .resume = NULL, - .driver = { - .name = "dss", - .owner = THIS_MODULE, - }, -}; - static struct platform_driver omap_dispchw_driver = { .probe = omap_dispchw_probe, .remove = omap_dispchw_remove, @@ -1100,7 +1077,6 @@ static int __init omap_dss_init(void) static int __init omap_dss_init2(void) { - platform_driver_register(&omap_dsshw_driver); platform_driver_register(&omap_dispchw_driver); platform_driver_register(&omap_dsi1hw_driver); platform_driver_register(&omap_rfbihw_driver); @@ -1109,7 +1085,7 @@ static int __init omap_dss_init2(void) } core_initcall(omap_dss_init); -device_initcall(omap_dss_init2); +device_initcall_sync(omap_dss_init2); #endif MODULE_AUTHOR("Tomi Valkeinen "); diff --git a/drivers/video/omap2/dss/dss.c b/drivers/video/omap2/dss/dss.c index 24b1825..5f91e37 100644 --- a/drivers/video/omap2/dss/dss.c +++ b/drivers/video/omap2/dss/dss.c @@ -122,6 +122,29 @@ void dss_restore_context(void) #undef SR #undef RR +/* DSS HW IP initialisation */ +static int omap_dsshw_probe(struct platform_device *pdev) +{ + return 0; +} + +static int omap_dsshw_remove(struct platform_device *pdev) +{ + return 0; +} + +static struct platform_driver omap_dsshw_driver = { + .probe = omap_dsshw_probe, + .remove = omap_dsshw_remove, + .shutdown = NULL, + .suspend = NULL, + .resume = NULL, + .driver = { + .name = "dss", + .owner = THIS_MODULE, + }, +}; + void dss_sdi_init(u8 datapairs) { u32 l; @@ -633,3 +656,9 @@ void dss_exit(void) iounmap(dss.base); } +static int __init omap_dss_init1(void) +{ + return platform_driver_register(&omap_dsshw_driver); +} + +device_initcall(omap_dss_init1);