diff options
author | Florian Fainelli <f.fainelli@gmail.com> | 2021-10-08 15:28:46 -0700 |
---|---|---|
committer | Florian Fainelli <f.fainelli@gmail.com> | 2021-10-12 09:14:30 -0700 |
commit | bc22b6208f416ba702c17a93c9af6474f19e8212 (patch) | |
tree | 39bf9e62003febb854e9351875a10e1a804a8548 /arch/arm/boot/dts/bcm2711-rpi-4-b.dts | |
parent | 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f (diff) | |
parent | 3f32472854614d6f53b09b4812372dba9fc5c7de (diff) |
Merge tag 'tags/bcm2835-dt-fixes-2021-10-06' into devicetree/fixes
A series of devicetree fixes for the Raspberry Pi 4:
- Fix VEC reg address
- Fix MDIO address/size cells
- Fix regulator states
- Fix PCIe address formatting
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Diffstat (limited to 'arch/arm/boot/dts/bcm2711-rpi-4-b.dts')
-rw-r--r-- | arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts index f24bdd0870a5..72ce80fbf266 100644 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts @@ -40,8 +40,8 @@ regulator-always-on; regulator-settling-time-us = <5000>; gpios = <&expgpio 4 GPIO_ACTIVE_HIGH>; - states = <1800000 0x1 - 3300000 0x0>; + states = <1800000 0x1>, + <3300000 0x0>; status = "okay"; }; @@ -217,15 +217,16 @@ }; &pcie0 { - pci@1,0 { + pci@0,0 { + device_type = "pci"; #address-cells = <3>; #size-cells = <2>; ranges; reg = <0 0 0 0 0>; - usb@1,0 { - reg = <0x10000 0 0 0 0>; + usb@0,0 { + reg = <0 0 0 0 0>; resets = <&reset RASPBERRYPI_FIRMWARE_RESET_ID_USB>; }; }; |