From patchwork Wed Mar 20 04:43:44 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Gross X-Patchwork-Id: 2305191 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id E99A3DF24C for ; Wed, 20 Mar 2013 04:44:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752352Ab3CTEoS (ORCPT ); Wed, 20 Mar 2013 00:44:18 -0400 Received: from bear.ext.ti.com ([192.94.94.41]:46405 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752329Ab3CTEoQ (ORCPT ); Wed, 20 Mar 2013 00:44:16 -0400 Received: from dlelxv30.itg.ti.com ([172.17.2.17]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id r2K4iDkE023581; Tue, 19 Mar 2013 23:44:13 -0500 Received: from DLEE70.ent.ti.com (dlee70.ent.ti.com [157.170.170.113]) by dlelxv30.itg.ti.com (8.13.8/8.13.8) with ESMTP id r2K4iCCU016463; Tue, 19 Mar 2013 23:44:12 -0500 Received: from dlelxv24.itg.ti.com (172.17.1.199) by DLEE70.ent.ti.com (157.170.170.113) with Microsoft SMTP Server id 14.2.342.3; Tue, 19 Mar 2013 23:44:12 -0500 Received: from legion.dal.design.ti.com (legion.dal.design.ti.com [128.247.22.53]) by dlelxv24.itg.ti.com (8.13.8/8.13.8) with ESMTP id r2K4iCY3003594; Tue, 19 Mar 2013 23:44:12 -0500 Received: from localhost (h16-204.vpn.ti.com [172.24.16.204]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id r2K4iCV20677; Tue, 19 Mar 2013 23:44:12 -0500 (CDT) From: Andy Gross To: CC: Benoit Cousson , Santosh Shilimkar , , Nishanth Menon , Andy Gross Subject: [PATCH 2/2] ARM: OMAP2+: Remove dmm device creation Date: Tue, 19 Mar 2013 23:43:44 -0500 Message-ID: <1363754624-5209-3-git-send-email-andy.gross@ti.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1363754624-5209-1-git-send-email-andy.gross@ti.com> References: <1363754624-5209-1-git-send-email-andy.gross@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 Remove DMM device creation via the hwmod entry. The DMM device will now be enumerated as part of the device tree information for the processor. Signed-off-by: Andy Gross --- Documentation/devicetree/bindings/arm/omap/dmm.txt | 16 ++++++++++++++++ arch/arm/mach-omap2/drm.c | 12 ------------ 2 files changed, 16 insertions(+), 12 deletions(-) create mode 100644 Documentation/devicetree/bindings/arm/omap/dmm.txt diff --git a/Documentation/devicetree/bindings/arm/omap/dmm.txt b/Documentation/devicetree/bindings/arm/omap/dmm.txt new file mode 100644 index 0000000..5fd1134 --- /dev/null +++ b/Documentation/devicetree/bindings/arm/omap/dmm.txt @@ -0,0 +1,16 @@ +OMAP Dynamic Memory Manager (DMM) bindings + +Required properties: +- compatible: Must be "ti,dmm" for OMAP processors containing DMM block +- reg: Contains timer register address range (base address and length) +- interrupts: Contains interrupt information (source, etc) for the DMM IRQ +- ti,hwmods: Name of the hwmod associated to the counter, which is typically + "dmm" + +Example: + +dmm: dmm@4e000000 { + compatible = "ti,dmm"; + reg = <0x4e000000 0x800>; + ti,hwmods = "dmm"; +}; diff --git a/arch/arm/mach-omap2/drm.c b/arch/arm/mach-omap2/drm.c index 59a4af7..1fd0487 100644 --- a/arch/arm/mach-omap2/drm.c +++ b/arch/arm/mach-omap2/drm.c @@ -44,18 +44,6 @@ static struct platform_device omap_drm_device = { static int __init omap_init_drm(void) { - 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_data.omaprev = GET_OMAP_TYPE; return platform_device_register(&omap_drm_device);