From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 03B0119AD5C; Tue, 8 Apr 2025 11:42:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744112546; cv=none; b=tPUNoXSzg1sKAQLDG0oag6ACQ3Me5X0vLfTQppYP4evqpMPGQPOnIVdWn58TPHAfGhn8GXMZMQ/9neGl/st9vlyn+vlyC53e+/uauKFsO8ZM1wUdEEPoA15kYza20Fx86xMlMfrOIDt3sw3ZGah+dChB2QYICOcPf+DNWzPKU6Y= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744112546; c=relaxed/simple; bh=VkloAL1c9N56OAOg4DODUFlgRQ7v7I1SmQUDfMsdjzc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HBhJKKv0ARC3dbZwEiT7hEin7CEEZ63mU6RbiLxvq78GIUyTH75dP1RJRIGZNAx2lzVgYzwrDiiTS2v/TB8/60D415RkCSxVoRBPiNz+6Q/UyF1qsqL+dohYLa+74DC4SbrpKNk/A+Ze1IKE0uWJzadshGsuwhT32rx4ggO8fi8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=t1ye1+fB; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="t1ye1+fB" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 87BF8C4CEE5; Tue, 8 Apr 2025 11:42:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1744112545; bh=VkloAL1c9N56OAOg4DODUFlgRQ7v7I1SmQUDfMsdjzc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=t1ye1+fBcgTNV2WCHmwNdFZxRumm6HIkPeRr7KMNRIyC4dvSJV0IcLk09a61ALnsf 6BSy2oFcFVPkrcNGWelzpzivtPZZdwemmTBG4IFCxQBcfJwx3FXTXyzi+FiMnvNbxe VUZuxR1LCZnEXvyPClJ4mpGFLZciNzvzq3BuL7RE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Phil Elwell , Stefan Wahren , Florian Fainelli , Sasha Levin Subject: [PATCH 5.15 081/279] ARM: dts: bcm2711: PL011 UARTs are actually r1p5 Date: Tue, 8 Apr 2025 12:47:44 +0200 Message-ID: <20250408104828.528805382@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250408104826.319283234@linuxfoundation.org> References: <20250408104826.319283234@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Phil Elwell [ Upstream commit 0de09025f161f67c07978c4742e221243d070d41 ] The ARM PL011 UART instances in BCM2711 are r1p5 spec, which means they have 32-entry FIFOs. The correct periphid value for this is 0x00341011. Thanks to N Buchwitz for pointing this out. Signed-off-by: Phil Elwell Signed-off-by: Stefan Wahren Link: https://lore.kernel.org/r/20250223125614.3592-2-wahrenst@gmx.net Fixes: 7dbe8c62ceeb ("ARM: dts: Add minimal Raspberry Pi 4 support") Signed-off-by: Florian Fainelli Signed-off-by: Sasha Levin --- arch/arm/boot/dts/bcm2711.dtsi | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi index 89af57482bc8f..926bc467d4516 100644 --- a/arch/arm/boot/dts/bcm2711.dtsi +++ b/arch/arm/boot/dts/bcm2711.dtsi @@ -133,7 +133,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"; }; @@ -144,7 +144,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"; }; @@ -155,7 +155,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"; }; @@ -166,7 +166,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"; }; @@ -1142,6 +1142,7 @@ &txp { }; &uart0 { + arm,primecell-periphid = <0x00341011>; interrupts = ; }; -- 2.39.5