summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2021-06-16 17:33:11 -0700
committerOlof Johansson <olof@lixom.net>2021-06-16 17:33:16 -0700
commit9be389934dc5f0b5fa45b4b766897c9d8259ff41 (patch)
tree6cbd7c1a66790f20c9eac374832b71ec0901c932 /arch/arm/boot
parent194eb4eab5db512dcbd9192db557434af3cd8319 (diff)
parent7db3cde5123e2acdd65ff7458628a9835c804b27 (diff)
downloadlinux-stable-9be389934dc5f0b5fa45b4b766897c9d8259ff41.tar.gz
linux-stable-9be389934dc5f0b5fa45b4b766897c9d8259ff41.tar.bz2
linux-stable-9be389934dc5f0b5fa45b4b766897c9d8259ff41.zip
Merge tag 'amlogic-arm-dt-for-v5.14' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux into arm/dt
Amlogic ARM DT changes for v5.14: - Set the fifo-size of uart_A to 128 bytes like the ARM64 counterpart * tag 'amlogic-arm-dt-for-v5.14' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux: ARM: dts: meson: Set the fifo-size of uart_A to 128 bytes Link: https://lore.kernel.org/r/2f19a5a1-3ed9-dd11-02f1-7d535cb1c25c@baylibre.com Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot')
-rw-r--r--arch/arm/boot/dts/meson.dtsi1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/meson.dtsi b/arch/arm/boot/dts/meson.dtsi
index 8bae6ed0abb2..bd0e864964e9 100644
--- a/arch/arm/boot/dts/meson.dtsi
+++ b/arch/arm/boot/dts/meson.dtsi
@@ -50,6 +50,7 @@
compatible = "amlogic,meson6-uart", "amlogic,meson-uart";
reg = <0x84c0 0x18>;
interrupts = <GIC_SPI 26 IRQ_TYPE_EDGE_RISING>;
+ fifo-size = <128>;
status = "disabled";
};