From eb6347176cb94c7c9400e6ef244f57bb19016988 Mon Sep 17 00:00:00 2001
From: Xianjun Jiao <xianjun.jiao@ugent.be>
Date: Tue, 17 Jan 2023 14:44:10 +0100
Subject: [PATCH] Adapt the side channel support for kuiper

---
 driver/side_ch/make_driver.sh |  4 ++--
 driver/side_ch/side_ch.c      | 10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/driver/side_ch/make_driver.sh b/driver/side_ch/make_driver.sh
index 77a1d7a..4e5f092 100755
--- a/driver/side_ch/make_driver.sh
+++ b/driver/side_ch/make_driver.sh
@@ -20,7 +20,7 @@ else
     exit 1
 fi
 
-if [ -d "$XILINX_DIR/SDK" ]; then
+if [ -d "$XILINX_DIR/Vitis" ]; then
     echo "\$XILINX_DIR is found!"
 else
     echo "\$XILINX_DIR is not correct. Please check!"
@@ -34,7 +34,7 @@ else
     echo "\$ARCH_OPTION is valid!"
 fi
 
-source $XILINX_DIR/SDK/2018.3/settings64.sh
+source $XILINX_DIR/Vitis/2021.1/settings64.sh
 if [ "$ARCH_OPTION" == "64" ]; then
     LINUX_KERNEL_SRC_DIR=$OPENWIFI_DIR/adi-linux-64/
     ARCH="arm64"
diff --git a/driver/side_ch/side_ch.c b/driver/side_ch/side_ch.c
index 98d6160..7892f09 100644
--- a/driver/side_ch/side_ch.c
+++ b/driver/side_ch/side_ch.c
@@ -599,11 +599,13 @@ static int dev_probe(struct platform_device *pdev) {
 	// 	goto free_chan_to_pl;
 	// }
 
-	chan_to_ps = dma_request_slave_channel(&(pdev->dev), "tx_dma_s2mm");
-	if (IS_ERR(chan_to_ps)) {
+	chan_to_ps = dma_request_chan(&(pdev->dev), "tx_dma_s2mm");
+	if (IS_ERR(chan_to_ps) || chan_to_ps==NULL) {
 		err = PTR_ERR(chan_to_ps);
-		pr_err("%s dev_probe: No channel to PS. %d\n",side_ch_compatible_str,err);
-		goto free_chan_to_ps;
+		if (err != -EPROBE_DEFER) {
+			pr_err("%s dev_probe: No chan_to_ps ret %d chan_to_ps 0x%p\n",side_ch_compatible_str, err, chan_to_ps);
+			goto free_chan_to_ps;
+		}
 	}
 
 	printk("%s dev_probe: DMA channel setup successfully. chan_to_pl 0x%p chan_to_ps 0x%p\n",side_ch_compatible_str, chan_to_pl, chan_to_ps);