Skip to content
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
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment