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). -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEm+Rq3+YGJdiR9yuFh9CWnEQHBwQFAmAsbcMACgkQh9CWnEQH BwQzMA/+OKiEhSrnMvJ2OCrvy1FQHoexapmG+i9hMW2fO7Zd2CX9we2kAVU7HC3r aGCrYAQkUbyGROx+CjjRYQJDt8XP66tgD8vMgODxq2ujfbFXSOe5xlI9OBeDaSRm RveqOM4K/2+QkxBI/LbJdT2cZwsqxud4y8xuuw0/WDRI5FypQynuaxI+uDgkSVWb cuFJ9iJuBCAUE3PxqtQr5/nbDvnsjZO6Ib/GkVulvm4/YU5o1bFcSZ4Z+tD3ip8U o+uPdO1pfb7HlLkczPMwB6zI7SKWPOnsxIxGE0sgQGWoWYeE5HQqzryeNYokLaoj Ygm3xZp6HnRfngNJ6H1dN8h95Nd1DU+Jjz6Z+PXUfrekpzdhBtSQnyQ4sxi8Jhrf 0jNxUvbJ625IduqV36xMWMW+WOKs4xLIBQ7FSqmlYjdURYBvpjHxoE1oUccBc7tc 4lBbIIxaENB+bmAS/qKFsDZWQdjkNxoSiLpBb4w2VnNE/yBePL/z9czFeawqmPc7 TIsxm8Rqozbt7btffSmZYJb7rNr//bMAR8gmmWmNvwAaJXRZdHFuPAbtONmTkXdQ yxuLtAjafHUM+j791QGAMIXwfWjfCc4ERSINuQoNm474bzCAQVsi0kUtcHrDFvQM UU+0brs3F3yGap3PkxsrId67DlgzUTCUm+/WiDzhQv9zh402f5U= =B9w6 -----END PGP SIGNATURE----- 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>
This commit is contained in:
Коммит
70a6062cc2
|
@ -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";
|
||||
};
|
||||
};
|
||||
|
|
Загрузка…
Ссылка в новой задаче