From patchwork Mon Mar 31 15:15:49 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tero Kristo X-Patchwork-Id: 27431 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f199.google.com (mail-ie0-f199.google.com [209.85.223.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id DF42C202E0 for ; Mon, 31 Mar 2014 15:17:35 +0000 (UTC) Received: by mail-ie0-f199.google.com with SMTP id rl12sf29551426iec.10 for ; Mon, 31 Mar 2014 08:17:35 -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=KC+4FJ6XKv13+iEZebpFtZod+rJioyk6kY8pvjg3aDw=; b=D0VMwqtW9qirEAg9C+Dz34zw2IXp3xBDwKfvQJGxqzP1LLc66F6BJOExXMJVOcrU/5 L/El+Wir4EQxyqKnAVdxd8G05d6V9QHYQW7U5FYkQJ9B0Q/WDn92Mb5axfT/ZSqt2YGP XqrrIh6vsqbZOuFYsIEDCDhVUlyAsmF7PQZtVoxeveAsX8Jkn5VXBvL/cSwb5QSk437W lKz6j0rj592/zOkwBGTu37QIiS7cLgd981zF1bdPsgXHd6jVn1HdbsLA78XZQsF3cJac I7JUKvMAtxE+NY4PvpLn/yLirKIzVzLvSNld90h9O96Y1TKaCe2T2ioIZTm4sgAfEMel /E4Q== X-Gm-Message-State: ALoCoQlnO9pNbYyWE1u6aLToeq0zYfAPNn77kr/MjOO74ooCH2f4T9mdCkkgIjSxxBE7ivH2VbQH X-Received: by 10.182.158.4 with SMTP id wq4mr10575561obb.18.1396279055292; Mon, 31 Mar 2014 08:17:35 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.38.72 with SMTP id s66ls2550710qgs.85.gmail; Mon, 31 Mar 2014 08:17:35 -0700 (PDT) X-Received: by 10.52.171.68 with SMTP id as4mr20055358vdc.0.1396279055198; Mon, 31 Mar 2014 08:17:35 -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 u5si3018833vdo.94.2014.03.31.08.17.35 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 31 Mar 2014 08:17:35 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.174 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.174; Received: by mail-vc0-f174.google.com with SMTP id ld13so8168428vcb.5 for ; Mon, 31 Mar 2014 08:17:35 -0700 (PDT) X-Received: by 10.59.7.102 with SMTP id db6mr8272768ved.17.1396279055098; Mon, 31 Mar 2014 08:17:35 -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.220.12.8 with SMTP id v8csp150658vcv; Mon, 31 Mar 2014 08:17:34 -0700 (PDT) X-Received: by 10.66.250.202 with SMTP id ze10mr4117477pac.153.1396279054303; Mon, 31 Mar 2014 08:17:34 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id cb4si4132536pbc.495.2014.03.31.08.17.33; Mon, 31 Mar 2014 08:17:33 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-omap-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753435AbaCaPRc (ORCPT + 5 others); Mon, 31 Mar 2014 11:17:32 -0400 Received: from arroyo.ext.ti.com ([192.94.94.40]:39091 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753424AbaCaPRb (ORCPT ); Mon, 31 Mar 2014 11:17:31 -0400 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id s2VFH89a004815; Mon, 31 Mar 2014 10:17:08 -0500 Received: from DFLE73.ent.ti.com (dfle73.ent.ti.com [128.247.5.110]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id s2VFH8iT013713; Mon, 31 Mar 2014 10:17:08 -0500 Received: from dflp32.itg.ti.com (10.64.6.15) by DFLE73.ent.ti.com (128.247.5.110) with Microsoft SMTP Server id 14.3.174.1; Mon, 31 Mar 2014 10:17:07 -0500 Received: from localhost.localdomain (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp32.itg.ti.com (8.14.3/8.13.8) with ESMTP id s2VFGm3v013169; Mon, 31 Mar 2014 10:17:06 -0500 From: Tero Kristo To: , , CC: Subject: [PATCH 10/55] ARM: OMAP3+: PRM: get rid of some unnecessary header files Date: Mon, 31 Mar 2014 18:15:49 +0300 Message-ID: <1396278994-12624-11-git-send-email-t-kristo@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1396278994-12624-1-git-send-email-t-kristo@ti.com> References: <1396278994-12624-1-git-send-email-t-kristo@ti.com> MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: t-kristo@ti.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.174 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) 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: , Done in preparation to make PRM a separate driver. Signed-off-by: Tero Kristo --- arch/arm/mach-omap2/prcm-common.h | 1 + arch/arm/mach-omap2/prm3xxx.c | 4 +--- arch/arm/mach-omap2/prm44xx.c | 5 ++--- arch/arm/mach-omap2/prm_common.c | 2 -- arch/arm/mach-omap2/prminst44xx.c | 3 --- 5 files changed, 4 insertions(+), 11 deletions(-) diff --git a/arch/arm/mach-omap2/prcm-common.h b/arch/arm/mach-omap2/prcm-common.h index a8e4b58..9da4c17 100644 --- a/arch/arm/mach-omap2/prcm-common.h +++ b/arch/arm/mach-omap2/prcm-common.h @@ -523,6 +523,7 @@ extern int omap_prcm_register_chain_handler( extern int omap_prcm_event_to_irq(const char *event); extern void omap_prcm_irq_prepare(void); extern void omap_prcm_irq_complete(void); +void omap_pcs_legacy_init(int irq, void (*rearm)(void)); # endif diff --git a/arch/arm/mach-omap2/prm3xxx.c b/arch/arm/mach-omap2/prm3xxx.c index 9915cd6..f1d3e15 100644 --- a/arch/arm/mach-omap2/prm3xxx.c +++ b/arch/arm/mach-omap2/prm3xxx.c @@ -18,8 +18,6 @@ #include #include -#include "soc.h" -#include "common.h" #include "vp.h" #include "powerdomain.h" #include "prm3xxx.h" @@ -40,7 +38,7 @@ static struct omap_prcm_irq_setup omap3_prcm_irq_setup = { .nr_regs = 1, .irqs = omap3_prcm_irqs, .nr_irqs = ARRAY_SIZE(omap3_prcm_irqs), - .irq = 11 + OMAP_INTC_START, + .irq = 11 + NR_IRQS, .read_pending_irqs = &omap3xxx_prm_read_pending_irqs, .ocp_barrier = &omap3xxx_prm_ocp_barrier, .save_and_clear_irqen = &omap3xxx_prm_save_and_clear_irqen, diff --git a/arch/arm/mach-omap2/prm44xx.c b/arch/arm/mach-omap2/prm44xx.c index 206dcd9..27f4603 100644 --- a/arch/arm/mach-omap2/prm44xx.c +++ b/arch/arm/mach-omap2/prm44xx.c @@ -19,9 +19,6 @@ #include -#include "soc.h" -#include "iomap.h" -#include "common.h" #include "vp.h" #include "prm44xx.h" #include "prm54xx.h" @@ -33,6 +30,8 @@ /* Static data */ +#define OMAP44XX_IRQ_GIC_START 32 + static const struct omap_prcm_irq omap4_prcm_irqs[] = { OMAP_PRCM_IRQ("wkup", 0, 0), OMAP_PRCM_IRQ("io", 9, 1), diff --git a/arch/arm/mach-omap2/prm_common.c b/arch/arm/mach-omap2/prm_common.c index 5d5d564..b4ef9e4 100644 --- a/arch/arm/mach-omap2/prm_common.c +++ b/arch/arm/mach-omap2/prm_common.c @@ -28,12 +28,10 @@ #include #include -#include "soc.h" #include "prm2xxx_3xxx.h" #include "prm2xxx.h" #include "prm3xxx.h" #include "prm44xx.h" -#include "common.h" #include "clock.h" /* diff --git a/arch/arm/mach-omap2/prminst44xx.c b/arch/arm/mach-omap2/prminst44xx.c index d4a7919..bd0e0da 100644 --- a/arch/arm/mach-omap2/prminst44xx.c +++ b/arch/arm/mach-omap2/prminst44xx.c @@ -16,8 +16,6 @@ #include #include -#include "iomap.h" -#include "common.h" #include "prcm-common.h" #include "prm44xx.h" #include "prm54xx.h" @@ -26,7 +24,6 @@ #include "prm-regbits-44xx.h" #include "prcm44xx.h" #include "prcm_mpu44xx.h" -#include "soc.h" static void __iomem *_prm_bases[OMAP4_MAX_PRCM_PARTITIONS];