Commit f44fa354 authored by Stefan Wahren's avatar Stefan Wahren Committed by Florian Fainelli
Browse files

ARM: dts: bcm2711: Fix xHCI power-domain 

During s2idle tests on the Raspberry CM4 the VPU firmware always crashes
on xHCI power-domain resume:

root@raspberrypi:/sys/power# echo freeze > state
[   70.724347] xhci_suspend finished
[   70.727730] xhci_plat_suspend finished
[   70.755624] bcm2835-power bcm2835-power: Power grafx off
[   70.761127]  USB: Set power to 0

[   74.653040]  USB: Failed to set power to 1 (-110)

This seems to be caused because of the mixed usage of
raspberrypi-power and bcm2835-power at the same time. So avoid
the usage of the VPU firmware power-domain driver, which
prevents the VPU crash.

Fixes: 522c35e0 ("ARM: dts: bcm2711: Add BCM2711 xHCI support")
Link: https://github.com/raspberrypi/linux/issues/6537


Signed-off-by: default avatarStefan Wahren <wahrenst@gmx.net>
Link: https://lore.kernel.org/r/20250201112729.31509-1-wahrenst@gmx.net


Signed-off-by: default avatarFlorian Fainelli <florian.fainelli@broadcom.com>
parent 2014c95a

arch/arm/boot/dts/broadcom/bcm2711-rpi.dtsi

+0 −5
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

#include "bcm2835-rpi.dtsi"



#include <dt-bindings/power/raspberrypi-power.h>

#include <dt-bindings/reset/raspberrypi,firmware-reset.h>



/ {
@@ -101,7 +100,3 @@ &v3d { 
&vchiq {

	interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;

};
 


&xhci {

	power-domains = <&power RPI_POWER_DOMAIN_USB>;

};

arch/arm/boot/dts/broadcom/bcm2711.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -610,6 +610,7 @@ xhci: usb@7e9c0000 { 
			#address-cells = <1>;

			#size-cells = <0>;

			interrupts = <GIC_SPI 176 IRQ_TYPE_LEVEL_HIGH>;

			power-domains = <&pm BCM2835_POWER_DOMAIN_USB>;

			/* DWC2 and this IP block share the same USB PHY,

			 * enabling both at the same time results in lockups.

			 * So keep this node disabled and let the bootloader