mirror of
https://github.com/Ysurac/openmptcprouter.git
synced 2025-03-09 15:40:20 +00:00
109 lines
3.7 KiB
Diff
109 lines
3.7 KiB
Diff
From 02c3ae26d1a5789b9b32de87f2e887807e74a200 Mon Sep 17 00:00:00 2001
|
|
From: Phil Elwell <phil@raspberrypi.org>
|
|
Date: Tue, 7 May 2019 10:06:04 +0100
|
|
Subject: [PATCH 509/515] overlays: Remove upstream-aux-interrupt overlay
|
|
|
|
We no longer have a downstream-specific auxilliary interrupt
|
|
driver, so the overlay to disable it is no longer needed.
|
|
|
|
Signed-off-by: Phil Elwell <phil@raspberrypi.org>
|
|
---
|
|
arch/arm/boot/dts/overlays/Makefile | 1 -
|
|
arch/arm/boot/dts/overlays/README | 12 +++----
|
|
.../upstream-aux-interrupt-overlay.dts | 33 -------------------
|
|
.../boot/dts/overlays/upstream-overlay.dts | 2 +-
|
|
4 files changed, 6 insertions(+), 42 deletions(-)
|
|
delete mode 100644 arch/arm/boot/dts/overlays/upstream-aux-interrupt-overlay.dts
|
|
|
|
diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile
|
|
index ae7ba0bc3945..9aea64b0d325 100644
|
|
--- a/arch/arm/boot/dts/overlays/Makefile
|
|
+++ b/arch/arm/boot/dts/overlays/Makefile
|
|
@@ -151,7 +151,6 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
|
|
uart1.dtbo \
|
|
udrc.dtbo \
|
|
upstream.dtbo \
|
|
- upstream-aux-interrupt.dtbo \
|
|
vc4-fkms-v3d.dtbo \
|
|
vc4-kms-kippah-7inch.dtbo \
|
|
vc4-kms-v3d.dtbo \
|
|
diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
|
|
index fc71a917f495..42265637df37 100644
|
|
--- a/arch/arm/boot/dts/overlays/README
|
|
+++ b/arch/arm/boot/dts/overlays/README
|
|
@@ -2206,18 +2206,16 @@ Params: alsaname Name of the ALSA audio device (default "udrc")
|
|
|
|
|
|
Name: upstream
|
|
-Info: Allow usage of downstream .dtb with upstream kernel. Comprises
|
|
- vc4-kms-v3d, dwc2 and upstream-aux-interrupt overlays.
|
|
+Info: Allow usage of downstream .dtb with upstream kernel. Comprises the
|
|
+ vc4-kms-v3d and dwc2 overlays.
|
|
Load: dtoverlay=upstream
|
|
Params: <None>
|
|
|
|
|
|
Name: upstream-aux-interrupt
|
|
-Info: Allow usage of downstream .dtb with upstream kernel by binding AUX
|
|
- devices directly to the shared AUX interrupt line. One of the parts
|
|
- of the 'upstream' overlay
|
|
-Load: dtoverlay=upstream-aux-interrupt
|
|
-Params: <None>
|
|
+Info: This overlay has been deprecated and removed because it is no longer
|
|
+ necessary.
|
|
+Load: <Deprecated>
|
|
|
|
|
|
Name: vc4-fkms-v3d
|
|
diff --git a/arch/arm/boot/dts/overlays/upstream-aux-interrupt-overlay.dts b/arch/arm/boot/dts/overlays/upstream-aux-interrupt-overlay.dts
|
|
deleted file mode 100644
|
|
index 04e271b72a3a..000000000000
|
|
--- a/arch/arm/boot/dts/overlays/upstream-aux-interrupt-overlay.dts
|
|
+++ /dev/null
|
|
@@ -1,33 +0,0 @@
|
|
-// Overlay for missing AUX interrupt controller
|
|
-// Instead we bind all AUX devices to the generic AUX interrupt line
|
|
-/dts-v1/;
|
|
-/plugin/;
|
|
-
|
|
-/ {
|
|
- compatible = "brcm,bcm2708";
|
|
-
|
|
- fragment@0 {
|
|
- target = <&uart1>;
|
|
- __overlay__ {
|
|
- interrupt-parent = <&intc>;
|
|
- interrupts = <0x1 0x1d>;
|
|
- };
|
|
- };
|
|
-
|
|
- fragment@1 {
|
|
- target = <&spi1>;
|
|
- __overlay__ {
|
|
- interrupt-parent = <&intc>;
|
|
- interrupts = <0x1 0x1d>;
|
|
- };
|
|
- };
|
|
-
|
|
- fragment@2 {
|
|
- target = <&spi2>;
|
|
- __overlay__ {
|
|
- interrupt-parent = <&intc>;
|
|
- interrupts = <0x1 0x1d>;
|
|
- };
|
|
- };
|
|
-};
|
|
-
|
|
diff --git a/arch/arm/boot/dts/overlays/upstream-overlay.dts b/arch/arm/boot/dts/overlays/upstream-overlay.dts
|
|
index b597f863c4a8..5ddc95b6d8fc 100644
|
|
--- a/arch/arm/boot/dts/overlays/upstream-overlay.dts
|
|
+++ b/arch/arm/boot/dts/overlays/upstream-overlay.dts
|
|
@@ -1,4 +1,4 @@
|
|
-// redo: ovmerge -c vc4-kms-v3d-overlay.dts,cma-96 dwc2-overlay.dts,dr_mode=otg upstream-aux-interrupt-overlay.dts,
|
|
+// redo: ovmerge -c vc4-kms-v3d-overlay.dts,cma-96 dwc2-overlay.dts,dr_mode=otg
|
|
|
|
/dts-v1/;
|
|
/plugin/;
|
|
--
|
|
2.19.1
|
|
|