From patchwork Wed Mar 27 08:45:10 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomi Valkeinen X-Patchwork-Id: 2348211 Return-Path: X-Original-To: patchwork-linux-fbdev@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 7C7383FD40 for ; Wed, 27 Mar 2013 08:46:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753884Ab3C0Iq0 (ORCPT ); Wed, 27 Mar 2013 04:46:26 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:47669 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753761Ab3C0IqV (ORCPT ); Wed, 27 Mar 2013 04:46:21 -0400 Received: from dlelxv30.itg.ti.com ([172.17.2.17]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id r2R8kEnn006666; Wed, 27 Mar 2013 03:46:15 -0500 Received: from DFLE72.ent.ti.com (dfle72.ent.ti.com [128.247.5.109]) by dlelxv30.itg.ti.com (8.13.8/8.13.8) with ESMTP id r2R8kEbc019985; Wed, 27 Mar 2013 03:46:14 -0500 Received: from dlelxv22.itg.ti.com (172.17.1.197) by DFLE72.ent.ti.com (128.247.5.109) with Microsoft SMTP Server id 14.2.342.3; Wed, 27 Mar 2013 03:46:14 -0500 Received: from deskari.tieu.ti.com (h64-4.vpn.ti.com [172.24.64.4]) by dlelxv22.itg.ti.com (8.13.8/8.13.8) with ESMTP id r2R8k4Cu030367; Wed, 27 Mar 2013 03:46:12 -0500 From: Tomi Valkeinen To: , , , CC: Archit Taneja , Andy Gross , Tony Lindgren , Benoit Cousson , Santosh Shilimkar , Tomi Valkeinen Subject: [RFC 03/14] OMAPDSS: Add DT support to DSS, DISPC, DPI Date: Wed, 27 Mar 2013 10:45:10 +0200 Message-ID: <1364373921-7599-4-git-send-email-tomi.valkeinen@ti.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1364373921-7599-1-git-send-email-tomi.valkeinen@ti.com> References: <1364373921-7599-1-git-send-email-tomi.valkeinen@ti.com> MIME-Version: 1.0 Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org Add the code to make DSS, DISPC and DPI drivers work with device tree on OMAP3 and OMAP4. The only change is adding the of_match_tables. Signed-off-by: Tomi Valkeinen --- drivers/video/omap2/dss/dispc.c | 7 +++++++ drivers/video/omap2/dss/dpi.c | 8 ++++++++ drivers/video/omap2/dss/dss.c | 7 +++++++ 3 files changed, 22 insertions(+) diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c index 8cfa27b..be53d64 100644 --- a/drivers/video/omap2/dss/dispc.c +++ b/drivers/video/omap2/dss/dispc.c @@ -3705,12 +3705,19 @@ static const struct dev_pm_ops dispc_pm_ops = { .runtime_resume = dispc_runtime_resume, }; +static const struct of_device_id dispc_of_match[] = { + { .compatible = "ti,omap3-dispc", }, + { .compatible = "ti,omap4-dispc", }, + {}, +}; + static struct platform_driver omap_dispchw_driver = { .remove = __exit_p(omap_dispchw_remove), .driver = { .name = "omapdss_dispc", .owner = THIS_MODULE, .pm = &dispc_pm_ops, + .of_match_table = dispc_of_match, }, }; diff --git a/drivers/video/omap2/dss/dpi.c b/drivers/video/omap2/dss/dpi.c index e7beea2..dc7e324 100644 --- a/drivers/video/omap2/dss/dpi.c +++ b/drivers/video/omap2/dss/dpi.c @@ -30,6 +30,7 @@ #include #include #include +#include #include