From: Xianwei Zhao <[email protected]>
Aliases use lowercase letters and place status in end.
Signed-off-by: Xianwei Zhao <[email protected]>
---
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 18789242f05f..983caddc409c 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 {
@@ -36,7 +36,7 @@ secmon_reserved: secmon@5000000 {
};
};
-&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 c6b524e1a1ee..ce90b35686a2 100644
--- a/arch/arm64/boot/dts/amlogic/meson-s4.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-s4.dtsi
@@ -455,14 +455,14 @@ nand: nand-controller@8c800 {
status = "disabled";
};
- uart_B: serial@7a000 {
+ uart_b: serial@7a000 {
compatible = "amlogic,meson-s4-uart",
"amlogic,meson-ao-uart";
reg = <0x0 0x7a000 0x0 0x18>;
interrupts = <GIC_SPI 169 IRQ_TYPE_EDGE_RISING>;
- status = "disabled";
clocks = <&xtal>, <&clkc_periphs CLKID_UART_B>, <&xtal>;
clock-names = "xtal", "pclk", "baud";
+ status = "disabled";
};
reset: reset-controller@2000 {
---
base-commit: 078c5db2a961f674cc27c10f15d15949eece6a49
change-id: 20231211-s4-dts-4a1805bd56f0
Best regards,
--
Xianwei Zhao <[email protected]>
On 15/12/2023 09:28, Xianwei Zhao via B4 Relay wrote:
> From: Xianwei Zhao <[email protected]>
>
> Aliases use lowercase letters and place status in end.
>
> Signed-off-by: Xianwei Zhao <[email protected]>
> ---
> 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 18789242f05f..983caddc409c 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 {
> @@ -36,7 +36,7 @@ secmon_reserved: secmon@5000000 {
> };
> };
>
> -&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 c6b524e1a1ee..ce90b35686a2 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-s4.dtsi
> +++ b/arch/arm64/boot/dts/amlogic/meson-s4.dtsi
> @@ -455,14 +455,14 @@ nand: nand-controller@8c800 {
> status = "disabled";
> };
>
> - uart_B: serial@7a000 {
> + uart_b: serial@7a000 {
> compatible = "amlogic,meson-s4-uart",
> "amlogic,meson-ao-uart";
> reg = <0x0 0x7a000 0x0 0x18>;
> interrupts = <GIC_SPI 169 IRQ_TYPE_EDGE_RISING>;
> - status = "disabled";
> clocks = <&xtal>, <&clkc_periphs CLKID_UART_B>, <&xtal>;
> clock-names = "xtal", "pclk", "baud";
> + status = "disabled";
> };
>
> reset: reset-controller@2000 {
>
> ---
> base-commit: 078c5db2a961f674cc27c10f15d15949eece6a49
> change-id: 20231211-s4-dts-4a1805bd56f0
>
> Best regards,
Reviewed-by: Neil Armstrong <[email protected]>
Hi,
On Fri, 15 Dec 2023 16:28:00 +0800, Xianwei Zhao wrote:
> Aliases use lowercase letters and place status in end.
>
>
Thanks, Applied to https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git (v6.8/arm64-dt)
[1/1] arm64: dts: amlogic: fix format for s4 uart node
https://git.kernel.org/amlogic/c/f1e2e85bb06b942db86992a8a3187ffe9807939c
These changes has been applied on the intermediate git tree [1].
The v6.8/arm64-dt branch will then be sent via a formal Pull Request to the Linux SoC maintainers
for inclusion in their intermediate git branches in order to be sent to Linus during
the next merge window, or sooner if it's a set of fixes.
In the cases of fixes, those will be merged in the current release candidate
kernel and as soon they appear on the Linux master branch they will be
backported to the previous Stable and Long-Stable kernels [2].
The intermediate git branches are merged daily in the linux-next tree [3],
people are encouraged testing these pre-release kernels and report issues on the
relevant mailing-lists.
If problems are discovered on those changes, please submit a signed-off-by revert
patch followed by a corrective changeset.
[1] https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git
[2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
[3] https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
--
Neil