Merge tag 'arm-soc/for-5.12/devicetree-part2' of https://github.com/Broadcom/stblinux...
authorArnd Bergmann <arnd@arndb.de>
Thu, 1 Apr 2021 09:33:00 +0000 (11:33 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 1 Apr 2021 09:33:08 +0000 (11:33 +0200)
commit70a6062cc2ca74ce0dd9fdff6d0e582b3490dd23
tree1fd5f3cbbe3c3275e1eee3c5691a074f98d8a0fa
parenta5e13c6df0e41702d2b2c77c8ad41677ebb065b3
parent443f0bb8e29fa031ec4d5beb3c3143350438dc97
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: Arnd Bergmann <arnd@arndb.de>