Skip to content

Commit f15897c

Browse files
committed
Merge tag 'oxnas-final-for-6.6' of https://git.kernel.org/pub/scm/linux/kernel/git/narmstrong/linux-oxnas into soc/drivers
Final OXNAS removal PR for v6.6: - Remove irq-versatile-fpga compatible entry - Mark irq-versatile-fpga oxnas compatible as deprecated - Remove OXNAS maintainers entry * tag 'oxnas-final-for-6.6' of https://git.kernel.org/pub/scm/linux/kernel/git/narmstrong/linux-oxnas: MAINTAINERS: remove OXNAS entry dt-bindings: interrupt-controller: arm,versatile-fpga-irq: mark oxnas compatible as deprecated irqchip: irq-versatile-fpga: remove obsolete oxnas compatible Link: https://lore.kernel.org/r/3f91bb89-bf7b-d967-a302-2a8e1b0c3b01@linaro.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 9fb9ae8 + b1627ad commit f15897c

File tree

3 files changed

+3
-12
lines changed

3 files changed

+3
-12
lines changed

Documentation/devicetree/bindings/interrupt-controller/arm,versatile-fpga-irq.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ controllers are OR:ed together and fed to the CPU tile's IRQ input. Each
66
instance can handle up to 32 interrupts.
77

88
Required properties:
9-
- compatible: "arm,versatile-fpga-irq" or "oxsemi,ox810se-rps-irq"
9+
- compatible: "arm,versatile-fpga-irq"
1010
- interrupt-controller: Identifies the node as an interrupt controller
1111
- #interrupt-cells: The number of cells to define the interrupts. Must be 1
1212
as the FPGA IRQ controller has no configuration options for interrupt
@@ -19,6 +19,8 @@ Required properties:
1919
the system till not make it possible for devices to request these
2020
interrupts.
2121

22+
The "oxsemi,ox810se-rps-irq" compatible is deprecated.
23+
2224
Example:
2325

2426
pic: pic@14000000 {

MAINTAINERS

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2494,16 +2494,6 @@ S: Maintained
24942494
W: http://www.digriz.org.uk/ts78xx/kernel
24952495
F: arch/arm/mach-orion5x/ts78xx-*
24962496

2497-
ARM/OXNAS platform support
2498-
M: Neil Armstrong <neil.armstrong@linaro.org>
2499-
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
2500-
L: linux-oxnas@groups.io (moderated for non-subscribers)
2501-
S: Maintained
2502-
F: arch/arm/boot/dts/ox8*.dts*
2503-
F: arch/arm/mach-oxnas/
2504-
F: drivers/power/reset/oxnas-restart.c
2505-
N: oxnas
2506-
25072497
ARM/QUALCOMM CHROMEBOOK SUPPORT
25082498
R: cros-qcom-dts-watchers@chromium.org
25092499
F: arch/arm64/boot/dts/qcom/sc7180*

drivers/irqchip/irq-versatile-fpga.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,5 +242,4 @@ static int __init fpga_irq_of_init(struct device_node *node,
242242
}
243243
IRQCHIP_DECLARE(arm_fpga, "arm,versatile-fpga-irq", fpga_irq_of_init);
244244
IRQCHIP_DECLARE(arm_fpga_sic, "arm,versatile-sic", fpga_irq_of_init);
245-
IRQCHIP_DECLARE(ox810se_rps, "oxsemi,ox810se-rps-irq", fpga_irq_of_init);
246245
#endif

0 commit comments

Comments
 (0)