diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2021-10-20 15:45:12 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2021-10-20 15:45:12 +0200 |
| commit | 6375b90837858f2fead4704bba61ecedaa820483 (patch) | |
| tree | 4a33b603b1fcea933164f80a89ea14aba38ca51a /arch/arm/boot/dts/bcm2711-rpi-4-b.dts | |
| parent | fcd9d3469b7f5ebfa90c0643cd403b467f58f639 (diff) | |
| parent | bc22b6208f416ba702c17a93c9af6474f19e8212 (diff) | |
Merge tag 'arm-soc/for-5.15/devicetree' of https://github.com/Broadcom/stblinux into arm/dt
This is already in v5.15-rc5, but I'm adding it here as well to get
a clean build of the dts files.
* tag 'arm-soc/for-5.15/devicetree':
ARM: dts: bcm2711-rpi-4-b: Fix usb's unit address
ARM: dts: bcm2711-rpi-4-b: Fix pcie0's unit address formatting
ARM: dts: bcm2711-rpi-4-b: fix sd_io_1v8_reg regulator states
ARM: dts: bcm2711: fix MDIO #address- and #size-cells
ARM: dts: bcm283x: Fix VEC address for BCM2711
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 f94cac76713a..631dd5baf68d 100644 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts @@ -36,8 +36,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"; }; @@ -200,15 +200,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>; }; }; |