From: Bartosz Golaszewski <brgl@bgdev.pl>
To: Dmitry Torokhov <dmitry.torokhov@gmail.com>,
Sekhar Nori <nsekhar@ti.com>, Kevin Hilman <khilman@kernel.org>,
Thomas Gleixner <tglx@linutronix.de>,
Jason Cooper <jason@lakedaemon.net>,
Marc Zyngier <marc.zyngier@arm.com>,
David Lechner <david@lechnology.com>
Cc: Bartosz Golaszewski <bgolaszewski@baylibre.com>,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH v4 23/37] ARM: davinci: cp-intc: remove cp_intc.h
Date: Thu, 14 Feb 2019 15:52:17 +0100 [thread overview]
Message-ID: <20190214145231.8750-24-brgl@bgdev.pl> (raw)
In-Reply-To: <20190214145231.8750-1-brgl@bgdev.pl>
From: Bartosz Golaszewski <bgolaszewski@baylibre.com>
There's no need to have a local header for cp-intc. Move the only
declaration for a public function to common.h. Move all register
offsets into the driver source file and drop all unused defines.
Make cp_intc_of_init() static.
Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Reviewed-by: David Lechner <david@lechnology.com>
---
arch/arm/mach-davinci/board-da830-evm.c | 1 -
arch/arm/mach-davinci/board-da850-evm.c | 1 -
arch/arm/mach-davinci/board-mityomapl138.c | 1 -
arch/arm/mach-davinci/board-omapl138-hawk.c | 1 -
arch/arm/mach-davinci/cp_intc.c | 20 +++++++-
arch/arm/mach-davinci/cp_intc.h | 57 ---------------------
arch/arm/mach-davinci/include/mach/common.h | 1 +
7 files changed, 19 insertions(+), 63 deletions(-)
delete mode 100644 arch/arm/mach-davinci/cp_intc.h
diff --git a/arch/arm/mach-davinci/board-da830-evm.c b/arch/arm/mach-davinci/board-da830-evm.c
index 7b8c4aeca096..f81c92b9cf07 100644
--- a/arch/arm/mach-davinci/board-da830-evm.c
+++ b/arch/arm/mach-davinci/board-da830-evm.c
@@ -39,7 +39,6 @@
#include <mach/mux.h>
#include <mach/da8xx.h>
-#include "cp_intc.h"
#include "irqs.h"
#define DA830_EVM_PHY_ID ""
diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c
index b0814bd30a1f..1cc49e7bf128 100644
--- a/arch/arm/mach-davinci/board-da850-evm.c
+++ b/arch/arm/mach-davinci/board-da850-evm.c
@@ -46,7 +46,6 @@
#include <mach/da8xx.h>
#include <mach/mux.h>
-#include "cp_intc.h"
#include "irqs.h"
#include "sram.h"
diff --git a/arch/arm/mach-davinci/board-mityomapl138.c b/arch/arm/mach-davinci/board-mityomapl138.c
index 8df16e81b69e..eb6a9465f229 100644
--- a/arch/arm/mach-davinci/board-mityomapl138.c
+++ b/arch/arm/mach-davinci/board-mityomapl138.c
@@ -27,7 +27,6 @@
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <mach/common.h>
-#include "cp_intc.h"
#include <mach/da8xx.h>
#include <linux/platform_data/mtd-davinci.h>
#include <linux/platform_data/mtd-davinci-aemif.h>
diff --git a/arch/arm/mach-davinci/board-omapl138-hawk.c b/arch/arm/mach-davinci/board-omapl138-hawk.c
index 94c4f126ef86..7f852722ff08 100644
--- a/arch/arm/mach-davinci/board-omapl138-hawk.c
+++ b/arch/arm/mach-davinci/board-omapl138-hawk.c
@@ -27,7 +27,6 @@
#include <asm/mach/arch.h>
#include <mach/common.h>
-#include "cp_intc.h"
#include <mach/da8xx.h>
#include <mach/mux.h>
diff --git a/arch/arm/mach-davinci/cp_intc.c b/arch/arm/mach-davinci/cp_intc.c
index 4e293cde20fb..82110d332c82 100644
--- a/arch/arm/mach-davinci/cp_intc.c
+++ b/arch/arm/mach-davinci/cp_intc.c
@@ -21,7 +21,22 @@
#include <asm/exception.h>
#include <mach/common.h>
-#include "cp_intc.h"
+
+#define CP_INTC_CTRL 0x04
+#define CP_INTC_HOST_CTRL 0x0C
+#define CP_INTC_GLOBAL_ENABLE 0x10
+#define CP_INTC_SYS_STAT_IDX_CLR 0x24
+#define CP_INTC_SYS_ENABLE_IDX_SET 0x28
+#define CP_INTC_SYS_ENABLE_IDX_CLR 0x2C
+#define CP_INTC_HOST_ENABLE_IDX_SET 0x34
+#define CP_INTC_HOST_ENABLE_IDX_CLR 0x38
+#define CP_INTC_PRIO_IDX 0x80
+#define CP_INTC_SYS_STAT_CLR(n) (0x0280 + (n << 2))
+#define CP_INTC_SYS_ENABLE_CLR(n) (0x0380 + (n << 2))
+#define CP_INTC_CHAN_MAP(n) (0x0400 + (n << 2))
+#define CP_INTC_SYS_POLARITY(n) (0x0D00 + (n << 2))
+#define CP_INTC_SYS_TYPE(n) (0x0D80 + (n << 2))
+#define CP_INTC_HOST_ENABLE(n) (0x1500 + (n << 2))
#define DAVINCI_CP_INTC_PRI_INDX_MASK GENMASK(9, 0)
#define DAVINCI_CP_INTC_GPIR_NONE BIT(31)
@@ -141,7 +156,8 @@ static const struct irq_domain_ops cp_intc_host_ops = {
.xlate = irq_domain_xlate_onetwocell,
};
-int __init cp_intc_of_init(struct device_node *node, struct device_node *parent)
+static int __init cp_intc_of_init(struct device_node *node,
+ struct device_node *parent)
{
u32 num_irq = davinci_soc_info.intc_irq_num;
u8 *irq_prio = davinci_soc_info.intc_irq_prios;
diff --git a/arch/arm/mach-davinci/cp_intc.h b/arch/arm/mach-davinci/cp_intc.h
deleted file mode 100644
index 827bbe9baed4..000000000000
--- a/arch/arm/mach-davinci/cp_intc.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * TI Common Platform Interrupt Controller (cp_intc) definitions
- *
- * Author: Steve Chen <schen@mvista.com>
- * Copyright (C) 2008-2009, MontaVista Software, Inc. <source@mvista.com>
- *
- * This file is licensed under the terms of the GNU General Public License
- * version 2. This program is licensed "as is" without any warranty of any
- * kind, whether express or implied.
- */
-#ifndef __ASM_HARDWARE_CP_INTC_H
-#define __ASM_HARDWARE_CP_INTC_H
-
-#define CP_INTC_REV 0x00
-#define CP_INTC_CTRL 0x04
-#define CP_INTC_HOST_CTRL 0x0C
-#define CP_INTC_GLOBAL_ENABLE 0x10
-#define CP_INTC_GLOBAL_NESTING_LEVEL 0x1C
-#define CP_INTC_SYS_STAT_IDX_SET 0x20
-#define CP_INTC_SYS_STAT_IDX_CLR 0x24
-#define CP_INTC_SYS_ENABLE_IDX_SET 0x28
-#define CP_INTC_SYS_ENABLE_IDX_CLR 0x2C
-#define CP_INTC_GLOBAL_WAKEUP_ENABLE 0x30
-#define CP_INTC_HOST_ENABLE_IDX_SET 0x34
-#define CP_INTC_HOST_ENABLE_IDX_CLR 0x38
-#define CP_INTC_PACING_PRESCALE 0x40
-#define CP_INTC_VECTOR_BASE 0x50
-#define CP_INTC_VECTOR_SIZE 0x54
-#define CP_INTC_VECTOR_NULL 0x58
-#define CP_INTC_PRIO_IDX 0x80
-#define CP_INTC_PRIO_VECTOR 0x84
-#define CP_INTC_SECURE_ENABLE 0x90
-#define CP_INTC_SECURE_PRIO_IDX 0x94
-#define CP_INTC_PACING_PARAM(n) (0x0100 + (n << 4))
-#define CP_INTC_PACING_DEC(n) (0x0104 + (n << 4))
-#define CP_INTC_PACING_MAP(n) (0x0108 + (n << 4))
-#define CP_INTC_SYS_RAW_STAT(n) (0x0200 + (n << 2))
-#define CP_INTC_SYS_STAT_CLR(n) (0x0280 + (n << 2))
-#define CP_INTC_SYS_ENABLE_SET(n) (0x0300 + (n << 2))
-#define CP_INTC_SYS_ENABLE_CLR(n) (0x0380 + (n << 2))
-#define CP_INTC_CHAN_MAP(n) (0x0400 + (n << 2))
-#define CP_INTC_HOST_MAP(n) (0x0800 + (n << 2))
-#define CP_INTC_HOST_PRIO_IDX(n) (0x0900 + (n << 2))
-#define CP_INTC_SYS_POLARITY(n) (0x0D00 + (n << 2))
-#define CP_INTC_SYS_TYPE(n) (0x0D80 + (n << 2))
-#define CP_INTC_WAKEUP_ENABLE(n) (0x0E00 + (n << 2))
-#define CP_INTC_DEBUG_SELECT(n) (0x0F00 + (n << 2))
-#define CP_INTC_SYS_SECURE_ENABLE(n) (0x1000 + (n << 2))
-#define CP_INTC_HOST_NESTING_LEVEL(n) (0x1100 + (n << 2))
-#define CP_INTC_HOST_ENABLE(n) (0x1500 + (n << 2))
-#define CP_INTC_HOST_PRIO_VECTOR(n) (0x1600 + (n << 2))
-#define CP_INTC_VECTOR_ADDR(n) (0x2000 + (n << 2))
-
-void cp_intc_init(void);
-int cp_intc_of_init(struct device_node *, struct device_node *);
-
-#endif /* __ASM_HARDWARE_CP_INTC_H */
diff --git a/arch/arm/mach-davinci/include/mach/common.h b/arch/arm/mach-davinci/include/mach/common.h
index 14e0e1c40611..3f3f1169d47e 100644
--- a/arch/arm/mach-davinci/include/mach/common.h
+++ b/arch/arm/mach-davinci/include/mach/common.h
@@ -22,6 +22,7 @@
#define DAVINCI_INTC_START NR_IRQS
#define DAVINCI_INTC_IRQ(_irqnum) (DAVINCI_INTC_START + (_irqnum))
+void cp_intc_init(void);
void davinci_timer_init(struct clk *clk);
struct davinci_timer_instance {
--
2.20.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-02-14 15:11 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-14 14:51 [PATCH v4 00/37] ARM: davinci: modernize the irq support Bartosz Golaszewski
2019-02-14 14:51 ` [PATCH v4 01/37] input: davinci_keyscan: remove unnecessary includes Bartosz Golaszewski
2019-02-15 7:37 ` Dmitry Torokhov
2019-02-14 14:51 ` [PATCH v4 02/37] ARM: davinci: remove intc_host_map from davinci_soc_info struct Bartosz Golaszewski
2019-02-14 14:51 ` [PATCH v4 03/37] ARM: davinci: aintc: use irq domain Bartosz Golaszewski
2019-02-17 9:24 ` David Lechner
2019-02-14 14:51 ` [PATCH v4 04/37] ARM: davinci: select GENERIC_IRQ_MULTI_HANDLER Bartosz Golaszewski
2019-02-14 14:51 ` [PATCH v4 05/37] ARM: davinci: remove davinci_intc_type Bartosz Golaszewski
2019-02-14 14:52 ` [PATCH v4 06/37] ARM: davinci: pull davinci_intc_base into the respective intc drivers Bartosz Golaszewski
2019-02-14 14:52 ` [PATCH v4 07/37] ARM: davinci: wrap HW interrupt numbers with a macro Bartosz Golaszewski
2019-02-17 9:29 ` David Lechner
2019-02-14 14:52 ` [PATCH v4 08/37] ARM: davinci: select SPARSE_IRQ Bartosz Golaszewski
2019-02-14 14:52 ` [PATCH v4 09/37] ARM: davinci: make irqs.h a local header Bartosz Golaszewski
2019-02-17 9:38 ` David Lechner
2019-02-14 14:52 ` [PATCH v4 10/37] ARM: davinci: aintc: drop GPL license boilerplate Bartosz Golaszewski
2019-02-14 14:52 ` [PATCH v4 11/37] ARM: davinci: aintc: wrap davinci_irq_init() with a helper Bartosz Golaszewski
2019-02-14 14:52 ` [PATCH v4 12/37] ARM: davinci: aintc: use a common prefix for symbols in the driver Bartosz Golaszewski
2019-02-14 14:52 ` [PATCH v4 13/37] ARM: davinci: aintc: drop the 00 prefix from register offsets Bartosz Golaszewski
2019-02-14 14:52 ` [PATCH v4 14/37] ARM: davinci: aintc: use readl/writel_relaxed() Bartosz Golaszewski
2019-02-17 9:39 ` David Lechner
2019-02-14 14:52 ` [PATCH v4 15/37] irqchip: davinci-aintc: add a new config structure Bartosz Golaszewski
2019-02-17 9:41 ` David Lechner
2019-02-14 14:52 ` [PATCH v4 16/37] ARM: davinci: aintc: use the new irqchip config structure in dm* SoCs Bartosz Golaszewski
2019-02-17 9:46 ` David Lechner
2019-02-14 14:52 ` [PATCH v4 17/37] ARM: davinci: aintc: use the new config structure Bartosz Golaszewski
2019-02-14 14:52 ` [PATCH v4 18/37] ARM: davinci: aintc: unify error handling Bartosz Golaszewski
2019-02-14 14:52 ` [PATCH v4 19/37] ARM: davinci: aintc: request memory region before remapping it Bartosz Golaszewski
2019-02-17 9:50 ` David Lechner
2019-02-14 14:52 ` [PATCH v4 20/37] ARM: davinci: aintc: remove the timer-specific irq_set_handler() Bartosz Golaszewski
2019-02-14 14:52 ` [PATCH v4 21/37] ARM: davinci: aintc: remove unnecessary includes Bartosz Golaszewski
2019-02-14 14:52 ` [PATCH v4 22/37] irqchip: davinci-aintc: move the driver to drivers/irqchip Bartosz Golaszewski
2019-02-17 9:51 ` David Lechner
2019-02-14 14:52 ` Bartosz Golaszewski [this message]
2019-02-14 14:52 ` [PATCH v4 24/37] ARM: davinci: cp-intc: add a wrapper around cp_intc_init() Bartosz Golaszewski
2019-02-14 14:52 ` [PATCH v4 25/37] irqchip: davinci-cp-intc: add a new config structure Bartosz Golaszewski
2019-02-17 9:53 ` David Lechner
2019-02-14 14:52 ` [PATCH v4 26/37] ARM: davinci: cp-intc: add the new config structures for da8xx SoCs Bartosz Golaszewski
2019-02-17 9:53 ` David Lechner
2019-02-14 14:52 ` [PATCH v4 27/37] ARM: davinci: cp-intc: use a common prefix for all symbols Bartosz Golaszewski
2019-02-14 14:52 ` [PATCH v4 28/37] ARM: davinci: cp-intc: convert all hex numbers to lowercase Bartosz Golaszewski
2019-02-14 14:52 ` [PATCH v4 29/37] ARM: davinci: cp-intc: use the new-style config structure Bartosz Golaszewski
2019-02-17 9:56 ` David Lechner
2019-02-14 14:52 ` [PATCH v4 30/37] ARM: davinci: cp-intc: request the memory region before remapping it Bartosz Golaszewski
2019-02-17 9:56 ` David Lechner
2019-02-14 14:52 ` [PATCH v4 31/37] ARM: davinci: cp-intc: improve coding style Bartosz Golaszewski
2019-02-14 14:52 ` [PATCH v4 32/37] ARM: davinci: cp-intc: unify error handling Bartosz Golaszewski
2019-02-14 14:52 ` [PATCH v4 33/37] ARM: davinci: cp-intc: use readl/writel_relaxed() Bartosz Golaszewski
2019-02-17 10:01 ` David Lechner
2019-02-18 8:12 ` Bartosz Golaszewski
2019-02-14 14:52 ` [PATCH v4 34/37] ARM: davinci: cp-intc: drop GPL license boilerplate Bartosz Golaszewski
2019-02-14 14:52 ` [PATCH v4 35/37] ARM: davinci: cp-intc: remove redundant comments Bartosz Golaszewski
2019-02-14 14:52 ` [PATCH v4 36/37] irqchip: davinci-cp-intc: move the driver to drivers/irqchip Bartosz Golaszewski
2019-02-14 14:52 ` [PATCH v4 37/37] ARM: davinci: remove intc related fields from davinci_soc_info Bartosz Golaszewski
2019-02-17 10:02 ` David Lechner
2019-02-15 15:14 ` [PATCH v4 00/37] ARM: davinci: modernize the irq support Sekhar Nori
2019-02-18 14:19 ` Marc Zyngier
2019-02-19 15:37 ` Sekhar Nori
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190214145231.8750-24-brgl@bgdev.pl \
--to=brgl@bgdev.pl \
--cc=bgolaszewski@baylibre.com \
--cc=david@lechnology.com \
--cc=dmitry.torokhov@gmail.com \
--cc=jason@lakedaemon.net \
--cc=khilman@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=marc.zyngier@arm.com \
--cc=nsekhar@ti.com \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).