From 868d7390fcf66a7883e0ff4fdea6310ca3b282af Mon Sep 17 00:00:00 2001 From: paolo Date: Sat, 15 Dec 2018 10:41:58 +0000 Subject: [PATCH] Disabled dma for serial ports in xt-q8l-v10 dev kernel device tree due to changes in kernel 4.19 Removed date and time from xt-q8l-v10 patches for /dev/null source diffs --- .../xt-q8l-v10-add-device-tree.patch | 2 +- .../xt-q8l-v10-add-device-tree.patch | 29 ++++++++++--------- .../xt-q8l-v10-add-device-tree.patch | 2 +- .../xt-q8l-v10-device-tree.patch | 2 +- 4 files changed, 19 insertions(+), 16 deletions(-) diff --git a/patch/kernel/rockchip-default/xt-q8l-v10-add-device-tree.patch b/patch/kernel/rockchip-default/xt-q8l-v10-add-device-tree.patch index 82814dae6f..70d41a6c6d 100644 --- a/patch/kernel/rockchip-default/xt-q8l-v10-add-device-tree.patch +++ b/patch/kernel/rockchip-default/xt-q8l-v10-add-device-tree.patch @@ -1,4 +1,4 @@ ---- /dev/null 2018-12-06 21:33:05.512000000 +0000 +--- /dev/null +++ b/arch/arm/boot/dts/rk3288-xt-q8l-v10.dts 2018-09-23 13:07:34.000000000 +0000 @@ -0,0 +1,1120 @@ +/* diff --git a/patch/kernel/rockchip-dev/xt-q8l-v10-add-device-tree.patch b/patch/kernel/rockchip-dev/xt-q8l-v10-add-device-tree.patch index 1d93886e15..f077a28e78 100644 --- a/patch/kernel/rockchip-dev/xt-q8l-v10-add-device-tree.patch +++ b/patch/kernel/rockchip-dev/xt-q8l-v10-add-device-tree.patch @@ -1,6 +1,6 @@ ---- /dev/null 2018-12-06 21:33:05.512000000 +0000 -+++ b/arch/arm/boot/dts/rk3288-xt-q8l-v10.dts 2018-12-06 21:46:51.493688015 +0000 -@@ -0,0 +1,966 @@ +--- /dev/null ++++ b/arch/arm/boot/dts/rk3288-xt-q8l-v10.dts 2018-12-09 14:29:56.405019782 +0000 +@@ -0,0 +1,969 @@ +/* + * Copyright (c) 2014, 2015 FUKAUMI Naoki + * 2018 Paolo Sabatino @@ -847,36 +847,39 @@ + * - uart0 is the serial port connected to the bluetooth module + * - uart2 is the onboard serial port + * ++ * As ok kernel 4.19 DMA for serial ports is disabled because it makes ++ * the ports unusable ++ * + */ +&uart0 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_xfer>, <&uart0_cts>, <&uart0_rts>; -+ dmas = <&dmac_peri 1 &dmac_peri 2>; -+ dma-names = "tx", "rx"; ++ //dmas = <&dmac_peri 1 &dmac_peri 2>; ++ //dma-names = "tx", "rx"; + status = "okay"; +}; + +&uart1 { -+ dmas = <&dmac_peri 3 &dmac_peri 4>; -+ dma-names = "tx", "rx"; ++ //dmas = <&dmac_peri 3 &dmac_peri 4>; ++ //dma-names = "tx", "rx"; + status = "okay"; +}; + +&uart2 { -+ dmas = <&dmac_bus_s 4 &dmac_bus_s 5>; -+ dma-names = "tx", "rx"; ++ //dmas = <&dmac_bus_s 4 &dmac_bus_s 5>; ++ //dma-names = "tx", "rx"; + status = "okay"; +}; + +&uart3 { -+ dmas = <&dmac_peri 7 &dmac_peri 8>; -+ dma-names = "tx", "rx"; ++ //dmas = <&dmac_peri 7 &dmac_peri 8>; ++ //dma-names = "tx", "rx"; + status = "okay"; +}; + +&uart4 { -+ dmas = <&dmac_peri 9 &dmac_peri 10>; -+ dma-names = "tx", "rx"; ++ //dmas = <&dmac_peri 9 &dmac_peri 10>; ++ //dma-names = "tx", "rx"; + status = "disabled"; +}; + diff --git a/patch/kernel/rockchip-next/xt-q8l-v10-add-device-tree.patch b/patch/kernel/rockchip-next/xt-q8l-v10-add-device-tree.patch index 4c17f841b5..0198f68f9e 100644 --- a/patch/kernel/rockchip-next/xt-q8l-v10-add-device-tree.patch +++ b/patch/kernel/rockchip-next/xt-q8l-v10-add-device-tree.patch @@ -1,4 +1,4 @@ ---- /dev/null 2018-12-06 21:33:05.512000000 +0000 +--- /dev/null +++ b/arch/arm/boot/dts/rk3288-xt-q8l-v10.dts 2018-11-29 21:02:56.636665164 +0000 @@ -0,0 +1,951 @@ +/* diff --git a/patch/u-boot/u-boot-rockchip/board_xt-q8l-v10/xt-q8l-v10-device-tree.patch b/patch/u-boot/u-boot-rockchip/board_xt-q8l-v10/xt-q8l-v10-device-tree.patch index fcc1aea24f..912fda6be2 100644 --- a/patch/u-boot/u-boot-rockchip/board_xt-q8l-v10/xt-q8l-v10-device-tree.patch +++ b/patch/u-boot/u-boot-rockchip/board_xt-q8l-v10/xt-q8l-v10-device-tree.patch @@ -1,4 +1,4 @@ ---- /dev/null 2018-12-06 21:33:05.512000000 +0000 +--- /dev/null +++ b/arch/arm/dts/rk3288-xt-q8l-v10.dts 2018-09-23 12:59:27.000000000 +0000 @@ -0,0 +1,740 @@ +/*