From: Arnd Bergmann Date: Thu, 1 Apr 2021 09:33:00 +0000 (+0200) Subject: Merge tag 'arm-soc/for-5.12/devicetree-part2' of https://github.com/Broadcom/stblinux... X-Git-Url: https://repo.jachan.dev/J-linux.git/commitdiff_plain/70a6062cc2ca74ce0dd9fdff6d0e582b3490dd23 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 --- 70a6062cc2ca74ce0dd9fdff6d0e582b3490dd23