diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2024-09-11 10:49:39 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2024-09-11 10:49:39 +0200 |
| commit | af0103eccc101bb7802fb473b886e6008cfe968d (patch) | |
| tree | c94499978d7e2672b31af76db409b1bd3dcea6d2 /arch/arm/boot | |
| parent | Merge tag 'v6.11-next-dts64' of https://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
| parent | ARM: dts: bcm2837/bcm2712: adjust local intc node names (diff) | |
| download | linux-af0103eccc101bb7802fb473b886e6008cfe968d.tar.xz linux-af0103eccc101bb7802fb473b886e6008cfe968d.zip | |
Merge tag 'arm-soc/for-6.12/devicetree-arm64' of https://github.com/Broadcom/stblinux into soc/dt
This pull request contains Broadcom ARM64 SoCs Device Tree changes for
6.12, please pull the following:
- Andrea adds a minimal Device Tree for the Raspberry Pi 5 (2712)
- Stefan adjusts the bcm2837/bcm2712 bcm2836-l1-intc node name to
conform to the binding changes
* tag 'arm-soc/for-6.12/devicetree-arm64' of https://github.com/Broadcom/stblinux:
ARM: dts: bcm2837/bcm2712: adjust local intc node names
arm64: dts: broadcom: Add minimal support for Raspberry Pi 5
Link: https://lore.kernel.org/r/20240906180643.2275460-2-florian.fainelli@broadcom.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/broadcom/bcm2837.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/broadcom/bcm2837.dtsi b/arch/arm/boot/dts/broadcom/bcm2837.dtsi index 84c08b46519d..c281697142b1 100644 --- a/arch/arm/boot/dts/broadcom/bcm2837.dtsi +++ b/arch/arm/boot/dts/broadcom/bcm2837.dtsi @@ -9,7 +9,7 @@ <0x40000000 0x40000000 0x00001000>; dma-ranges = <0xc0000000 0x00000000 0x3f000000>; - local_intc: local_intc@40000000 { + local_intc: interrupt-controller@40000000 { compatible = "brcm,bcm2836-l1-intc"; reg = <0x40000000 0x100>; interrupt-controller; |