Received: by 2002:ac0:946b:0:0:0:0:0 with SMTP id j40csp2528968imj; Mon, 11 Feb 2019 04:29:58 -0800 (PST) X-Google-Smtp-Source: AHgI3IZDHxJL+gIwzlqRSQ/3Z5yhG7Ec4QywFY082LuyU04L3TzytAJl+hLjDjEu0Q4bXh9SZo1j X-Received: by 2002:a62:5182:: with SMTP id f124mr26692378pfb.238.1549888198061; Mon, 11 Feb 2019 04:29:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549888198; cv=none; d=google.com; s=arc-20160816; b=QwHwwB9SBWWBUW5q/75J0c9QkPmEfFd3GvUptPOhqXKpO5F/zUpLhbmFuyCjcxV9wb iiXIaZIWPOUj9aI8+WO+BlaDuhOBC/Cbdhcn8Inv+NBRxvVlSo2Pjs6HC0Kz/96O75cj NWTeishpmAtm9HKHVGD/MKaq270CBDjF/j2xCnOIxzZ7DjRO2F1Z3UEavapu9jLOI7Ae 1xi64Jf/4Hz5cD/VXrQkNtZswSRaiy3J9ZPZe9LRYgF8b7RHm4sGGdicFmBLuobkssZ7 ZrHvQdFxq2SKWaUm54gsM8/xxI+nnUy+0tV0b0b0WcTPhpuIQexqIrsPXf/e3XLUxTuU WHcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=xAHLRF3J06rWcMtazdECljGtU627vGPhieQV9I0Sumk=; b=I6cDj/uvyMfUEXdcPbwc/7o7igkRH24HHtqLUIjmyp2N+IihQYS0KMVrlJv/ySgI03 bq3q31mBYiPrMmh3KyQg6rHOdUn8lu2gT3+OyZ8biue4/joiPXUlwrgWRSBrzWGoRlTi YgvF1u73qxGF08ZLI+cGeibPE7kI4t2zwA5Ma2R83Ktg+3yN1fyhGk1YabZYGHfkVysW yXkh9bB5f9t7Ht+rMN24VM8kCbr+K3GNko6rY2xVlMIDLTaEVViFrTJ1Ke/+VZez/kWy SsmUyp+/07Z5i2lJ9y6yI5xAfjmfQd6ERd1WPXwNVr/6OWfcXg46CmCngAambOHxhSD5 y6aw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bgdev-pl.20150623.gappssmtp.com header.s=20150623 header.b=FnJ4b2pD; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 59si2976717plf.72.2019.02.11.04.29.40; Mon, 11 Feb 2019 04:29:58 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@bgdev-pl.20150623.gappssmtp.com header.s=20150623 header.b=FnJ4b2pD; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727764AbfBKM2y (ORCPT + 99 others); Mon, 11 Feb 2019 07:28:54 -0500 Received: from mail-wm1-f68.google.com ([209.85.128.68]:37912 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727197AbfBKM01 (ORCPT ); Mon, 11 Feb 2019 07:26:27 -0500 Received: by mail-wm1-f68.google.com with SMTP id v26so17020845wmh.3 for ; Mon, 11 Feb 2019 04:26:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xAHLRF3J06rWcMtazdECljGtU627vGPhieQV9I0Sumk=; b=FnJ4b2pD7L694VA13UlK1fq+8m3zlCs2BOxQJZDRUtBTUeI02+OZ6vkssFMXUUlWsA 8RUZWDPrl6neYCLFs+ltgVvG9JacW7e9SGANKcTFzA3RoZwEAmqOD/H1ik0Ga+6a72FC HR07XIv9/OMKjnyS0JUp3fs3JLeHBkKEwcJpWQ+Z4qICi+NPQ0MLJlBg+BJjXHBRzWrR eGy1jJXR9I3dtdJNfPQPViQVUrSewAUK8dHvkcgpulH9gRK2jECYKPZ+CRgGcirjnNQw TbB8Q8/B3TMZh12o7Sv0/kwNfLyYxvy8YnBvwUt7ZHlYFNxTx4fomqRaRexYVnD2cJEO xqYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xAHLRF3J06rWcMtazdECljGtU627vGPhieQV9I0Sumk=; b=Z3Kj4k/pLKwl5a1hsmlJFEBYkNxSuqMh7LEQIr5JuZyU+j+asXJeA7R3lHVM3c4ovT UyhhiaGgPr4LuFrrZFr2B8/P4cnIYgy1D+NQAuz/4JMZqqgcURPdX/h6DQHBI+MJLFjL V2LfTFDLYRWgQXnXmqqbLe5AknxoQs9o65L7geq9nRAeiyoSVp0oIOmlarC3CyzBw65E 72LYzFzA4fxI7RMnE8L/4t0KTKyIOcDPAEGhp1zlpuufeFGRkytaf4blYNfMCUM4+SxT iwZVIhCw4xKR+z+fKLLZH8di//pwLzoy5tvBXjcKIamo+zAGT9JvxyIwc7aiWaUiUlo+ Pyzg== X-Gm-Message-State: AHQUAuZI3wvh7OwOQItdibpuS5msdMls7edzC1EjEzp7KvIl0QHJjSP6 J155rb6bVHtBJJKys/Xq0YQ7rQ== X-Received: by 2002:a1c:ed0b:: with SMTP id l11mr8854133wmh.86.1549887983600; Mon, 11 Feb 2019 04:26:23 -0800 (PST) Received: from debian-brgl.home ([2a01:cb1d:af:5b00:6d6c:8493:1ab5:dad7]) by smtp.gmail.com with ESMTPSA id l20sm19494321wrb.93.2019.02.11.04.26.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 Feb 2019 04:26:22 -0800 (PST) From: Bartosz Golaszewski To: Sekhar Nori , Kevin Hilman , Thomas Gleixner , Jason Cooper , Marc Zyngier , David Lechner Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski Subject: [RESEND PATCH v2 08/33] ARM: davinci: make irqs.h a local header Date: Mon, 11 Feb 2019 13:25:41 +0100 Message-Id: <20190211122606.8662-9-brgl@bgdev.pl> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190211122606.8662-1-brgl@bgdev.pl> References: <20190211122606.8662-1-brgl@bgdev.pl> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Bartosz Golaszewski The existence of irqs.h in mach-davinci/include/mach only makes sense without SPARSE_IRQ as it's then expected to define NR_IRQS and is included from asm/irq.h. As we now support SPARSE_IRQ, this header can be moved to mach-davinci and used as the source of HW interrupt numbers. While updating the includes in various files - also rearrange the headers by directory (linux/asm/mach). Signed-off-by: Bartosz Golaszewski --- arch/arm/mach-davinci/board-da830-evm.c | 5 +++-- arch/arm/mach-davinci/board-da850-evm.c | 5 +++-- arch/arm/mach-davinci/board-dm644x-evm.c | 7 ++++--- arch/arm/mach-davinci/board-dm646x-evm.c | 3 ++- arch/arm/mach-davinci/da830.c | 2 +- arch/arm/mach-davinci/da850.c | 2 +- arch/arm/mach-davinci/devices-da8xx.c | 2 +- arch/arm/mach-davinci/devices.c | 9 ++++----- arch/arm/mach-davinci/dm355.c | 2 +- arch/arm/mach-davinci/dm365.c | 2 +- arch/arm/mach-davinci/dm644x.c | 2 +- arch/arm/mach-davinci/dm646x.c | 2 +- arch/arm/mach-davinci/irq.c | 3 ++- arch/arm/mach-davinci/{include/mach => }/irqs.h | 0 arch/arm/mach-davinci/usb-da8xx.c | 3 ++- arch/arm/mach-davinci/usb.c | 7 ++++--- 16 files changed, 31 insertions(+), 25 deletions(-) rename arch/arm/mach-davinci/{include/mach => }/irqs.h (100%) diff --git a/arch/arm/mach-davinci/board-da830-evm.c b/arch/arm/mach-davinci/board-da830-evm.c index 41f5a51fee9a..7b8c4aeca096 100644 --- a/arch/arm/mach-davinci/board-da830-evm.c +++ b/arch/arm/mach-davinci/board-da830-evm.c @@ -36,11 +36,12 @@ #include #include -#include -#include "cp_intc.h" #include #include +#include "cp_intc.h" +#include "irqs.h" + #define DA830_EVM_PHY_ID "" /* * USB1 VBUS is controlled by GPIO1[15], over-current is reported on GPIO2[4]. diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c index 317f48560534..b0814bd30a1f 100644 --- a/arch/arm/mach-davinci/board-da850-evm.c +++ b/arch/arm/mach-davinci/board-da850-evm.c @@ -43,10 +43,11 @@ #include #include -#include "cp_intc.h" #include #include -#include + +#include "cp_intc.h" +#include "irqs.h" #include "sram.h" #include diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c index 16ffed2525e6..a6bc48c9ecd9 100644 --- a/arch/arm/mach-davinci/board-dm644x-evm.c +++ b/arch/arm/mach-davinci/board-dm644x-evm.c @@ -36,10 +36,10 @@ #include #include -#include -#include -#include #include +#include + +#include #include #include #include @@ -47,6 +47,7 @@ #include #include "davinci.h" +#include "irqs.h" #define DM644X_EVM_PHY_ID "davinci_mdio-0:01" #define LXT971_PHY_ID (0x001378e2) diff --git a/arch/arm/mach-davinci/board-dm646x-evm.c b/arch/arm/mach-davinci/board-dm646x-evm.c index 8d5be6dd2019..26c123f35350 100644 --- a/arch/arm/mach-davinci/board-dm646x-evm.c +++ b/arch/arm/mach-davinci/board-dm646x-evm.c @@ -44,10 +44,11 @@ #include #include -#include + #include #include "davinci.h" +#include "irqs.h" #define NAND_BLOCK_SIZE SZ_128K diff --git a/arch/arm/mach-davinci/da830.c b/arch/arm/mach-davinci/da830.c index aa8da725a325..ca903c9105e4 100644 --- a/arch/arm/mach-davinci/da830.c +++ b/arch/arm/mach-davinci/da830.c @@ -19,9 +19,9 @@ #include #include #include -#include #include +#include "irqs.h" #include "mux.h" /* Offsets of the 8 compare registers on the da830 */ diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c index d22b19833326..486d53481636 100644 --- a/arch/arm/mach-davinci/da850.c +++ b/arch/arm/mach-davinci/da850.c @@ -32,10 +32,10 @@ #include #include #include -#include #include #include +#include "irqs.h" #include "mux.h" #define DA850_PLL1_BASE 0x01e1a000 diff --git a/arch/arm/mach-davinci/devices-da8xx.c b/arch/arm/mach-davinci/devices-da8xx.c index 3104a3eb2ddf..b8dc674e06bc 100644 --- a/arch/arm/mach-davinci/devices-da8xx.c +++ b/arch/arm/mach-davinci/devices-da8xx.c @@ -25,10 +25,10 @@ #include #include #include -#include #include "asp.h" #include "cpuidle.h" +#include "irqs.h" #include "sram.h" #define DA8XX_TPCC_BASE 0x01c00000 diff --git a/arch/arm/mach-davinci/devices.c b/arch/arm/mach-davinci/devices.c index 722c463f9b18..40bd8029e457 100644 --- a/arch/arm/mach-davinci/devices.c +++ b/arch/arm/mach-davinci/devices.c @@ -11,21 +11,20 @@ #include #include +#include +#include +#include #include #include #include #include -#include -#include #include #include -#include #include -#include - #include "davinci.h" +#include "irqs.h" #define DAVINCI_I2C_BASE 0x01C21000 #define DAVINCI_ATA_BASE 0x01C66000 diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c index cb725244fa13..b27ea4fc1d51 100644 --- a/arch/arm/mach-davinci/dm355.c +++ b/arch/arm/mach-davinci/dm355.c @@ -26,13 +26,13 @@ #include #include -#include #include #include #include #include "asp.h" #include "davinci.h" +#include "irqs.h" #include "mux.h" #define DM355_UART2_BASE (IO_PHYS + 0x206000) diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c index ae1b53ea956a..d9c6ab9215a6 100644 --- a/arch/arm/mach-davinci/dm365.c +++ b/arch/arm/mach-davinci/dm365.c @@ -31,13 +31,13 @@ #include #include -#include #include #include #include #include "asp.h" #include "davinci.h" +#include "irqs.h" #include "mux.h" #define DM365_REF_FREQ 24000000 /* 24 MHz on the DM365 EVM */ diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c index 5ccb49196a71..b2748c82b747 100644 --- a/arch/arm/mach-davinci/dm644x.c +++ b/arch/arm/mach-davinci/dm644x.c @@ -23,13 +23,13 @@ #include #include -#include #include #include #include #include "asp.h" #include "davinci.h" +#include "irqs.h" #include "mux.h" /* diff --git a/arch/arm/mach-davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c index 2b55625e8fb5..cf210741dfe5 100644 --- a/arch/arm/mach-davinci/dm646x.c +++ b/arch/arm/mach-davinci/dm646x.c @@ -24,13 +24,13 @@ #include #include -#include #include #include #include #include "asp.h" #include "davinci.h" +#include "irqs.h" #include "mux.h" #define DAVINCI_VPIF_BASE (0x01C12000) diff --git a/arch/arm/mach-davinci/irq.c b/arch/arm/mach-davinci/irq.c index 16ac28833eb4..88c30759d1c5 100644 --- a/arch/arm/mach-davinci/irq.c +++ b/arch/arm/mach-davinci/irq.c @@ -28,10 +28,11 @@ #include #include #include -#include #include #include +#include "irqs.h" + #define FIQ_REG0_OFFSET 0x0000 #define FIQ_REG1_OFFSET 0x0004 #define IRQ_REG0_OFFSET 0x0008 diff --git a/arch/arm/mach-davinci/include/mach/irqs.h b/arch/arm/mach-davinci/irqs.h similarity index 100% rename from arch/arm/mach-davinci/include/mach/irqs.h rename to arch/arm/mach-davinci/irqs.h diff --git a/arch/arm/mach-davinci/usb-da8xx.c b/arch/arm/mach-davinci/usb-da8xx.c index 2de5a04ffc24..25f21ee86f1a 100644 --- a/arch/arm/mach-davinci/usb-da8xx.c +++ b/arch/arm/mach-davinci/usb-da8xx.c @@ -18,7 +18,8 @@ #include #include #include -#include + +#include "irqs.h" #define DA8XX_USB0_BASE 0x01e00000 #define DA8XX_USB1_BASE 0x01e25000 diff --git a/arch/arm/mach-davinci/usb.c b/arch/arm/mach-davinci/usb.c index 9d4a58a3113a..cde72ba35dc3 100644 --- a/arch/arm/mach-davinci/usb.c +++ b/arch/arm/mach-davinci/usb.c @@ -5,13 +5,14 @@ #include #include #include - +#include #include #include -#include #include -#include + + +#include "irqs.h" #define DAVINCI_USB_OTG_BASE 0x01c64000 -- 2.20.1