aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-03-06 13:22:26 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2019-03-06 13:22:26 -0500
commitafe6fe7036c6efdcb46cabc64bec9b6e4a005210 (patch)
tree0f5aaa66028806b8ab45fc46a7f7e0c4bc58cc36 /include
parent64b1b217f1a20f15dbedf47e49a25a0b5ee3d53b (diff)
parent2547635054af399303f8b91292ea121e13b84bb1 (diff)
Merge tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM SoC late updates from Arnd Bergmann: "Here are two branches that came relatively late during the linux-5.0 development cycle and have dependencies on the other branches: - On the TI OMAP platform, the CPSW Ethernet PHY mode selection driver is being replaced, this puts the final pieces in place - On the DaVinci platform, the interrupt handling code in arch/arm gets moved into a regular device driver in drivers/irqchip. Since they both had some time in linux-next after the 5.0-rc8 release, I'm sending them along with the other updates" * tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (38 commits) net: ethernet: ti: cpsw: deprecate cpsw-phy-sel driver ARM: davinci: remove intc related fields from davinci_soc_info irqchip: davinci-cp-intc: move the driver to drivers/irqchip ARM: davinci: cp-intc: remove redundant comments ARM: davinci: cp-intc: drop GPL license boilerplate ARM: davinci: cp-intc: use readl/writel_relaxed() ARM: davinci: cp-intc: unify error handling ARM: davinci: cp-intc: improve coding style ARM: davinci: cp-intc: request the memory region before remapping it ARM: davinci: cp-intc: use the new-style config structure ARM: davinci: cp-intc: convert all hex numbers to lowercase ARM: davinci: cp-intc: use a common prefix for all symbols ARM: davinci: cp-intc: add the new config structures for da8xx SoCs irqchip: davinci-cp-intc: add a new config structure ARM: davinci: cp-intc: add a wrapper around cp_intc_init() ARM: davinci: cp-intc: remove cp_intc.h irqchip: davinci-aintc: move the driver to drivers/irqchip ARM: davinci: aintc: remove unnecessary includes ARM: davinci: aintc: remove the timer-specific irq_set_handler() ARM: davinci: aintc: request memory region before remapping it ...
Diffstat (limited to 'include')
-rw-r--r--include/linux/irqchip/irq-davinci-aintc.h27
-rw-r--r--include/linux/irqchip/irq-davinci-cp-intc.h25
2 files changed, 52 insertions, 0 deletions
diff --git a/include/linux/irqchip/irq-davinci-aintc.h b/include/linux/irqchip/irq-davinci-aintc.h
new file mode 100644
index 000000000000..ea4e087fac98
--- /dev/null
+++ b/include/linux/irqchip/irq-davinci-aintc.h
@@ -0,0 +1,27 @@
1/* SPDX-License-Identifier: GPL-2.0-or-later */
2/*
3 * Copyright (C) 2019 Texas Instruments
4 */
5
6#ifndef _LINUX_IRQ_DAVINCI_AINTC_
7#define _LINUX_IRQ_DAVINCI_AINTC_
8
9#include <linux/ioport.h>
10
11/**
12 * struct davinci_aintc_config - configuration data for davinci-aintc driver.
13 *
14 * @reg: register range to map
15 * @num_irqs: number of HW interrupts supported by the controller
16 * @prios: an array of size num_irqs containing priority settings for
17 * each interrupt
18 */
19struct davinci_aintc_config {
20 struct resource reg;
21 unsigned int num_irqs;
22 u8 *prios;
23};
24
25void davinci_aintc_init(const struct davinci_aintc_config *config);
26
27#endif /* _LINUX_IRQ_DAVINCI_AINTC_ */
diff --git a/include/linux/irqchip/irq-davinci-cp-intc.h b/include/linux/irqchip/irq-davinci-cp-intc.h
new file mode 100644
index 000000000000..8d71ed5b5a61
--- /dev/null
+++ b/include/linux/irqchip/irq-davinci-cp-intc.h
@@ -0,0 +1,25 @@
1/* SPDX-License-Identifier: GPL-2.0-or-later */
2/*
3 * Copyright (C) 2019 Texas Instruments
4 */
5
6#ifndef _LINUX_IRQ_DAVINCI_CP_INTC_
7#define _LINUX_IRQ_DAVINCI_CP_INTC_
8
9#include <linux/ioport.h>
10
11/**
12 * struct davinci_cp_intc_config - configuration data for davinci-cp-intc
13 * driver.
14 *
15 * @reg: register range to map
16 * @num_irqs: number of HW interrupts supported by the controller
17 */
18struct davinci_cp_intc_config {
19 struct resource reg;
20 unsigned int num_irqs;
21};
22
23int davinci_cp_intc_init(const struct davinci_cp_intc_config *config);
24
25#endif /* _LINUX_IRQ_DAVINCI_CP_INTC_ */