Commit 70a6062c authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'arm-soc/for-5.12/devicetree-part2' of... 

Merge tag 'arm-soc/for-5.12/devicetree-part2' of https://github.com/Broadcom/stblinux into arm/fixes

This pull request contains Broadcom ARM-based SoC changes for 5.12,
please pull the following:

- Florian reverts the adding of the second level interrupt controller
  for HDMI BSC interrupts since they collide with the main I2C
  controller (i2c-bcm2835).

* tag 'arm-soc/for-5.12/devicetree-part2' of https://github.com/Broadcom/stblinux

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

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents a5e13c6d 443f0bb8

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

		};

	};