Unverified Commit 170645f1 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'arm-soc/for-6.14/devicetree-fixes' of... 

Merge tag 'arm-soc/for-6.14/devicetree-fixes' of https://github.com/Broadcom/stblinux into arm/fixes

This pull request contains Broadcom ARM-based SoCs Device Tree fixes for
6.14:

- Stefan fixes the xHCI power domain on the Raspberry Pi 4
- Phil fixes the Raspberry Pi 4 PL011 UART primecell ID to indicate they are
  r1p5 and thus have a 32-byte FIFO

* tag 'arm-soc/for-6.14/devicetree-fixes' of https://github.com/Broadcom/stblinux:
  ARM: dts: bcm2711: PL011 UARTs are actually r1p5
  ARM: dts: bcm2711: Fix xHCI power-domain

Link: https://lore.kernel.org/r/20250225194041.1063762-1-florian.fainelli@broadcom.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 7eb17214 0de09025

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

+6 −4
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ uart2: serial@7e201400 { 
			clocks = <&clocks BCM2835_CLOCK_UART>,

				 <&clocks BCM2835_CLOCK_VPU>;

			clock-names = "uartclk", "apb_pclk";

			arm,primecell-periphid = <0x00241011>;

			arm,primecell-periphid = <0x00341011>;

			status = "disabled";

		};
@@ -145,7 +145,7 @@ uart3: serial@7e201600 { 
			clocks = <&clocks BCM2835_CLOCK_UART>,

				 <&clocks BCM2835_CLOCK_VPU>;

			clock-names = "uartclk", "apb_pclk";

			arm,primecell-periphid = <0x00241011>;

			arm,primecell-periphid = <0x00341011>;

			status = "disabled";

		};
@@ -156,7 +156,7 @@ uart4: serial@7e201800 { 
			clocks = <&clocks BCM2835_CLOCK_UART>,

				 <&clocks BCM2835_CLOCK_VPU>;

			clock-names = "uartclk", "apb_pclk";

			arm,primecell-periphid = <0x00241011>;

			arm,primecell-periphid = <0x00341011>;

			status = "disabled";

		};
@@ -167,7 +167,7 @@ uart5: serial@7e201a00 { 
			clocks = <&clocks BCM2835_CLOCK_UART>,

				 <&clocks BCM2835_CLOCK_VPU>;

			clock-names = "uartclk", "apb_pclk";

			arm,primecell-periphid = <0x00241011>;

			arm,primecell-periphid = <0x00341011>;

			status = "disabled";

		};
@@ -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
@@ -1177,6 +1178,7 @@ &txp { 
};



&uart0 {

	arm,primecell-periphid = <0x00341011>;

	interrupts = <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>;

};