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 EB367F9E6; Tue, 25 Mar 2025 12:37:19 +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=1742906240; cv=none; b=i0rEjRjV+5XVCWmmRJketkP21uN2aUNnVozwF9+XQwqm/fc2oQ7bmN+Vf+dxlNH91+jp1Lt7MX3wu8bO9N59vUJTrFsowJNIcpcuci+fczDw7hNtqS0W82gO0OtVyGRatCE1ACjNbL+0oS1GfP9gZhH+eFSZuZSCOqPCiXn10uc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742906240; c=relaxed/simple; bh=WOz9wOhOOeTyqhRfi1NPDj/GZGTaJyUUYYbqzFAPCyA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Tpw+7H2VaL845HPDXD5uYrFHJewTyz28B11XAVLAZM1ovs/PYDjdrasgz2N7Ar/CMtWthhA9AFoR65RFTtuTSU1299299eTs94VVdSgnyVUmwZWDddRwC6xBXBBNj/5P2hA718UXohBX3t6Wyzo1VqLPZk6drJS+HWVTlx0dCAY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=nWBC2sfs; 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="nWBC2sfs" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9A8F3C4CEE4; Tue, 25 Mar 2025 12:37:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1742906239; bh=WOz9wOhOOeTyqhRfi1NPDj/GZGTaJyUUYYbqzFAPCyA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nWBC2sfsXdpbdOntzoorPC5i5ZQ6VFnk8Oec7iFfsPMZgW3MhUK3bT+ZXvRq5bm9a BhL2/x7eBkoebqwd++Gx2qDmX3Yk9S+yXMdNi6GN0D65Ku1S8udIMhQn8D05iGYGLm CiNQnzE59WYXfCpOE2ql7C3r5/3JNtf5mgUVC7C8= 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 6.12 012/116] ARM: dts: bcm2711: PL011 UARTs are actually r1p5 Date: Tue, 25 Mar 2025 08:21:39 -0400 Message-ID: <20250325122149.531407516@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250325122149.207086105@linuxfoundation.org> References: <20250325122149.207086105@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-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/broadcom/bcm2711.dtsi | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/broadcom/bcm2711.dtsi b/arch/arm/boot/dts/broadcom/bcm2711.dtsi index 5eaec6c6a1df3..4fd0732a34d32 100644 --- a/arch/arm/boot/dts/broadcom/bcm2711.dtsi +++ b/arch/arm/boot/dts/broadcom/bcm2711.dtsi @@ -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"; }; @@ -1178,6 +1178,7 @@ &txp { }; &uart0 { + arm,primecell-periphid = <0x00341011>; interrupts = ; }; -- 2.39.5