From patchwork Wed Apr 11 22:44:09 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 7742 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 2C62F23E29 for ; Wed, 11 Apr 2012 22:44:19 +0000 (UTC) Received: from mail-iy0-f180.google.com (mail-iy0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id E9D59A18078 for ; Wed, 11 Apr 2012 22:44:18 +0000 (UTC) Received: by mail-iy0-f180.google.com with SMTP id e36so2605173iag.11 for ; Wed, 11 Apr 2012 15:44:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:x-gm-message-state; bh=LCMi61Q6CwhGsYfwx8UWoGtiLu3GqA+oI4L2qaK0ob0=; b=iBe9JuMYDSoYuPnq77ntnxUzxca5clUl+EzxXwi8irWrFHxCbDFzU7vBXQKDeiMrCZ EKOxxDuxaVhBjEDSueSKIV8wnK/XUtIB2UBeU44QmH0BsynNfbkNC4KaDR7YBezO6o/J RvEUdEgenTzM1oyibYJ5GS/7SH+tT+Ho2Mavx7uA+2PScmOgzsbNeoMi9blo5uvZtn3C YoNOjF+tMCqARpDklRcfx3s37ynJlIa483biB49jqbhNOmMpWzWjlyrRSYn+RH5Bx/fL MlFYMrtP+wTIqfzQID9lgYbJcLCc31lNFVO18GnlZSIfbngETEaZBc8/ReEBzRRGUSH/ bixQ== Received: by 10.42.155.9 with SMTP id s9mr47577icw.51.1334184258741; Wed, 11 Apr 2012 15:44:18 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.164.217 with SMTP id f25csp158504iby; Wed, 11 Apr 2012 15:44:18 -0700 (PDT) Received: by 10.112.41.198 with SMTP id h6mr69531lbl.47.1334184257150; Wed, 11 Apr 2012 15:44:17 -0700 (PDT) Received: from mail.df.lth.se (mail.df.lth.se. [194.47.250.12]) by mx.google.com with ESMTPS id o3si1591505lbx.21.2012.04.11.15.44.16 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 11 Apr 2012 15:44:17 -0700 (PDT) Received-SPF: neutral (google.com: 194.47.250.12 is neither permitted nor denied by best guess record for domain of linus.walleij@linaro.org) client-ip=194.47.250.12; Authentication-Results: mx.google.com; spf=neutral (google.com: 194.47.250.12 is neither permitted nor denied by best guess record for domain of linus.walleij@linaro.org) smtp.mail=linus.walleij@linaro.org Received: from fecusia (c83-249-220-87.bredband.comhem.se [83.249.220.87]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.df.lth.se (Postfix) with ESMTPSA id 3A2F665D32; Thu, 12 Apr 2012 00:44:15 +0200 (CEST) Received: by fecusia (sSMTP sendmail emulation); Thu, 12 Apr 2012 00:44:13 +0200 From: "Linus Walleij" To: linux-arm-kernel@lists.infradead.org Cc: Russell King , Linus Walleij Subject: [PATCH 3/3] plat-versatile: internalize FPGA IRQ data Date: Thu, 12 Apr 2012 00:44:09 +0200 Message-Id: <1334184249-18932-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.7.7.6 X-Gm-Message-State: ALoCoQlbL5LTo/Oy9HwlYF/DjsEl2L8xa38dNtVeoWgr4CwJWQzl4X0PNOeIVIhY1Kn7rArj/M5i This moves the FPGA IRQ data container into the implementation and out of the public interface, it is only used internally now. Signed-off-by: Linus Walleij --- arch/arm/plat-versatile/fpga-irq.c | 14 ++++++++++++++ arch/arm/plat-versatile/include/plat/fpga-irq.h | 7 ------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/arch/arm/plat-versatile/fpga-irq.c b/arch/arm/plat-versatile/fpga-irq.c index b7e06ea..dc57dcd 100644 --- a/arch/arm/plat-versatile/fpga-irq.c +++ b/arch/arm/plat-versatile/fpga-irq.c @@ -15,6 +15,20 @@ #define IRQ_ENABLE_SET 0x08 #define IRQ_ENABLE_CLEAR 0x0c +/** + * struct fpga_irq_data - irq data container for the FPGA IRQ controller + * @base: memory offset in virtual memory + * @irq_start: first IRQ number handled by this instance + * @chip: chip container for this instance + * @domain: domain for this instance + */ +struct fpga_irq_data { + void __iomem *base; + unsigned int irq_start; + struct irq_chip chip; + struct irq_domain *domain; +}; + /* we cannot allocate memory when VICs are initially registered */ static struct fpga_irq_data fpga_irq_devices[CONFIG_PLAT_VERSATILE_FPGA_IRQ_NR]; static int fpga_irq_id; diff --git a/arch/arm/plat-versatile/include/plat/fpga-irq.h b/arch/arm/plat-versatile/include/plat/fpga-irq.h index 7f8009a..91bcfb6 100644 --- a/arch/arm/plat-versatile/include/plat/fpga-irq.h +++ b/arch/arm/plat-versatile/include/plat/fpga-irq.h @@ -1,13 +1,6 @@ #ifndef PLAT_FPGA_IRQ_H #define PLAT_FPGA_IRQ_H -struct fpga_irq_data { - void __iomem *base; - unsigned int irq_start; - struct irq_chip chip; - struct irq_domain *domain; -}; - struct device_node; struct pt_regs;