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 0EEB9C47258 for ; Tue, 16 Jan 2024 19:57:46 +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=CS8EvJcxA+Ryte+hXiSZTYLL2uuf6UaWIZL9mg5Ott8=; b=N6zqZjuHWtDExp 7yO0yhVrVVdGLpRFnFW3MjiUlwSJhtfYVYIxJQcWHMDuHsdreq3sBEIt+/LEeumghd0zVc8IYxMDs hZwjTMgNzswHeS2epmjcGqD4wgt2kFOxiqFYVwPbSHb0MzvPDUlcXQ9g9AqjoPaELr5pXEskAVjTA UYvFrrJunNjbaYzu8Mr2s74eTA5Z4duOSGau6THli82jm20OW+rabvj5/fMFQX8xsmmt7D8+Ik7ud ScBEub1yitOjC53XqjI5tPnLJspfuGcMeWJIgojmXX17MrIRpRtq5KakWLDYKn8Onmzd89ubZHv0E rfi1kMO1VzvFNp0oRqUg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rPpYr-00DHuE-04; Tue, 16 Jan 2024 19:57:25 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rPpYn-00DHrM-0s; Tue, 16 Jan 2024 19:57:22 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id C1F2460B51; Tue, 16 Jan 2024 19:57:20 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 57CD6C433B2; Tue, 16 Jan 2024 19:57:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1705435040; bh=FqTO8kuljVWw8/lCidaMvb3n7ENr2+qtqdsssjg6bzk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Im/gWHGSbCPIDI/TNYc4WtFy0achvpH06v5ITKsKS7xneu/dhEqeJTurwXbwnG9W3 aSGduD8+2UjjcJ6sXMGJYkE3r55t/wMLzrWvAS5GuXrDBT9wmO7LNfM8qoTOjYP8cl 5IFr8OO8BhHl4ei7zEya96SayqBPqOSL1G02zref4JvzB1HIH7++iNgDRANMzWxn5j rElC8j57LcrlI/PpZdrAvZN2+sCKYHumA2zoru+HEymDJB7wpwDLicI3ZSuJEC83A5 FphpbHZrR6PK8fMuZA4xvC1ZyhnG2gPCvKCuv1EuR7zIq3ON9IIR8Bim28L28MgBSm wahzzpdpH5WNA== 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.1 55/68] arm64: dts: amlogic: fix format for s4 uart node Date: Tue, 16 Jan 2024 14:53:54 -0500 Message-ID: <20240116195511.255854-55-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240116195511.255854-1-sashal@kernel.org> References: <20240116195511.255854-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.1.73 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240116_115721_354110_A576EE07 X-CRM114-Status: GOOD ( 10.01 ) 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 8ffbcb2b1ac5..bbd3c05cbd90 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,6 +25,6 @@ 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 ad50cba42d19..372a03762d69 100644 --- a/arch/arm64/boot/dts/amlogic/meson-s4.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-s4.dtsi @@ -118,14 +118,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