From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 83BCBC282CB for ; Fri, 8 Feb 2019 17:37:21 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 29EAA2146E for ; Fri, 8 Feb 2019 17:37:21 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="fGsRHWj9"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=bgdev-pl.20150623.gappssmtp.com header.i=@bgdev-pl.20150623.gappssmtp.com header.b="MHhXc71Q" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 29EAA2146E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=kgVnOoJUfVtWhTirq+Rb35Qt7rHO+m14qvECmKUG68U=; b=fGsRHWj9NEqfek UM+tJbdzFsHQajmcng5d7u6oeEs61Sb4eoJn5Sn+tj6rgLHQONUph/AVqtoSZrgHU/HdxaopvY1NZ xwB6S9yE+MbYtU6ilIEiq8P18Z09RuJxPFhLOrXofI8Bk8STriu730sQt2W93+PVU+SOWkP4BI7Vd c9fT6QWr0eS1QYO+ZKmLrehPDMa7f4FJcNxqiUOvc2v02P4n/Eirkl6a6aWDA5caVTMnlUv0qLNuW RQ3KM+jHmm3v7zG6AMiG6bhs/Evup9rar0qHUWtKytsOi0/iq0H+Zet7wAtnVPEgmZrxz+HIJSG3K RdX70L1Nc36tDEIvGr7Q==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gsA5T-0000ZI-BI; Fri, 08 Feb 2019 17:37:15 +0000 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gsA3Z-000787-A6 for linux-arm-kernel@lists.infradead.org; Fri, 08 Feb 2019 17:35:32 +0000 Received: by mail-wm1-x341.google.com with SMTP id m1so4364370wml.2 for ; Fri, 08 Feb 2019 09:35:17 -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=MHhXc71QrcJceQYX8GYJlYmT+KpzXqxKkzLRFtpwkIDjAcvV6LJ6pUfWpkJSgt0V7+ qFftg8HIwJqw6bkSO+p5ZjtqsheHhEMgIINh3rlyyk4yPvGyQPF/G3WCwptQX5sETe9w qfD416AhKQKY+C7cbxY7dT/GvImcGYUR2moPnZRPrWnWwi6g3a9jACbs8cNdHu0+fmBI 8miYLiCrFkD5LM+s5bCp5ExbZRVbcQiCHFt8suah5d+Kt9DcN64niBpVJSJkJXgXglLP 1M4dnb0yjVRevKhzEIiXxbGaOSRfoaBuFif/hI9SiikJvOEVPODmUB6P4QxNDhBWg80v pT3w== 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=Ifp71x06fSK+QBrw2DIap4qCECDtta+uj1NGwPrmnfeQX/YBxmfXrpw95To0KbI7XC 39N9MUNtcd5ct3ai/fjkh6w5/3+iVaefd2mk+bMbf/CznBLz41l32TBpN0JP6l0qJGYj EY5IeiFr1N91MyNMMSghdNKkQ7Xo8qRLAZcn9ov6gXW4tc9JA/hbpldnncIuYR7x4ejH NkjZI43fVZ0fQ5ApGmU3HhXZcuK/GZ7MmvyURPQ8SnQ6jzrG9qbPjyxhWkjtMF2sYVpP IsV4zyFJzuC92LmAyhJWn3O2HsXSCd3wKb/L1o/Zrr8M6CfC5rPNZkDF2UShDhNWMxt9 3lrA== X-Gm-Message-State: AHQUAuZGmqHnhDkbGj0RmFIgviJn5T0hAVcVvpP36+rfDBrs/CDunPCm T1MbsGOZay7BSvt10XyGIDFwAA== X-Google-Smtp-Source: AHgI3IYcHvDkHeWdpW8nyfUr0ofwXJFgZaYhkH9h4rzzMr0D5/ysnGrP0KusG4mWkQPz3E78Y5iCKA== X-Received: by 2002:adf:e290:: with SMTP id v16mr2951747wri.100.1549647315841; Fri, 08 Feb 2019 09:35:15 -0800 (PST) Received: from debian-brgl.home ([2a01:cb1d:af:5b00:6d6c:8493:1ab5:dad7]) by smtp.gmail.com with ESMTPSA id p17sm354714wrv.59.2019.02.08.09.35.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Feb 2019 09:35:15 -0800 (PST) From: Bartosz Golaszewski To: Sekhar Nori , Kevin Hilman , Daniel Lezcano , Rob Herring , Mark Rutland , Thomas Gleixner , David Lechner Subject: [PATCH v2 08/33] ARM: davinci: make irqs.h a local header Date: Fri, 8 Feb 2019 18:34:33 +0100 Message-Id: <20190208173458.4801-9-brgl@bgdev.pl> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190208173458.4801-1-brgl@bgdev.pl> References: <20190208173458.4801-1-brgl@bgdev.pl> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190208_093517_841650_3E8204AE X-CRM114-Status: GOOD ( 13.93 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Bartosz Golaszewski Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.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 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel