From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 97788C47258 for ; Tue, 16 Jan 2024 19:46:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=A8oFOcid2gykGtMjkrt5yd1rAsHL0HCFcQWQ35HzXG4=; b=H9br0TvrmBHVl3 dFuwtRPRE6HvKxhxkD1nNAUzbus/lX2k3cKHE0bvNAzw9umMfWD05UT4MINlc4fhHjAHA7u/tauGt ZGJ66wjbPrQwqYOnCk7SuxeuK2ECunkYgt9Cx3WltXtihhQSQT/GqDhixudBLiIgngz0RBmC2+WHP Z8nu+6lwnGNWRNVOxkJloQSkiYnJ1tyFbQUlCXQa304b0L/Df4mbSy1Zshq6udJKJU2Fh+A5o5+DU MeqIkKsABorAVWlri2wwL5YACgS+V17NtlFIxHa4vTaOOeBMDDAEt2dXaYIloLAA9NdlAO+hOisuW m1yJV+9wquJFxGzD6nyg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rPpOL-00DCdF-0v; Tue, 16 Jan 2024 19:46:33 +0000 Received: from ams.source.kernel.org ([145.40.68.75]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rPpOI-00DCaP-1r; Tue, 16 Jan 2024 19:46:32 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by ams.source.kernel.org (Postfix) with ESMTP id F2FF7B80F98; Tue, 16 Jan 2024 19:46:28 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 45AABC433A6; Tue, 16 Jan 2024 19:46:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1705434388; bh=fymq6E4rspAhYqkF6S+Z9Qly/bJA3N38Hp7udBD3v44=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uVMR5IYrJsdu6DBgsn1Gn4XhX9LUfk6V3sddUVrY2tUQkAuUf1QNuO7jq1ufC9abp +WN9Z5Gj39CfI1NNOrtymHjMkVyO5ByNDrtws184zurAWpzsI3XfrtxFUyKZJEHrJ1 WFlFTE7di/hSzCg06X6KdFC8XYCsmWtKEiXNhjPZE0uKGQwxjaFOc7wQP5f2bVOXSx 38/AY9Iz0UamN5sT0H82jfjIHXIW5gwTlDfaMcuxYMzCeKiEHdk8eW8MnUDHRml7OZ mnJoLBF9lFfOrQHLF+IKFLux7C2BwJivhIqV6eZ45sSaQp7RHIKZAANVTVcCl32Pzo bXMIy1ixTfmqw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Xianwei Zhao , Neil Armstrong , Sasha Levin , robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org, khilman@baylibre.com, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org Subject: [PATCH AUTOSEL 6.7 089/108] arm64: dts: amlogic: fix format for s4 uart node Date: Tue, 16 Jan 2024 14:39:55 -0500 Message-ID: <20240116194225.250921-89-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240116194225.250921-1-sashal@kernel.org> References: <20240116194225.250921-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.7 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240116_114630_785506_459C05A4 X-CRM114-Status: GOOD ( 10.03 ) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+linux-amlogic=archiver.kernel.org@lists.infradead.org From: Xianwei Zhao [ Upstream commit eb54ef36282f670c704ed5af8593da62bebba80d ] Aliases use lowercase letters and place status in end. Signed-off-by: Xianwei Zhao Reviewed-by: Neil Armstrong Link: https://lore.kernel.org/r/20231215-s4-dts-v1-1-7831ab6972be@amlogic.com Signed-off-by: Neil Armstrong Signed-off-by: Sasha Levin --- arch/arm64/boot/dts/amlogic/meson-s4-s805x2-aq222.dts | 4 ++-- arch/arm64/boot/dts/amlogic/meson-s4.dtsi | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-s4-s805x2-aq222.dts b/arch/arm64/boot/dts/amlogic/meson-s4-s805x2-aq222.dts index c1f322c73982..b1b81ac03200 100644 --- a/arch/arm64/boot/dts/amlogic/meson-s4-s805x2-aq222.dts +++ b/arch/arm64/boot/dts/amlogic/meson-s4-s805x2-aq222.dts @@ -15,7 +15,7 @@ / { #size-cells = <2>; aliases { - serial0 = &uart_B; + serial0 = &uart_b; }; memory@0 { @@ -25,7 +25,7 @@ memory@0 { }; -&uart_B { +&uart_b { status = "okay"; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-s4.dtsi b/arch/arm64/boot/dts/amlogic/meson-s4.dtsi index e0cfc54ebccb..dac18eb634d7 100644 --- a/arch/arm64/boot/dts/amlogic/meson-s4.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-s4.dtsi @@ -126,14 +126,14 @@ gpio_intc: interrupt-controller@4080 { <10 11 12 13 14 15 16 17 18 19 20 21>; }; - uart_B: serial@7a000 { + uart_b: serial@7a000 { compatible = "amlogic,meson-s4-uart", "amlogic,meson-ao-uart"; reg = <0x0 0x7a000 0x0 0x18>; interrupts = ; - status = "disabled"; clocks = <&xtal>, <&xtal>, <&xtal>; clock-names = "xtal", "pclk", "baud"; + status = "disabled"; }; reset: reset-controller@2000 { -- 2.43.0 _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic