diff options
author | Arnd Bergmann <arnd@arndb.de> | 2023-08-21 22:01:22 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2023-08-21 22:01:43 -0400 |
commit | 44762a0c82fd33fbbcead6430e857b01bf1773a8 (patch) | |
tree | da095c5633907cbc73ac7ffdffbcd03193fb4231 /arch/arm/boot/dts/broadcom/bcm-hr2.dtsi | |
parent | c708140e960f620d37782fada16cb847023e658e (diff) | |
parent | 2900083269f7c0f0ff430bffc6ced2038aed9b6b (diff) |
Merge tag 'arm-soc/for-6.6/devicetree' of https://github.com/Broadcom/stblinux into soc/dt
This pull request contains Broadcom ARM-based Device Tree changes for
6.6, please pull the following:
- Arinc adds support for the Asus RT-AC3100 router based upon the
BCM47094 SoC
- Krzysztof splits interrupt properties per cell such that they are mode
readable and adds missing spaces in front of node names/labels
- Rafal updates the BCM5301X DTS to correct PCIe, SPI over GPIO
properties. He describes the Ethernet links to internal switch ports
and then updates the BCM53573 binding and Ethernet properties by
declaring the BCM53125 external switch on port 5, add Ethernet links
and
disables the second Ethernet MAC on Luxul devices.
- Dan describes the Wi-Fi regulatory mappings for Luxul devices
- Stanislav updates the bcm28155 DTS to use node labels
- Linus adds SEAMA compatible properties to MTD partitions
- Aleksey updates the Linksys EA6500 v2 to have the full 256MiB of DRAM
available
- Stefan updates a number of BCM283x nodes to confirm to DTS schema:
pinctrl, DMA controllers and PWM cells.
* tag 'arm-soc/for-6.6/devicetree' of https://github.com/Broadcom/stblinux: (23 commits)
ARM: dts: BCM5301X: Add DT for ASUS RT-AC3100
dt-bindings: arm: bcm: add bindings for ASUS RT-AC3100
ARM: dts: broadcom: split interrupts per cells
ARM: dts: BCM53573: Disable second Ethernet on Luxul devices
ARM: dts: BCM53573: Add Ethernet interfaces links
ARM: dts: BCM53573: Add BCM53125 switch port 5
ARM: dts: BCM53573: Describe BCM53125 switch ports in the main DTS
ARM: dts: BCM53573: Fix Tenda AC9 switch CPU port
ARM: dts: bcm28155-ap: use node labels
ARM: dts: bcm5301x: Add SEAMA compatibles
ARM: dts: BCM53573: Fix Ethernet info for Luxul devices
ARM: dts: BCM5301X: Extend RAM to full 256MB for Linksys EA6500 V2
dt-bindings: arm: bcm: add BCM53573 SoCs family binding
ARM: dts: BCM53573: Use updated "spi-gpio" binding properties
ARM: dts: BCM53573: Add cells sizes to PCIe node
ARM: dts: BCM53573: Drop nonexistent #usb-cells
ARM: dts: BCM53573: Drop nonexistent "default-off" LED trigger
ARM: dts: BCM5301X: Add Ethernet interfaces links
ARM: dts: BCM5301X: Add Wi-Fi regulatory mappings for Luxul devices
ARM: dts: broadcom: add missing space before {
...
Link: https://lore.kernel.org/r/20230818164539.2871539-1-florian.fainelli@broadcom.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot/dts/broadcom/bcm-hr2.dtsi')
-rw-r--r-- | arch/arm/boot/dts/broadcom/bcm-hr2.dtsi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/broadcom/bcm-hr2.dtsi b/arch/arm/boot/dts/broadcom/bcm-hr2.dtsi index 33e6ba63a1ee..788a6806191a 100644 --- a/arch/arm/boot/dts/broadcom/bcm-hr2.dtsi +++ b/arch/arm/boot/dts/broadcom/bcm-hr2.dtsi @@ -54,8 +54,8 @@ pmu { compatible = "arm,cortex-a9-pmu"; - interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH - GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>; + interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>; interrupt-affinity = <&cpu0>; }; |