summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Saenz Julienne <nsaenz@kernel.org>2021-08-31 14:58:43 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-10-20 11:45:03 +0200
commit6e6e3018d3ced1cc1f7115f29221fc5ba793a2a2 (patch)
treeec3b16e0c03e308604cbf1949ccab1001259e07c
parent76644f94595bfeabd2f69259417f4f547dd580f2 (diff)
downloadlinux-stable-6e6e3018d3ced1cc1f7115f29221fc5ba793a2a2.tar.gz
linux-stable-6e6e3018d3ced1cc1f7115f29221fc5ba793a2a2.tar.bz2
linux-stable-6e6e3018d3ced1cc1f7115f29221fc5ba793a2a2.zip
ARM: dts: bcm2711-rpi-4-b: Fix usb's unit address
commit 3f32472854614d6f53b09b4812372dba9fc5c7de upstream. The unit address is supposed to represent '<device>,<function>'. Which are both 0 for RPi4b's XHCI controller. On top of that although OpenFirmware states bus number goes in the high part of the last reg parameter, FDT doesn't seem to care for it[1], so remove it. [1] https://patchwork.kernel.org/project/linux-arm-kernel/patch/20210830103909.323356-1-nsaenzju@redhat.com/#24414633 Fixes: 258f92d2f840 ("ARM: dts: bcm2711: Add reset controller to xHCI node") Suggested-by: Rob Herring <robh@kernel.org> Reviewed-by: Rob Herring <robh@kernel.org> Link: https://lore.kernel.org/r/20210831125843.1233488-2-nsaenzju@redhat.com Signed-off-by: Nicolas Saenz Julienne <nsaenz@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--arch/arm/boot/dts/bcm2711-rpi-4-b.dts4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
index 5395e8c2484e..46f105d5c974 100644
--- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
+++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
@@ -262,8 +262,8 @@
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>;
};
};