8299d1f057
Rebased RPi foundation patches on linux 5.10.59, removed applied and reverted patches, wireless patches and defconfig patches. bcm2708: boot tested on RPi B+ v1.2 bcm2709: boot tested on RPi 4B v1.1 4G bcm2711: boot tested on RPi 4B v1.1 4G Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
59 lines
1.8 KiB
Diff
59 lines
1.8 KiB
Diff
From 37e369738ad24d0e43a5db645dcf3a7c434d0db9 Mon Sep 17 00:00:00 2001
|
|
From: Maxime Ripard <maxime@cerno.tech>
|
|
Date: Mon, 11 Jan 2021 15:23:09 +0100
|
|
Subject: [PATCH] ARM: dts: bcm2711: Add the CEC interrupt controller
|
|
|
|
The CEC and hotplug interrupts go through an interrupt controller shared
|
|
between the two HDMI controllers.
|
|
|
|
Let's add that interrupt controller and the interrupts for both HDMI
|
|
controllers
|
|
|
|
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
|
|
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
|
---
|
|
arch/arm/boot/dts/bcm2711.dtsi | 18 ++++++++++++++++++
|
|
1 file changed, 18 insertions(+)
|
|
|
|
--- a/arch/arm/boot/dts/bcm2711.dtsi
|
|
+++ b/arch/arm/boot/dts/bcm2711.dtsi
|
|
@@ -308,6 +308,14 @@
|
|
#reset-cells = <1>;
|
|
};
|
|
|
|
+ aon_intr: interrupt-controller@7ef00100 {
|
|
+ compatible = "brcm,bcm2711-l2-intc", "brcm,l2-intc";
|
|
+ reg = <0x7ef00100 0x30>;
|
|
+ interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;
|
|
+ interrupt-controller;
|
|
+ #interrupt-cells = <1>;
|
|
+ };
|
|
+
|
|
hdmi0: hdmi@7ef00700 {
|
|
compatible = "brcm,bcm2711-hdmi0";
|
|
reg = <0x7ef00700 0x300>,
|
|
@@ -336,6 +344,11 @@
|
|
<&clk_27MHz>;
|
|
clock-names = "hdmi", "bvb", "audio", "cec";
|
|
resets = <&dvp 0>;
|
|
+ interrupt-parent = <&aon_intr>;
|
|
+ interrupts = <0>, <1>, <2>,
|
|
+ <3>, <4>, <5>;
|
|
+ interrupt-names = "cec-tx", "cec-rx", "cec-low",
|
|
+ "wakeup", "hpd-connected", "hpd-removed";
|
|
ddc = <&ddc0>;
|
|
dmas = <&dma 10>;
|
|
dma-names = "audio-rx";
|
|
@@ -380,6 +393,11 @@
|
|
<&dvp 0>,
|
|
<&clk_27MHz>;
|
|
resets = <&dvp 1>;
|
|
+ interrupt-parent = <&aon_intr>;
|
|
+ interrupts = <8>, <7>, <6>,
|
|
+ <9>, <10>, <11>;
|
|
+ interrupt-names = "cec-tx", "cec-rx", "cec-low",
|
|
+ "wakeup", "hpd-connected", "hpd-removed";
|
|
dmas = <&dma 17>;
|
|
dma-names = "audio-rx";
|
|
interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;
|