From patchwork Mon Sep 15 21:15:02 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Balbi X-Patchwork-Id: 37430 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-we0-f198.google.com (mail-we0-f198.google.com [74.125.82.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 18EEF206A5 for ; Mon, 15 Sep 2014 21:16:12 +0000 (UTC) Received: by mail-we0-f198.google.com with SMTP id p10sf2569561wes.1 for ; Mon, 15 Sep 2014 14:16:11 -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=NKxEyYGKReWnWV6IYm+nb7UqjGBCI3TtktOd9S8G5MM=; b=THhWYAD7GlBHGao1f/yjtQrlKpcbNOw89GgC8RQz1cf9v5OQ4VoKaCEIhy96ktIV4h KBZWWyjc9INTALqRfxJN6jZXsyohdEzLkCi8llhMU0eNZBUNZmsTzDIqvMcMMs9FmeJJ 2hy1rS57r+UHLGnBmt2VcCr/7r05szaaiSf/MazOagQOO1yiL+JwjlPG5ilD+AG5YFjq 4ONhsjt/kZoqJLMfu3SGPtsBH2nlu0fAD2JMLpq0tykaWPMldMAsOBs1SIGWJsZWyRVX 6YQEsbdvOq7S3V1qzyAJH0pIJUyd/4CDG3nr+iAbVPpuFpRaMg1wlSOHYPSACjO1Grla hhpQ== X-Gm-Message-State: ALoCoQmtcSmoQsq1z3vpmTTpv19FX6ZO+KI1gpj+7IDYeAV+dKFejTqlwAW28vaYVRRYIxbdyLwD X-Received: by 10.194.235.166 with SMTP id un6mr7466957wjc.2.1410815771227; Mon, 15 Sep 2014 14:16:11 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.204.99 with SMTP id kx3ls418569lac.7.gmail; Mon, 15 Sep 2014 14:16:10 -0700 (PDT) X-Received: by 10.152.44.230 with SMTP id h6mr31440644lam.51.1410815770942; Mon, 15 Sep 2014 14:16:10 -0700 (PDT) Received: from mail-lb0-f178.google.com (mail-lb0-f178.google.com [209.85.217.178]) by mx.google.com with ESMTPS id di11si21056034lac.67.2014.09.15.14.16.10 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 15 Sep 2014 14:16:10 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.178 as permitted sender) client-ip=209.85.217.178; Received: by mail-lb0-f178.google.com with SMTP id c11so5324387lbj.9 for ; Mon, 15 Sep 2014 14:16:10 -0700 (PDT) X-Received: by 10.112.53.230 with SMTP id e6mr5957942lbp.100.1410815770874; Mon, 15 Sep 2014 14:16:10 -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.112.130.169 with SMTP id of9csp289792lbb; Mon, 15 Sep 2014 14:16:10 -0700 (PDT) X-Received: by 10.66.138.46 with SMTP id qn14mr41926117pab.77.1410815769181; Mon, 15 Sep 2014 14:16:09 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id fk2si25356202pdb.228.2014.09.15.14.16.08 for ; Mon, 15 Sep 2014 14:16:09 -0700 (PDT) Received-SPF: none (google.com: linux-omap-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 S1754536AbaIOVQH (ORCPT + 5 others); Mon, 15 Sep 2014 17:16:07 -0400 Received: from devils.ext.ti.com ([198.47.26.153]:54199 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754473AbaIOVQE (ORCPT ); Mon, 15 Sep 2014 17:16:04 -0400 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id s8FLFWn6029760; Mon, 15 Sep 2014 16:15:32 -0500 Received: from DFLE72.ent.ti.com (dfle72.ent.ti.com [128.247.5.109]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id s8FLFWkq010253; Mon, 15 Sep 2014 16:15:32 -0500 Received: from dflp32.itg.ti.com (10.64.6.15) by DFLE72.ent.ti.com (128.247.5.109) with Microsoft SMTP Server id 14.3.174.1; Mon, 15 Sep 2014 16:15:32 -0500 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp32.itg.ti.com (8.14.3/8.13.8) with ESMTP id s8FLFVf8032616; Mon, 15 Sep 2014 16:15:32 -0500 From: Felipe Balbi To: Tony Lindgren CC: Jason Cooper , Linux OMAP Mailing List , Linux ARM Kernel Mailing List , Felipe Balbi Subject: [PATCH 2/9] arm: omap: irq: move irq.c to drivers/irqchip/ Date: Mon, 15 Sep 2014 16:15:02 -0500 Message-ID: <1410815709-462-3-git-send-email-balbi@ti.com> X-Mailer: git-send-email 2.0.1.563.g66f467c In-Reply-To: <1410815709-462-1-git-send-email-balbi@ti.com> References: <1410815709-462-1-git-send-email-balbi@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: balbi@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.217.178 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: , Just move the code over as it has no dependencies on arch/arm/ anymore. Signed-off-by: Felipe Balbi --- arch/arm/mach-omap2/Kconfig | 1 + arch/arm/mach-omap2/Makefile | 3 +-- drivers/irqchip/Kconfig | 5 +++++ drivers/irqchip/Makefile | 1 + arch/arm/mach-omap2/irq.c => drivers/irqchip/irq-omap-intc.c | 9 +++++---- 5 files changed, 13 insertions(+), 6 deletions(-) rename arch/arm/mach-omap2/irq.c => drivers/irqchip/irq-omap-intc.c (98%) diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index 11ccf0b..691d62a 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig @@ -86,6 +86,7 @@ config ARCH_OMAP2PLUS select PINCTRL select SOC_BUS select TI_PRIV_EDMA + select OMAP_IRQCHIP help Systems based on OMAP2, OMAP3, OMAP4 or OMAP5 diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index 69bbcba..0b6095c 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -10,7 +10,6 @@ obj-y := id.o io.o control.o mux.o devices.o fb.o serial.o gpmc.o timer.o pm.o \ common.o gpio.o dma.o wd_timer.o display.o i2c.o hdq1w.o omap_hwmod.o \ omap_device.o sram.o drm.o -omap-2-3-common = irq.o hwmod-common = omap_hwmod.o omap_hwmod_reset.o \ omap_hwmod_common_data.o clock-common = clock.o clock_common_data.o \ @@ -20,7 +19,7 @@ secure-common = omap-smc.o omap-secure.o obj-$(CONFIG_ARCH_OMAP2) += $(omap-2-3-common) $(hwmod-common) obj-$(CONFIG_ARCH_OMAP3) += $(omap-2-3-common) $(hwmod-common) $(secure-common) obj-$(CONFIG_ARCH_OMAP4) += $(hwmod-common) $(secure-common) -obj-$(CONFIG_SOC_AM33XX) += irq.o $(hwmod-common) +obj-$(CONFIG_SOC_AM33XX) += $(hwmod-common) obj-$(CONFIG_SOC_OMAP5) += $(hwmod-common) $(secure-common) obj-$(CONFIG_SOC_AM43XX) += $(hwmod-common) $(secure-common) obj-$(CONFIG_SOC_DRA7XX) += $(hwmod-common) $(secure-common) diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig index b8632bf..9d539de 100644 --- a/drivers/irqchip/Kconfig +++ b/drivers/irqchip/Kconfig @@ -75,6 +75,11 @@ config OR1K_PIC bool select IRQ_DOMAIN +config OMAP_IRQCHIP + bool + select GENERIC_IRQ_CHIP + select IRQ_DOMAIN + config ORION_IRQCHIP bool select IRQ_DOMAIN diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile index 73052ba..d0a2613 100644 --- a/drivers/irqchip/Makefile +++ b/drivers/irqchip/Makefile @@ -13,6 +13,7 @@ obj-$(CONFIG_ARCH_MOXART) += irq-moxart.o obj-$(CONFIG_CLPS711X_IRQCHIP) += irq-clps711x.o obj-$(CONFIG_OR1K_PIC) += irq-or1k-pic.o obj-$(CONFIG_ORION_IRQCHIP) += irq-orion.o +obj-$(CONFIG_OMAP_IRQCHIP) += irq-omap-intc.o obj-$(CONFIG_ARCH_SUNXI) += irq-sun4i.o obj-$(CONFIG_ARCH_SUNXI) += irq-sunxi-nmi.o obj-$(CONFIG_ARCH_SPEAR3XX) += spear-shirq.o diff --git a/arch/arm/mach-omap2/irq.c b/drivers/irqchip/irq-omap-intc.c similarity index 98% rename from arch/arm/mach-omap2/irq.c rename to drivers/irqchip/irq-omap-intc.c index b2993e4..1478f1a 100644 --- a/arch/arm/mach-omap2/irq.c +++ b/drivers/irqchip/irq-omap-intc.c @@ -17,15 +17,16 @@ #include #include -#include #include #include #include #include -#include "soc.h" -#include "common.h" -#include "../../drivers/irqchip/irqchip.h" +#include "irqchip.h" + +/* Define these here for now until we drop all board-files */ +#define OMAP24XX_IC_BASE 0x480fe000 +#define OMAP34XX_IC_BASE 0x48200000 /* selected INTC register offsets */