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 132BB2E62E; Tue, 16 Jan 2024 19:57:20 +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=1705435041; cv=none; b=bUQyJ0PwGLMXzUBLDDXAapSyGuEneW8DaElDbkEc2HFZabmQ+cX4hfUjS2NBVN1dv9JcoiYAfs+E7f9YQwSgpMfUdgt+VmQ4rFe04SJLJEipx/Zlrab3YGsQuW2LkEFbWpqcc6W1mBuoGAN7rvhr9Sw1cN9FG4VXjiQc/DG3Qao= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705435041; c=relaxed/simple; bh=FqTO8kuljVWw8/lCidaMvb3n7ENr2+qtqdsssjg6bzk=; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID: X-Mailer:In-Reply-To:References:MIME-Version:X-stable: X-Patchwork-Hint:X-stable-base:Content-Transfer-Encoding; b=OKmdpS+zHCASwVj1rw4JUTdqVQLmrk2FfGpZSm/AkdaaOCGS63HqkgHYDAau9EZcI3+dgWJcDgkb94q5BHiUmMUB3UV7TGub7k9+DnUYLSZzhKs2Rbs6kEW2C6FAvLNiS84rOQ0VA6jSzp+nsTQ/dGrlYrpNZfrmLbMYaeFEmWs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Im/gWHGS; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Im/gWHGS" 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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.1.73 Content-Transfer-Encoding: 8bit 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