From patchwork Fri Sep 13 09:14:39 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: archit taneja X-Patchwork-Id: 2882261 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E0F72BFF05 for ; Fri, 13 Sep 2013 09:16:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 557BB20201 for ; Fri, 13 Sep 2013 09:16:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9011A20251 for ; Fri, 13 Sep 2013 09:16:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754148Ab3IMJQP (ORCPT ); Fri, 13 Sep 2013 05:16:15 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:40394 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753803Ab3IMJQO (ORCPT ); Fri, 13 Sep 2013 05:16:14 -0400 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id r8D9GCJS017242; Fri, 13 Sep 2013 04:16:12 -0500 Received: from DLEE70.ent.ti.com (dlee70.ent.ti.com [157.170.170.113]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id r8D9GCfU003659; Fri, 13 Sep 2013 04:16:12 -0500 Received: from dlep33.itg.ti.com (157.170.170.75) by DLEE70.ent.ti.com (157.170.170.113) with Microsoft SMTP Server id 14.2.342.3; Fri, 13 Sep 2013 04:16:12 -0500 Received: from legion.dal.design.ti.com (legion.dal.design.ti.com [128.247.22.53]) by dlep33.itg.ti.com (8.14.3/8.13.8) with ESMTP id r8D9GCfd004939; Fri, 13 Sep 2013 04:16:12 -0500 Received: from localhost (a0393947pc.apr.dhcp.ti.com [172.24.145.166]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id r8D9GAt13401; Fri, 13 Sep 2013 04:16:10 -0500 (CDT) From: Archit Taneja To: , , , CC: , Archit Taneja , Andy Gross Subject: [PATCH 4/4] arm: omap: display: Don't build device for DMM Date: Fri, 13 Sep 2013 14:44:39 +0530 Message-ID: <1379063679-4869-5-git-send-email-archit@ti.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1379063679-4869-1-git-send-email-archit@ti.com> References: <1379063679-4869-1-git-send-email-archit@ti.com> MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP DMM exists on omap4+ platforms, these platforms will always boot with DT. Remove the previous method of searching the dmm hwmod and building the device by ourselves. Addition of a DMM nodes in DT will ensure a DMM device is built. For OMAP4, the address and irq data for most hwmods were removed, so the older method doesn't work anyway. Cc: Andy Gross Signed-off-by: Archit Taneja --- arch/arm/mach-omap2/display.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/arch/arm/mach-omap2/display.c b/arch/arm/mach-omap2/display.c index d097d23..e0642bd 100644 --- a/arch/arm/mach-omap2/display.c +++ b/arch/arm/mach-omap2/display.c @@ -126,20 +126,8 @@ static int __init omapdrm_init(void) { int r = 0; - /* create DRM and DMM device */ + /* create DRM device(DMM device created via DT) */ if (omap_drm_device != NULL) { - struct omap_hwmod *oh = NULL; - struct platform_device *pdev; - - /* lookup and populate the DMM information, if present - OMAP4+ */ - oh = omap_hwmod_lookup("dmm"); - if (oh) { - pdev = omap_device_build(oh->name, -1, oh, NULL, 0); - WARN(IS_ERR(pdev), - "Could not build omap_device for %s\n", - oh->name); - } - platform_drm_data.omaprev = GET_OMAP_TYPE; r = platform_device_register(omap_drm_device); @@ -464,7 +452,7 @@ int __init omap_display_init(struct omap_dss_board_info *board_data) } } - /* create DRM and DMM device */ + /* create DRM device */ r = omapdrm_init(); if (r < 0) { pr_err("Unable to register omapdrm device\n");