From 76d80b53acb7aa8ffb7b7632fdc354841c9457ab Mon Sep 17 00:00:00 2001
From: Vignesh Kulothungan <vigneshk@codeaurora.org>
Date: Mon, 23 Dec 2019 14:59:27 -0800
Subject: [PATCH 1/2] dsp: update ion alloc header file

Update the header file which defines ion allocation
in kernel 5.4.

Change-Id: I1dc09c32bf5ea611ba0e49c670d4dd32206dc1b3
Signed-off-by: Vignesh Kulothungan <vigneshk@codeaurora.org>
---
 dsp/msm_audio_ion.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dsp/msm_audio_ion.c b/dsp/msm_audio_ion.c
index 566f8bf1b80b..af21bd58e3ac 100644
--- a/dsp/msm_audio_ion.c
+++ b/dsp/msm_audio_ion.c
@@ -16,7 +16,7 @@
 #include <linux/platform_device.h>
 #include <linux/of_device.h>
 #include <linux/export.h>
-#include <linux/ion_kernel.h>
+#include <linux/ion.h>
 #include <ipc/apr.h>
 #include <dsp/msm_audio_ion.h>
 

From e10da098239731c8997d42ab9b6a60f091856570 Mon Sep 17 00:00:00 2001
From: Vignesh Kulothungan <vigneshk@codeaurora.org>
Date: Mon, 23 Dec 2019 17:43:08 -0800
Subject: [PATCH 2/2] ASoC: update uapi header location

Update uapi header location from uapi/
to uapi/audio.

Change-Id: I3c3e0f413dbb4bcd2aa8c9891bfb0a5806c80ad8
Signed-off-by: Vignesh Kulothungan <vigneshk@codeaurora.org>
---
 asoc/msm-ds2-dap-config.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/asoc/msm-ds2-dap-config.h b/asoc/msm-ds2-dap-config.h
index 165dbe186070..3b0893b0585e 100644
--- a/asoc/msm-ds2-dap-config.h
+++ b/asoc/msm-ds2-dap-config.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * Copyright (c) 2013-2014, 2017 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-2014, 2017, 2019 The Linux Foundation. All rights reserved.
  */
 
 #ifndef _MSM_DS2_DAP_CONFIG_H_
@@ -9,7 +9,7 @@
 #include <sound/soc.h>
 #include "msm-dolby-common.h"
 #include <sound/hwdep.h>
-#include <uapi/sound/devdep_params.h>
+#include <uapi/audio/sound/devdep_params.h>
 
 #ifdef CONFIG_COMPAT
 struct dolby_param_data32 {