From patchwork Sun Feb 10 13:54:40 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Figa X-Patchwork-Id: 2122301 Return-Path: X-Original-To: patchwork-linux-samsung-soc@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 E0B61DF23E for ; Sun, 10 Feb 2013 13:54:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755042Ab3BJNy6 (ORCPT ); Sun, 10 Feb 2013 08:54:58 -0500 Received: from mail-ea0-f181.google.com ([209.85.215.181]:46633 "EHLO mail-ea0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754989Ab3BJNy5 (ORCPT ); Sun, 10 Feb 2013 08:54:57 -0500 Received: by mail-ea0-f181.google.com with SMTP id i13so2266572eaa.12 for ; Sun, 10 Feb 2013 05:54:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=1y+dAioHYBiPk8Xhs5so1k76YnCHMuOXbf3/8xX3ctE=; b=uhpQU3sRZ0RivrL7nkHx9jaYf/t9Mcu/AfiGBpcCCasXaU6BGqHl+DnRuLCFzJlHoy u/pd0qzltqXO/Y0ypgcfocec7eO7XWxKudW2SKxOUO2S2z0+FFRteMuS0sxDrrx3nYWf TVpRvx7TX9pFxI5i8eTfryJaRKLRo2vCIHuYIk4x8LgJq0t1JqHjHH4XJuTgAhxM43kn E6jIjDmB3D1mvK7+gLklcm7lp/IVWzy66DuIWPc0VM9chEoM0n5imIqvQdIzc75BSKup QH6ol3hJ2D1vqPzxJ7m4Ooc7BeFgWr0LSVChG9k3SiXPPjN43yfjOm+/4umIlUlyAE/o OhbA== X-Received: by 10.14.175.70 with SMTP id y46mr38765400eel.6.1360504496613; Sun, 10 Feb 2013 05:54:56 -0800 (PST) Received: from flatron.tomeq (87-207-52-162.dynamic.chello.pl. [87.207.52.162]) by mx.google.com with ESMTPS id s3sm18999256eem.4.2013.02.10.05.54.54 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 10 Feb 2013 05:54:55 -0800 (PST) From: Tomasz Figa To: linux-samsung-soc@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, devicetree-discuss@lists.ozlabs.org, kgene.kim@samsung.com, broonie@opensource.wolfsonmicro.com, kwangwoo.lee@gmail.com, jacmet@sunsite.dk, augulis.darius@gmail.com, mcuelenaere@gmail.com, linux@arm.linux.org.uk, Rob Herring , Mark Rutland , Tomasz Figa Subject: [PATCH v2 1/4] ARM: common: vic: Parse interrupt and resume masks from device tree Date: Sun, 10 Feb 2013 14:54:40 +0100 Message-Id: <1360504483-3465-2-git-send-email-tomasz.figa@gmail.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1360504483-3465-1-git-send-email-tomasz.figa@gmail.com> References: <1360504483-3465-1-git-send-email-tomasz.figa@gmail.com> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org This patch extends vic_of_init to parse valid interrupt sources and resume sources masks from device tree. If mask values are not specified in device tree, all sources are assumed to be valid, as before this patch. Signed-off-by: Tomasz Figa --- Documentation/devicetree/bindings/arm/vic.txt | 6 ++++++ arch/arm/common/vic.c | 7 ++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/arm/vic.txt b/Documentation/devicetree/bindings/arm/vic.txt index 266716b..bb7137c 100644 --- a/Documentation/devicetree/bindings/arm/vic.txt +++ b/Documentation/devicetree/bindings/arm/vic.txt @@ -18,6 +18,9 @@ Required properties: Optional properties: - interrupts : Interrupt source for parent controllers if the VIC is nested. +- interrupt-mask : Bit mask of valid interrupt sources (defaults to all valid) +- wakeup-mask : Bit mask of interrupt sources that can wake up the system + (defaults to all allowed) Example: @@ -26,4 +29,7 @@ Example: interrupt-controller; #interrupt-cells = <1>; reg = <0x60000 0x1000>; + + interrupt-mask = <0xffffff7f>; + wakeup-mask = <0x0000ff7f>; }; diff --git a/arch/arm/common/vic.c b/arch/arm/common/vic.c index 8f324b9..676a938 100644 --- a/arch/arm/common/vic.c +++ b/arch/arm/common/vic.c @@ -412,6 +412,8 @@ void __init vic_init(void __iomem *base, unsigned int irq_start, int __init vic_of_init(struct device_node *node, struct device_node *parent) { void __iomem *regs; + u32 interrupt_mask = ~0; + u32 wakeup_mask = ~0; if (WARN(parent, "non-root VICs are not supported")) return -EINVAL; @@ -420,10 +422,13 @@ int __init vic_of_init(struct device_node *node, struct device_node *parent) if (WARN_ON(!regs)) return -EIO; + of_property_read_u32(node, "interrupt-mask", &interrupt_mask); + of_property_read_u32(node, "wakeup-mask", &wakeup_mask); + /* * Passing 0 as first IRQ makes the simple domain allocate descriptors */ - __vic_init(regs, 0, ~0, ~0, node); + __vic_init(regs, 0, interrupt_mask, wakeup_mask, node); return 0; }