Unverified Commit a0610b40 authored by Florian Fainelli's avatar Florian Fainelli
Browse files

Merge tag 'tags/bcm2835-dt-next-2021-01-28' into devicetree/next 



Maxime enables CEC support on both RPi4 HDMI ports

Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
parents fbdc8804 e2b53970

arch/arm/boot/dts/bcm2711.dtsi

+18 −0
Original line number Diff line number Diff line
@@ -316,6 +316,14 @@ 
			#interrupt-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>,
@@ -338,6 +346,11 @@ 
				    "hd";

			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";
@@ -377,6 +390,11 @@ 
			ddc = <&ddc1>;

			clock-names = "hdmi", "bvb", "audio", "cec";

			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";

			status = "disabled";