From patchwork Sat Mar 9 20:29:32 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Figa X-Patchwork-Id: 2242471 Return-Path: X-Original-To: patchwork-linux-samsung-soc@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 0E5C23FCF6 for ; Sat, 9 Mar 2013 20:29:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751264Ab3CIU3r (ORCPT ); Sat, 9 Mar 2013 15:29:47 -0500 Received: from mail-wg0-f51.google.com ([74.125.82.51]:65170 "EHLO mail-wg0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751263Ab3CIU3r (ORCPT ); Sat, 9 Mar 2013 15:29:47 -0500 Received: by mail-wg0-f51.google.com with SMTP id 8so3791239wgl.30 for ; Sat, 09 Mar 2013 12:29:45 -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=2TZ33z7D3Lj5lQYj0XodYHRx1yrrFTZ+F7kDQy8+Utw=; b=AA5ULkkVsUTikvqwOpmqGUY3PrDa3va6ZqH+MDvFozXHzK7nmWP6wnsQerh78t9Wmi yBm+GZH3DRsN0qJpRhMxMi5csMlBMrQ2knZe0NhNbuNhV6W/TqcEfJGXaiiGGfVJ46lr pk5rJtWVaaBeWAnBdQ8hOtz529ibtHXyYKlvcMlQaeVOMR8w+C7TjDkzsMwT7t4vBHCp SVM2xIMjcm7yh37eXAdbV66+p163mYYnHAVX/HcPmC79qUXC5edj2ToPZqWgHOQaKjS9 MPXmunGfib/KlKr53OcI7yIw0XzF6ZEJ0of+T8n4YngxuUixxkz7wFDKaPnUKF+DYocf vqRQ== X-Received: by 10.194.20.40 with SMTP id k8mr11366740wje.16.1362860985784; Sat, 09 Mar 2013 12:29:45 -0800 (PST) Received: from flatron.tomeq (87-207-52-162.dynamic.chello.pl. [87.207.52.162]) by mx.google.com with ESMTPS id eo1sm6312017wib.8.2013.03.09.12.29.43 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 09 Mar 2013 12:29:44 -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 v4 1/4] ARM: common: vic: Parse interrupt and resume masks from device tree Date: Sat, 9 Mar 2013 21:29:32 +0100 Message-Id: <1362860975-18635-2-git-send-email-tomasz.figa@gmail.com> X-Mailer: git-send-email 1.8.1.5 In-Reply-To: <1362860975-18635-1-git-send-email-tomasz.figa@gmail.com> References: <1362860975-18635-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 ++++++ drivers/irqchip/irq-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/drivers/irqchip/irq-vic.c b/drivers/irqchip/irq-vic.c index 3cf97aa..61602df 100644 --- a/drivers/irqchip/irq-vic.c +++ b/drivers/irqchip/irq-vic.c @@ -468,6 +468,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; @@ -476,10 +478,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; }