Commit 443f0bb8 authored by Florian Fainelli's avatar Florian Fainelli
Browse files

Revert "ARM: dts: bcm2711: Add the BSC interrupt controller" 



As Dave reported:

This seems to have unintended side effects.  GIC interrupt 117 is shared
between the standard I2C controllers (i2c-bcm2835) and the l2-intc block
handling the HDMI I2C interrupts.

There is not a great way to share an interrupt between an interrupt
controller using the chained IRQ handler which is an interrupt flow and
another driver like i2c-bcm2835 which uses an interrupt handler
(although it specifies IRQF_SHARED).

Simply revert this change for now which will mean that HDMI I2C will be
polled, like it was before.

Reported-by: default avatarDave Stevenson <dave.stevenson@raspberrypi.com>
Acked-by: default avatarMaxime Ripard <mripard@kernel.org>
Acked-by: default avatarNicolas Saenz Julienne <nsaenzjulienne@suse.de>
Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
parent a0610b40

arch/arm/boot/dts/bcm2711.dtsi

+0 −12
Original line number Diff line number Diff line
@@ -308,14 +308,6 @@ 
			#reset-cells = <1>;

		};



		bsc_intr: interrupt-controller@7ef00040 {

			compatible = "brcm,bcm2711-l2-intc", "brcm,l2-intc";

			reg = <0x7ef00040 0x30>;

			interrupts = <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-controller;

			#interrupt-cells = <1>;

		};



		aon_intr: interrupt-controller@7ef00100 {

			compatible = "brcm,bcm2711-l2-intc", "brcm,l2-intc";

			reg = <0x7ef00100 0x30>;
@@ -362,8 +354,6 @@ 
			reg = <0x7ef04500 0x100>, <0x7ef00b00 0x300>;

			reg-names = "bsc", "auto-i2c";

			clock-frequency = <97500>;

			interrupt-parent = <&bsc_intr>;

			interrupts = <0>;

			status = "disabled";

		};
@@ -405,8 +395,6 @@ 
			reg = <0x7ef09500 0x100>, <0x7ef05b00 0x300>;

			reg-names = "bsc", "auto-i2c";

			clock-frequency = <97500>;

			interrupt-parent = <&bsc_intr>;

			interrupts = <1>;

			status = "disabled";

		};

	};