Commit 528a4a0b authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Mark Brown

ASoC: qcom: reduce number of binding headers includes

Move the includes of binding headers from Qualcomm SoC sound drivers
headers to unit files actually using these bindings.  This reduces the
amount of work for C preprocessor and makes usage of bindings easier to
follow.  No impact expected on the final binaries.
Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20231005075250.88159-2-krzysztof.kozlowski@linaro.orgSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 0f729a28
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#include <sound/soc.h> #include <sound/soc.h>
#include <uapi/linux/input-event-codes.h> #include <uapi/linux/input-event-codes.h>
#include <dt-bindings/sound/apq8016-lpass.h> #include <dt-bindings/sound/apq8016-lpass.h>
#include <dt-bindings/sound/qcom,q6afe.h>
#include "common.h" #include "common.h"
#include "qdsp6/q6afe.h" #include "qdsp6/q6afe.h"
......
...@@ -2,10 +2,10 @@ ...@@ -2,10 +2,10 @@
// Copyright (c) 2018, Linaro Limited. // Copyright (c) 2018, Linaro Limited.
// Copyright (c) 2018, The Linux Foundation. All rights reserved. // Copyright (c) 2018, The Linux Foundation. All rights reserved.
#include <dt-bindings/sound/qcom,q6afe.h>
#include <linux/module.h> #include <linux/module.h>
#include <sound/jack.h> #include <sound/jack.h>
#include <linux/input-event-codes.h> #include <linux/input-event-codes.h>
#include "qdsp6/q6afe.h"
#include "common.h" #include "common.h"
static const struct snd_soc_dapm_widget qcom_jack_snd_widgets[] = { static const struct snd_soc_dapm_widget qcom_jack_snd_widgets[] = {
......
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
// Copyright (c) 2020, Linaro Limited // Copyright (c) 2020, Linaro Limited
#include <dt-bindings/sound/qcom,q6afe.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/clk-provider.h> #include <linux/clk-provider.h>
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
// Copyright (c) 2011-2017, The Linux Foundation. All rights reserved. // Copyright (c) 2011-2017, The Linux Foundation. All rights reserved.
// Copyright (c) 2018, Linaro Limited // Copyright (c) 2018, Linaro Limited
#include <dt-bindings/sound/qcom,q6afe.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/module.h> #include <linux/module.h>
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
// Copyright (c) 2011-2017, The Linux Foundation. All rights reserved. // Copyright (c) 2011-2017, The Linux Foundation. All rights reserved.
// Copyright (c) 2018, Linaro Limited // Copyright (c) 2018, Linaro Limited
#include <dt-bindings/sound/qcom,q6afe.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
......
...@@ -3,8 +3,6 @@ ...@@ -3,8 +3,6 @@
#ifndef __Q6AFE_H__ #ifndef __Q6AFE_H__
#define __Q6AFE_H__ #define __Q6AFE_H__
#include <dt-bindings/sound/qcom,q6afe.h>
#define AFE_PORT_MAX 129 #define AFE_PORT_MAX 129
#define MSM_AFE_PORT_TYPE_RX 0 #define MSM_AFE_PORT_TYPE_RX 0
......
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
// Copyright (c) 2021, Linaro Limited // Copyright (c) 2021, Linaro Limited
#include <dt-bindings/sound/qcom,q6dsp-lpass-ports.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/module.h> #include <linux/module.h>
......
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
#include <linux/of_platform.h> #include <linux/of_platform.h>
#include <linux/jiffies.h> #include <linux/jiffies.h>
#include <linux/soc/qcom/apr.h> #include <linux/soc/qcom/apr.h>
#include <dt-bindings/sound/qcom,q6dsp-lpass-ports.h>
#include "audioreach.h" #include "audioreach.h"
#define APM_PORT_MAX 127 #define APM_PORT_MAX 127
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
// Copyright (c) 2011-2017, The Linux Foundation. All rights reserved. // Copyright (c) 2011-2017, The Linux Foundation. All rights reserved.
// Copyright (c) 2018, Linaro Limited // Copyright (c) 2018, Linaro Limited
#include <dt-bindings/sound/qcom,q6asm.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/module.h> #include <linux/module.h>
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
// Copyright (c) 2011-2017, The Linux Foundation. All rights reserved. // Copyright (c) 2011-2017, The Linux Foundation. All rights reserved.
// Copyright (c) 2018, Linaro Limited // Copyright (c) 2018, Linaro Limited
#include <dt-bindings/sound/qcom,q6asm.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/wait.h> #include <linux/wait.h>
#include <linux/module.h> #include <linux/module.h>
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
#ifndef __Q6_ASM_H__ #ifndef __Q6_ASM_H__
#define __Q6_ASM_H__ #define __Q6_ASM_H__
#include "q6dsp-common.h" #include "q6dsp-common.h"
#include <dt-bindings/sound/qcom,q6asm.h>
/* ASM client callback events */ /* ASM client callback events */
#define CMD_PAUSE 0x0001 #define CMD_PAUSE 0x0001
......
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
// Copyright (c) 2021, Linaro Limited // Copyright (c) 2021, Linaro Limited
#include <dt-bindings/sound/qcom,q6dsp-lpass-ports.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/clk-provider.h> #include <linux/clk-provider.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/device.h> #include <linux/device.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <dt-bindings/sound/qcom,q6dsp-lpass-ports.h>
#include "q6dsp-lpass-clocks.h" #include "q6dsp-lpass-clocks.h"
#include "q6prm.h" #include "q6prm.h"
......
...@@ -2,6 +2,8 @@ ...@@ -2,6 +2,8 @@
// Copyright (c) 2011-2017, The Linux Foundation. All rights reserved. // Copyright (c) 2011-2017, The Linux Foundation. All rights reserved.
// Copyright (c) 2018, Linaro Limited // Copyright (c) 2018, Linaro Limited
#include <dt-bindings/sound/qcom,q6asm.h>
#include <dt-bindings/sound/qcom,q6afe.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/module.h> #include <linux/module.h>
......
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
#include "../codecs/rt5682.h" #include "../codecs/rt5682.h"
#include "../codecs/rt5682s.h" #include "../codecs/rt5682s.h"
#include "common.h" #include "common.h"
#include "lpass.h"
#define DEFAULT_MCLK_RATE 19200000 #define DEFAULT_MCLK_RATE 19200000
#define RT5682_PLL1_FREQ (48000 * 512) #define RT5682_PLL1_FREQ (48000 * 512)
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
// ALSA SoC Machine driver for sc7280 // ALSA SoC Machine driver for sc7280
#include <dt-bindings/sound/qcom,lpass.h> #include <dt-bindings/sound/qcom,lpass.h>
#include <dt-bindings/sound/qcom,q6afe.h>
#include <linux/input.h> #include <linux/input.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/of_device.h> #include <linux/of_device.h>
......
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
// Copyright (c) 2022, Linaro Limited // Copyright (c) 2022, Linaro Limited
#include <dt-bindings/sound/qcom,q6afe.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/of_device.h> #include <linux/of_device.h>
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
* Copyright (c) 2018, The Linux Foundation. All rights reserved. * Copyright (c) 2018, The Linux Foundation. All rights reserved.
*/ */
#include <dt-bindings/sound/qcom,q6afe.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/of_device.h> #include <linux/of_device.h>
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
// Copyright (c) 2018, Linaro Limited. // Copyright (c) 2018, Linaro Limited.
// Copyright (c) 2018, The Linux Foundation. All rights reserved. // Copyright (c) 2018, The Linux Foundation. All rights reserved.
#include <dt-bindings/sound/qcom,q6afe.h>
#include <linux/module.h> #include <linux/module.h>
#include <sound/soc.h> #include <sound/soc.h>
#include "qdsp6/q6afe.h"
#include "sdw.h" #include "sdw.h"
int qcom_snd_sdw_prepare(struct snd_pcm_substream *substream, int qcom_snd_sdw_prepare(struct snd_pcm_substream *substream,
......
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
// Copyright (c) 2020, Linaro Limited // Copyright (c) 2020, Linaro Limited
#include <dt-bindings/sound/qcom,q6afe.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/of_device.h> #include <linux/of_device.h>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment