diff options
author | Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | 2021-04-06 08:12:40 +0000 |
---|---|---|
committer | Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | 2021-04-06 08:12:40 +0000 |
commit | c4253dfaf61883b51bed3355f22f8895714e98d6 (patch) | |
tree | 42ce6b5dd6233443c0f8d04b1a77ba9cd9ec1136 /arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | |
parent | ccf90e001d5d9c69bbb378a3aaea68bcc9f82a85 (diff) | |
parent | 4e85f8a712cddf2ceeaac50a26b239fbbcb7091f (diff) |
Merge tag 'v5.4.109' into 5.4-2.3.x-imx
This is the 5.4.109 stable release
Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
Diffstat (limited to 'arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi')
-rw-r--r-- | arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi index e19e05ddae08..b5c647be6857 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi @@ -256,6 +256,7 @@ ranges = <0x0 0x00 0x1700000 0x100000>; reg = <0x00 0x1700000 0x0 0x100000>; interrupts = <0 75 0x4>; + dma-coherent; sec_jr0: jr@10000 { compatible = "fsl,sec-v5.4-job-ring", |