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 5382515854F; Wed, 5 Feb 2025 14:39:14 +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=1738766354; cv=none; b=nlakn6Ph8j4z3isSGeQumN0UBH6JbJR1jvqjGQ6O3BfqxtriuwTNMt5pZcM1CIk5xSpD2txn5dqx9C4e2G+vJc+z6Y2X5RpW71xoKbmKe8sLo2dF4uaz7wQW0oTUN50WgFAC1JZCKChFLyMpjGJFIIXCZtr7A+3eQCZ3OCs7VmE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738766354; c=relaxed/simple; bh=PQTkOYNJ9+hlPqvzhS1rBxod2RxpvIBKY2WqekQDVLc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=H8MW+g+tFpRYz1Lh/n5pS9T9lk4DdBu86Qmv/K3OEAY1OLsbZ8eH17NmjxOUQRmRV17OQncbEKOaE6UbopiEOSksIiX187LzbaJ5dvJ4yA6EAw86CfUym9H745HKcRr/mXPdI3MULh1gb35E0BEf5PyjlTP9H36DGafDv/jPZjQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=e3xVzYBa; 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="e3xVzYBa" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B3260C4CED6; Wed, 5 Feb 2025 14:39:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1738766354; bh=PQTkOYNJ9+hlPqvzhS1rBxod2RxpvIBKY2WqekQDVLc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=e3xVzYBapZ5tZhzPOL3JmFFUREoDcVP8O+8wAJiyUQUXInLqli24ggAusM1HVere1 GsFdy+aHoMZYctTyhcKdqaMrbqqcMF2SypKoAN0seWaPnAwGfXeeauo4CRni7cMmRR cgHOVIl/mNRRo+2f0nCSSKSpfnWS3lnMuGCwTPNk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Claudiu Beznea , Geert Uytterhoeven , Sasha Levin Subject: [PATCH 6.12 313/590] arm64: dts: renesas: rzg3s-smarc: Fix the debug serial alias Date: Wed, 5 Feb 2025 14:41:08 +0100 Message-ID: <20250205134507.250124055@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250205134455.220373560@linuxfoundation.org> References: <20250205134455.220373560@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 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Claudiu Beznea [ Upstream commit 08811b984f5af8eeda4fb157894fe9bf230ec1e1 ] The debug serial of the RZ/G3S is SCIF0 which is routed on the Renesas RZ SMARC Carrier II board on the SER3_UART. Use serial3 alias for it for better hardware description. Along with it, the chosen properties were moved to the device tree corresponding to the RZ SMARC Carrier II board. Fixes: adb4f0c5699c ("arm64: dts: renesas: Add initial support for RZ/G3S SMARC SoM") Fixes: d1ae4200bb26 ("arm64: dts: renesas: Add initial device tree for RZ SMARC Carrier-II Board") Signed-off-by: Claudiu Beznea Reviewed-by: Geert Uytterhoeven Link: https://lore.kernel.org/20241115134401.3893008-6-claudiu.beznea.uj@bp.renesas.com Signed-off-by: Geert Uytterhoeven Signed-off-by: Sasha Levin --- arch/arm64/boot/dts/renesas/rzg3s-smarc-som.dtsi | 5 ----- arch/arm64/boot/dts/renesas/rzg3s-smarc.dtsi | 7 ++++++- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm64/boot/dts/renesas/rzg3s-smarc-som.dtsi b/arch/arm64/boot/dts/renesas/rzg3s-smarc-som.dtsi index 21bfa4e03972f..612cdc7efabbc 100644 --- a/arch/arm64/boot/dts/renesas/rzg3s-smarc-som.dtsi +++ b/arch/arm64/boot/dts/renesas/rzg3s-smarc-som.dtsi @@ -42,11 +42,6 @@ #endif }; - chosen { - bootargs = "ignore_loglevel"; - stdout-path = "serial0:115200n8"; - }; - memory@48000000 { device_type = "memory"; /* First 128MB is reserved for secure area. */ diff --git a/arch/arm64/boot/dts/renesas/rzg3s-smarc.dtsi b/arch/arm64/boot/dts/renesas/rzg3s-smarc.dtsi index 7945d44e6ee15..af2ab1629104b 100644 --- a/arch/arm64/boot/dts/renesas/rzg3s-smarc.dtsi +++ b/arch/arm64/boot/dts/renesas/rzg3s-smarc.dtsi @@ -12,10 +12,15 @@ / { aliases { i2c0 = &i2c0; - serial0 = &scif0; + serial3 = &scif0; mmc1 = &sdhi1; }; + chosen { + bootargs = "ignore_loglevel"; + stdout-path = "serial3:115200n8"; + }; + keys { compatible = "gpio-keys"; -- 2.39.5