From a97bd5f8552bb7805f0128544705878b997cb62b Mon Sep 17 00:00:00 2001 From: Vignesh Kulothungan Date: Thu, 19 Dec 2019 16:58:59 -0800 Subject: [PATCH] msm: audio: change uapi include header files directory Change the directory structure of uapi headers. The existing directory structure overwrites kernel headers in /usr/include/sound and /usr/include/linux. Hence move audio uapi headers to /usr/include/audio folder. Change-Id: I14ef211a65605e798174087a3f322c64768fbfc7 Signed-off-by: Vignesh Kulothungan --- Makefile | 5 ++--- include/Kbuild | 2 -- include/uapi/Kbuild | 6 ------ include/uapi/{ => audio}/linux/avtimer.h | 0 .../linux/mfd/wcd9xxx/wcd9320_registers.h | 0 .../linux/mfd/wcd9xxx/wcd9xxx_registers.h | 0 include/uapi/{ => audio}/linux/msm_audio.h | 0 .../uapi/{ => audio}/linux/msm_audio_aac.h | 0 .../uapi/{ => audio}/linux/msm_audio_ac3.h | 0 .../uapi/{ => audio}/linux/msm_audio_alac.h | 0 .../uapi/{ => audio}/linux/msm_audio_amrnb.h | 0 .../uapi/{ => audio}/linux/msm_audio_amrwb.h | 0 .../{ => audio}/linux/msm_audio_amrwbplus.h | 0 .../uapi/{ => audio}/linux/msm_audio_ape.h | 0 .../{ => audio}/linux/msm_audio_calibration.h | 0 .../uapi/{ => audio}/linux/msm_audio_g711.h | 0 .../{ => audio}/linux/msm_audio_g711_dec.h | 0 .../uapi/{ => audio}/linux/msm_audio_mvs.h | 0 .../uapi/{ => audio}/linux/msm_audio_qcp.h | 0 .../uapi/{ => audio}/linux/msm_audio_sbc.h | 0 .../{ => audio}/linux/msm_audio_voicememo.h | 0 .../uapi/{ => audio}/linux/msm_audio_wma.h | 0 .../uapi/{ => audio}/linux/msm_audio_wmapro.h | 0 .../{ => audio}/linux/wcd-spi-ac-params.h | 0 .../uapi/{ => audio}/sound/audio_effects.h | 0 .../uapi/{ => audio}/sound/audio_slimslave.h | 0 .../uapi/{ => audio}/sound/devdep_params.h | 0 include/uapi/{ => audio}/sound/lsm_params.h | 0 include/uapi/{ => audio}/sound/msmcal-hwdep.h | 0 include/uapi/{ => audio}/sound/voice_params.h | 0 .../uapi/{ => audio}/sound/wcd-dsp-glink.h | 0 include/uapi/linux/Kbuild | 21 ------------------- include/uapi/linux/mfd/Kbuild | 1 - include/uapi/linux/mfd/wcd9xxx/Kbuild | 2 -- include/uapi/sound/Kbuild | 8 ------- 35 files changed, 2 insertions(+), 43 deletions(-) delete mode 100644 include/Kbuild delete mode 100644 include/uapi/Kbuild rename include/uapi/{ => audio}/linux/avtimer.h (100%) rename include/uapi/{ => audio}/linux/mfd/wcd9xxx/wcd9320_registers.h (100%) rename include/uapi/{ => audio}/linux/mfd/wcd9xxx/wcd9xxx_registers.h (100%) rename include/uapi/{ => audio}/linux/msm_audio.h (100%) rename include/uapi/{ => audio}/linux/msm_audio_aac.h (100%) rename include/uapi/{ => audio}/linux/msm_audio_ac3.h (100%) rename include/uapi/{ => audio}/linux/msm_audio_alac.h (100%) rename include/uapi/{ => audio}/linux/msm_audio_amrnb.h (100%) rename include/uapi/{ => audio}/linux/msm_audio_amrwb.h (100%) rename include/uapi/{ => audio}/linux/msm_audio_amrwbplus.h (100%) rename include/uapi/{ => audio}/linux/msm_audio_ape.h (100%) rename include/uapi/{ => audio}/linux/msm_audio_calibration.h (100%) rename include/uapi/{ => audio}/linux/msm_audio_g711.h (100%) rename include/uapi/{ => audio}/linux/msm_audio_g711_dec.h (100%) rename include/uapi/{ => audio}/linux/msm_audio_mvs.h (100%) rename include/uapi/{ => audio}/linux/msm_audio_qcp.h (100%) rename include/uapi/{ => audio}/linux/msm_audio_sbc.h (100%) rename include/uapi/{ => audio}/linux/msm_audio_voicememo.h (100%) rename include/uapi/{ => audio}/linux/msm_audio_wma.h (100%) rename include/uapi/{ => audio}/linux/msm_audio_wmapro.h (100%) rename include/uapi/{ => audio}/linux/wcd-spi-ac-params.h (100%) rename include/uapi/{ => audio}/sound/audio_effects.h (100%) rename include/uapi/{ => audio}/sound/audio_slimslave.h (100%) rename include/uapi/{ => audio}/sound/devdep_params.h (100%) rename include/uapi/{ => audio}/sound/lsm_params.h (100%) rename include/uapi/{ => audio}/sound/msmcal-hwdep.h (100%) rename include/uapi/{ => audio}/sound/voice_params.h (100%) rename include/uapi/{ => audio}/sound/wcd-dsp-glink.h (100%) delete mode 100644 include/uapi/linux/Kbuild delete mode 100644 include/uapi/linux/mfd/Kbuild delete mode 100644 include/uapi/linux/mfd/wcd9xxx/Kbuild delete mode 100644 include/uapi/sound/Kbuild diff --git a/Makefile b/Makefile index 8daa4601fa74..18ac2f18b7af 100644 --- a/Makefile +++ b/Makefile @@ -17,13 +17,12 @@ endif # Use USERINCLUDE when you must reference the UAPI directories only. USERINCLUDE += \ - -I$(srctree)/techpack/audio/include/uapi \ - -I$(srctree)/techpack/audio/include + -I$(srctree)/techpack/audio/include/uapi/audio # Use LINUXINCLUDE when you must reference the include/ directory. # Needed to be compatible with the O= option LINUXINCLUDE += \ - -I$(srctree)/techpack/audio/include/uapi \ + -I$(srctree)/techpack/audio/include/uapi/audio \ -I$(srctree)/techpack/audio/include ifeq ($(CONFIG_ARCH_SDXPOORWILLS), y) diff --git a/include/Kbuild b/include/Kbuild deleted file mode 100644 index bab1145bc7a7..000000000000 --- a/include/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# Top-level Makefile calls into asm-$(ARCH) -# List only non-arch directories below diff --git a/include/uapi/Kbuild b/include/uapi/Kbuild deleted file mode 100644 index 2eb179d4de95..000000000000 --- a/include/uapi/Kbuild +++ /dev/null @@ -1,6 +0,0 @@ -# UAPI Header export list -# Top-level Makefile calls into asm-$(ARCH) -# List only non-arch directories below - -header-y += linux/ -header-y += sound/ diff --git a/include/uapi/linux/avtimer.h b/include/uapi/audio/linux/avtimer.h similarity index 100% rename from include/uapi/linux/avtimer.h rename to include/uapi/audio/linux/avtimer.h diff --git a/include/uapi/linux/mfd/wcd9xxx/wcd9320_registers.h b/include/uapi/audio/linux/mfd/wcd9xxx/wcd9320_registers.h similarity index 100% rename from include/uapi/linux/mfd/wcd9xxx/wcd9320_registers.h rename to include/uapi/audio/linux/mfd/wcd9xxx/wcd9320_registers.h diff --git a/include/uapi/linux/mfd/wcd9xxx/wcd9xxx_registers.h b/include/uapi/audio/linux/mfd/wcd9xxx/wcd9xxx_registers.h similarity index 100% rename from include/uapi/linux/mfd/wcd9xxx/wcd9xxx_registers.h rename to include/uapi/audio/linux/mfd/wcd9xxx/wcd9xxx_registers.h diff --git a/include/uapi/linux/msm_audio.h b/include/uapi/audio/linux/msm_audio.h similarity index 100% rename from include/uapi/linux/msm_audio.h rename to include/uapi/audio/linux/msm_audio.h diff --git a/include/uapi/linux/msm_audio_aac.h b/include/uapi/audio/linux/msm_audio_aac.h similarity index 100% rename from include/uapi/linux/msm_audio_aac.h rename to include/uapi/audio/linux/msm_audio_aac.h diff --git a/include/uapi/linux/msm_audio_ac3.h b/include/uapi/audio/linux/msm_audio_ac3.h similarity index 100% rename from include/uapi/linux/msm_audio_ac3.h rename to include/uapi/audio/linux/msm_audio_ac3.h diff --git a/include/uapi/linux/msm_audio_alac.h b/include/uapi/audio/linux/msm_audio_alac.h similarity index 100% rename from include/uapi/linux/msm_audio_alac.h rename to include/uapi/audio/linux/msm_audio_alac.h diff --git a/include/uapi/linux/msm_audio_amrnb.h b/include/uapi/audio/linux/msm_audio_amrnb.h similarity index 100% rename from include/uapi/linux/msm_audio_amrnb.h rename to include/uapi/audio/linux/msm_audio_amrnb.h diff --git a/include/uapi/linux/msm_audio_amrwb.h b/include/uapi/audio/linux/msm_audio_amrwb.h similarity index 100% rename from include/uapi/linux/msm_audio_amrwb.h rename to include/uapi/audio/linux/msm_audio_amrwb.h diff --git a/include/uapi/linux/msm_audio_amrwbplus.h b/include/uapi/audio/linux/msm_audio_amrwbplus.h similarity index 100% rename from include/uapi/linux/msm_audio_amrwbplus.h rename to include/uapi/audio/linux/msm_audio_amrwbplus.h diff --git a/include/uapi/linux/msm_audio_ape.h b/include/uapi/audio/linux/msm_audio_ape.h similarity index 100% rename from include/uapi/linux/msm_audio_ape.h rename to include/uapi/audio/linux/msm_audio_ape.h diff --git a/include/uapi/linux/msm_audio_calibration.h b/include/uapi/audio/linux/msm_audio_calibration.h similarity index 100% rename from include/uapi/linux/msm_audio_calibration.h rename to include/uapi/audio/linux/msm_audio_calibration.h diff --git a/include/uapi/linux/msm_audio_g711.h b/include/uapi/audio/linux/msm_audio_g711.h similarity index 100% rename from include/uapi/linux/msm_audio_g711.h rename to include/uapi/audio/linux/msm_audio_g711.h diff --git a/include/uapi/linux/msm_audio_g711_dec.h b/include/uapi/audio/linux/msm_audio_g711_dec.h similarity index 100% rename from include/uapi/linux/msm_audio_g711_dec.h rename to include/uapi/audio/linux/msm_audio_g711_dec.h diff --git a/include/uapi/linux/msm_audio_mvs.h b/include/uapi/audio/linux/msm_audio_mvs.h similarity index 100% rename from include/uapi/linux/msm_audio_mvs.h rename to include/uapi/audio/linux/msm_audio_mvs.h diff --git a/include/uapi/linux/msm_audio_qcp.h b/include/uapi/audio/linux/msm_audio_qcp.h similarity index 100% rename from include/uapi/linux/msm_audio_qcp.h rename to include/uapi/audio/linux/msm_audio_qcp.h diff --git a/include/uapi/linux/msm_audio_sbc.h b/include/uapi/audio/linux/msm_audio_sbc.h similarity index 100% rename from include/uapi/linux/msm_audio_sbc.h rename to include/uapi/audio/linux/msm_audio_sbc.h diff --git a/include/uapi/linux/msm_audio_voicememo.h b/include/uapi/audio/linux/msm_audio_voicememo.h similarity index 100% rename from include/uapi/linux/msm_audio_voicememo.h rename to include/uapi/audio/linux/msm_audio_voicememo.h diff --git a/include/uapi/linux/msm_audio_wma.h b/include/uapi/audio/linux/msm_audio_wma.h similarity index 100% rename from include/uapi/linux/msm_audio_wma.h rename to include/uapi/audio/linux/msm_audio_wma.h diff --git a/include/uapi/linux/msm_audio_wmapro.h b/include/uapi/audio/linux/msm_audio_wmapro.h similarity index 100% rename from include/uapi/linux/msm_audio_wmapro.h rename to include/uapi/audio/linux/msm_audio_wmapro.h diff --git a/include/uapi/linux/wcd-spi-ac-params.h b/include/uapi/audio/linux/wcd-spi-ac-params.h similarity index 100% rename from include/uapi/linux/wcd-spi-ac-params.h rename to include/uapi/audio/linux/wcd-spi-ac-params.h diff --git a/include/uapi/sound/audio_effects.h b/include/uapi/audio/sound/audio_effects.h similarity index 100% rename from include/uapi/sound/audio_effects.h rename to include/uapi/audio/sound/audio_effects.h diff --git a/include/uapi/sound/audio_slimslave.h b/include/uapi/audio/sound/audio_slimslave.h similarity index 100% rename from include/uapi/sound/audio_slimslave.h rename to include/uapi/audio/sound/audio_slimslave.h diff --git a/include/uapi/sound/devdep_params.h b/include/uapi/audio/sound/devdep_params.h similarity index 100% rename from include/uapi/sound/devdep_params.h rename to include/uapi/audio/sound/devdep_params.h diff --git a/include/uapi/sound/lsm_params.h b/include/uapi/audio/sound/lsm_params.h similarity index 100% rename from include/uapi/sound/lsm_params.h rename to include/uapi/audio/sound/lsm_params.h diff --git a/include/uapi/sound/msmcal-hwdep.h b/include/uapi/audio/sound/msmcal-hwdep.h similarity index 100% rename from include/uapi/sound/msmcal-hwdep.h rename to include/uapi/audio/sound/msmcal-hwdep.h diff --git a/include/uapi/sound/voice_params.h b/include/uapi/audio/sound/voice_params.h similarity index 100% rename from include/uapi/sound/voice_params.h rename to include/uapi/audio/sound/voice_params.h diff --git a/include/uapi/sound/wcd-dsp-glink.h b/include/uapi/audio/sound/wcd-dsp-glink.h similarity index 100% rename from include/uapi/sound/wcd-dsp-glink.h rename to include/uapi/audio/sound/wcd-dsp-glink.h diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild deleted file mode 100644 index 9b93abebc4b7..000000000000 --- a/include/uapi/linux/Kbuild +++ /dev/null @@ -1,21 +0,0 @@ -# UAPI Header export list -header-y += avtimer.h -header-y += msm_audio.h -header-y += msm_audio_aac.h -header-y += msm_audio_ac3.h -header-y += msm_audio_amrnb.h -header-y += msm_audio_amrwb.h -header-y += msm_audio_amrwbplus.h -header-y += msm_audio_calibration.h -header-y += msm_audio_mvs.h -header-y += msm_audio_qcp.h -header-y += msm_audio_sbc.h -header-y += msm_audio_voicememo.h -header-y += msm_audio_wma.h -header-y += msm_audio_wmapro.h -header-y += msm_audio_alac.h -header-y += msm_audio_ape.h -header-y += msm_audio_g711.h -header-y += msm_audio_g711_dec.h -header-y += mfd/ -header-y += wcd-spi-ac-params.h diff --git a/include/uapi/linux/mfd/Kbuild b/include/uapi/linux/mfd/Kbuild deleted file mode 100644 index 9377c98b0aa3..000000000000 --- a/include/uapi/linux/mfd/Kbuild +++ /dev/null @@ -1 +0,0 @@ -header-y += wcd9xxx/ diff --git a/include/uapi/linux/mfd/wcd9xxx/Kbuild b/include/uapi/linux/mfd/wcd9xxx/Kbuild deleted file mode 100644 index 8e55965bbe7e..000000000000 --- a/include/uapi/linux/mfd/wcd9xxx/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -header-y += wcd9xxx_registers.h -header-y += wcd9320_registers.h diff --git a/include/uapi/sound/Kbuild b/include/uapi/sound/Kbuild deleted file mode 100644 index 175fb6f63359..000000000000 --- a/include/uapi/sound/Kbuild +++ /dev/null @@ -1,8 +0,0 @@ -# UAPI Header export list -header-y += lsm_params.h -header-y += audio_slimslave.h -header-y += audio_effects.h -header-y += devdep_params.h -header-y += msmcal-hwdep.h -header-y += wcd-dsp-glink.h -header-y += voice_params.h