From patchwork Fri Aug 22 13:51:53 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nishanth Menon X-Patchwork-Id: 35832 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f197.google.com (mail-ob0-f197.google.com [209.85.214.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id ACCB820540 for ; Fri, 22 Aug 2014 13:55:24 +0000 (UTC) Received: by mail-ob0-f197.google.com with SMTP id vb8sf62345608obc.0 for ; Fri, 22 Aug 2014 06:55:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe:content-type; bh=sxzc3Y3OgIH6SjTpUjIHwp1aSkowj6E5eCo6k+tjB4U=; b=XBQosqaYk/qXM+jPwVNImn0hp3nGIgpovJJQdiG89pYvGIMYF2uGtteXmw8HQdxDnx KJOqyr074PPTVCSLJiZf75SIV/iuUE5bkJsBo5k47Y61hWmIqeadjJvuKhs8VBQuaGs9 yoBHsbirgj48jN5dO2/MUoNmCWY2p31zBR70P8AMpWHcTcqTaWx6hwKRuPCLUoZ4/OU3 Mfy4wkUAZVXfVlwIeUO3d+4Jkf9YoAGZRmd0/0BZ2zjqxmEihCaHc9KrzefvXSYFRSAF +JB7TR30GYaflqeggW5paar8azcLMQedPx9yaGN6lqIx21UxWmVsbYi/KuCSXy84HNpo wIkw== X-Gm-Message-State: ALoCoQn0NjXDpCDnZB9e8oxoWwIItUVND2HJ/06mcIZmG5Qi22C3QW5x8u7S+7vO8imob0p5U6gH X-Received: by 10.42.26.12 with SMTP id d12mr6761763icc.24.1408715724315; Fri, 22 Aug 2014 06:55:24 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.93.34 with SMTP id c31ls1207131qge.92.gmail; Fri, 22 Aug 2014 06:55:24 -0700 (PDT) X-Received: by 10.52.26.206 with SMTP id n14mr3522018vdg.0.1408715724100; Fri, 22 Aug 2014 06:55:24 -0700 (PDT) Received: from mail-vc0-f174.google.com (mail-vc0-f174.google.com [209.85.220.174]) by mx.google.com with ESMTPS id h13si13604478vdj.81.2014.08.22.06.55.24 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 22 Aug 2014 06:55:24 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.174 as permitted sender) client-ip=209.85.220.174; Received: by mail-vc0-f174.google.com with SMTP id la4so12310133vcb.19 for ; Fri, 22 Aug 2014 06:55:24 -0700 (PDT) X-Received: by 10.221.24.135 with SMTP id re7mr153184vcb.53.1408715723997; Fri, 22 Aug 2014 06:55:23 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.45.67 with SMTP id uj3csp18852vcb; Fri, 22 Aug 2014 06:55:23 -0700 (PDT) X-Received: by 10.66.141.109 with SMTP id rn13mr6627925pab.117.1408715723163; Fri, 22 Aug 2014 06:55:23 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id fk8si29928327pdb.143.2014.08.22.06.55.22 for ; Fri, 22 Aug 2014 06:55:23 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756751AbaHVNzR (ORCPT + 21 others); Fri, 22 Aug 2014 09:55:17 -0400 Received: from devils.ext.ti.com ([198.47.26.153]:32877 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756409AbaHVNyK (ORCPT ); Fri, 22 Aug 2014 09:54:10 -0400 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id s7MDrjpk016213; Fri, 22 Aug 2014 08:53:45 -0500 Received: from DFLE72.ent.ti.com (dfle72.ent.ti.com [128.247.5.109]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id s7MDri63016985; Fri, 22 Aug 2014 08:53:45 -0500 Received: from dlep33.itg.ti.com (157.170.170.75) by DFLE72.ent.ti.com (128.247.5.109) with Microsoft SMTP Server id 14.3.174.1; Fri, 22 Aug 2014 08:53:44 -0500 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep33.itg.ti.com (8.14.3/8.13.8) with ESMTP id s7MDricI007752; Fri, 22 Aug 2014 08:53:44 -0500 From: Nishanth Menon To: Tony Lindgren , Tero Kristo , Paul Walmsley CC: Kevin Hilman , , , , Keerthy , =?UTF-8?q?Beno=C3=AEt=20Cousson?= , Santosh Shilimkar , Nishanth Menon Subject: [PATCH 6/6] ARM: OMAP3+: PRM: register interrupt information from DT Date: Fri, 22 Aug 2014 08:51:53 -0500 Message-ID: <1408715513-25851-7-git-send-email-nm@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1408715513-25851-1-git-send-email-nm@ti.com> References: <1408715513-25851-1-git-send-email-nm@ti.com> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: nm@ti.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.174 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Allow the PRM interrupt information to be picked up from device tree. OMAP3 may use legacy boot and needs to be compatible with old dtbs (without interrupt populated), for these, we use the value which is pre-populated. Signed-off-by: Nishanth Menon --- arch/arm/mach-omap2/prm3xxx.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/arch/arm/mach-omap2/prm3xxx.c b/arch/arm/mach-omap2/prm3xxx.c index 2458be6..e0088e0 100644 --- a/arch/arm/mach-omap2/prm3xxx.c +++ b/arch/arm/mach-omap2/prm3xxx.c @@ -17,6 +17,7 @@ #include #include #include +#include #include "soc.h" #include "common.h" @@ -649,6 +650,11 @@ int __init omap3xxx_prm_init(void) return prm_register(&omap3xxx_prm_ll_data); } +static struct of_device_id omap3_prm_dt_match_table[] = { + { .compatible = "ti,omap3-prm" }, + { } +}; + static int omap3xxx_prm_late_init(void) { int ret; @@ -656,6 +662,18 @@ static int omap3xxx_prm_late_init(void) if (!(prm_features & PRM_HAS_IO_WAKEUP)) return 0; + if (of_have_populated_dt()) { + struct device_node *np; + int irq_num; + + np = of_find_matching_node(NULL, omap3_prm_dt_match_table); + if (np) { + irq_num = of_irq_get(np, 0); + if (irq_num >= 0) + omap3_prcm_irq_setup.irq = irq_num; + } + } + omap3xxx_prm_enable_io_wakeup(); ret = omap_prcm_register_chain_handler(&omap3_prcm_irq_setup); if (!ret)