Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 605b42f9 authored by Laxminath Kasam's avatar Laxminath Kasam Committed by Martin Fick
Browse files

audio-lnx: Rename folders to new flat structure. 



Kernel audio drivers can be categorised into below folders.
asoc - ALSA based drivers,
asoc/codecs - codec drivers,
ipc - APR IPC communication drivers,
dsp - DSP low level drivers/Audio ION/ADSP Loader,
dsp/codecs - Native encoders and decoders,
soc - SoC based drivers(pinctrl/regmap/soundwire)

Restructure drivers to above folder format.
Include directories also follow above format.

Change-Id: I8fa0857baaacd47db126fb5c1f1f5ed7e886dbc0
Signed-off-by: default avatarLaxminath Kasam <lkasam@codeaurora.org>
parent 84f7f731

Makefile

+4 −2
Original line number Diff line number Diff line
@@ -19,5 +19,7 @@ LINUXINCLUDE += \ 
                -include $(srctree)/techpack/audio/config/sdm845autoconf.h

endif



obj-y           += drivers/

obj-y           += sound/
 
obj-y += asoc/

obj-y += dsp/

obj-y += ipc/

obj-y += soc/

sound/soc/msm/Makefile→asoc/Makefile

+17 −1
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ 
snd-soc-hostless-pcm-objs := msm-pcm-hostless.o

obj-$(CONFIG_SND_SOC_MSM_HOSTLESS_PCM) += snd-soc-hostless-pcm.o



obj-$(CONFIG_SND_SOC_MSM_QDSP6V2_INTF) += qdsp6v2/



snd-soc-qdsp6v2-objs := msm-dai-fe.o

obj-$(CONFIG_SND_SOC_QDSP6V2) += snd-soc-qdsp6v2.o
@@ -37,3 +36,20 @@ obj-$(CONFIG_SND_SOC_EXT_CODEC) += snd-soc-ext-codec.o 
# for SDM845 sound card driver

snd-soc-sdm845-objs := sdm845.o

obj-$(CONFIG_SND_SOC_MACHINE_SDM845) += snd-soc-sdm845.o



snd-soc-qdsp6v2-objs += msm-dai-q6-v2.o msm-pcm-q6-v2.o \

			msm-pcm-routing-v2.o msm-compress-q6-v2.o \

			msm-pcm-afe-v2.o msm-pcm-voip-v2.o \

			msm-pcm-voice-v2.o msm-dai-q6-hdmi-v2.o \

			msm-lsm-client.o msm-pcm-host-voice-v2.o \

			msm-audio-effects-q6-v2.o msm-pcm-loopback-v2.o \

			msm-dai-slim.o msm-transcode-loopback-q6-v2.o msm-pcm-q6-noirq.o

obj-$(CONFIG_SND_SOC_QDSP6V2) += snd-soc-qdsp6v2.o msm-pcm-dtmf-v2.o \

				 msm-dai-stub-v2.o

obj-$(CONFIG_SND_HWDEP) += msm-pcm-routing-devdep.o

obj-$(CONFIG_DOLBY_DAP) += msm-dolby-dap-config.o

obj-$(CONFIG_DOLBY_DS2) += msm-ds2-dap-config.o

obj-$(CONFIG_DOLBY_LICENSE) += msm-ds2-dap-config.o

obj-$(CONFIG_DTS_SRS_TM) += msm-dts-srs-tm-config.o

obj-$(CONFIG_QTI_PP) += msm-qti-pp-config.o

obj-y += codecs/

sound/soc/codecs/Makefile→asoc/codecs/Makefile

+7 −1
Original line number Diff line number Diff line 
snd-soc-wcd934x-objs := wcd934x.o

snd-soc-wcd9xxx-v2-objs := wcd9xxx-common-v2.o wcd9xxx-resmgr-v2.o wcdcal-hwdep.o wcd9xxx-soc-init.o

snd-soc-wcd-cpe-objs := wcd_cpe_services.o wcd_cpe_core.o

snd-soc-wsa881x-objs := wsa881x.o wsa881x-tables.o wsa881x-regmap.o wsa881x-temp-sensor.o
@@ -24,3 +23,10 @@ obj-$(CONFIG_SND_SOC_WCD_SPI) += snd-soc-wcd-spi.o 


snd-soc-msm-stub-objs := msm_stub.o

obj-$(CONFIG_SND_SOC_MSM_STUB)  += snd-soc-msm-stub.o



wcd-core-objs                  := wcd9xxx-rst.o wcd9xxx-core-init.o \

				wcd9xxx-core.o wcd9xxx-irq.o \

				wcd9xxx-slimslave.o wcd9xxx-utils.o \

				wcd9335-regmap.o wcd9335-tables.o \

				msm-cdc-pinctrl.o msm-cdc-supply.o

obj-$(CONFIG_WCD9XXX_CODEC_CORE) += wcd-core.o

sound/soc/codecs/audio-ext-clk-up.c→asoc/codecs/audio-ext-clk-up.c

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
#include <linux/gpio.h>

#include <linux/of_gpio.h>

#include <dt-bindings/clock/qcom,audio-ext-clk.h>

#include <sound/q6afe-v2.h>

#include <dsp/q6afe-v2.h>

#include "audio-ext-clk-up.h"



enum audio_clk_mux {