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

Commit 6f141ab0 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: qdsp6v2: reorganize kernel driver under misc drivers."

parents c1fde0c5 de06bb1c

arch/arm/mach-msm/Kconfig

+2 −56
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ config ARCH_MSM8974 
	select HAVE_ARM_ARCH_TIMER

	select MSM_QDSP6_APRV2

	select MSM_QDSP6V2_CODECS

	select MSM_AUDIO_QDSP6V2 if SND_SOC

	select REGULATOR_RPM_SMD

	select ARM_HAS_SG_CHAIN

	select MSM_RUN_QUEUE_STATS
@@ -50,8 +49,7 @@ config ARCH_APQ8084 
	select MSM_PM8X60 if PM

	select REGULATOR

	select MSM_QDSP6V2_CODECS

	select MSM_AUDIO_QDSP6V2 if SND_SOC

	select MSM_QDSP6_APRV2 if MSM_AUDIO_QDSP6V2

	select MSM_QDSP6_APRV2 if SND_SOC

	select REGULATOR_RPM_SMD

	select MIGHT_HAVE_PCI

	select ARCH_SUPPORTS_MSI
@@ -89,8 +87,7 @@ config ARCH_MPQ8092 
	select MSM_SCM

	select MSM_GPIOMUX

	select MSM_QDSP6V2_CODECS

	select MSM_AUDIO_QDSP6V2 if SND_SOC

	select MSM_QDSP6_APRV2 if MSM_AUDIO_QDSP6V2

	select MSM_QDSP6_APRV2 if SND_SOC

	select MSM_NOPM

	select MEMORY_HOLE_CARVEOUT

	select DONT_MAP_HOLE_AFTER_MEMBANK0
@@ -163,7 +160,6 @@ config ARCH_MSM8610 
	select MSM_NATIVE_RESTART

	select MSM_QDSP6_APRV2

	select MSM_QDSP6V2_CODECS

	select MSM_AUDIO_QDSP6V2 if SND_SOC

	select QMI_ENCDEC

	select MSM_RPM_SMD

	select MSM_SPM_V2
@@ -205,7 +201,6 @@ config ARCH_MSM8226 
	select MSM_NATIVE_RESTART

	select MSM_QDSP6_APRV2

	select MSM_QDSP6V2_CODECS

	select MSM_AUDIO_QDSP6V2 if SND_SOC

	select QMI_ENCDEC

	select MSM_RPM_SMD

	select MSM_SPM_V2
@@ -251,7 +246,6 @@ config ARCH_MSMSAMARIUM 
	select MSM_NATIVE_RESTART

	select MSM_QDSP6_APRV2

	select MSM_QDSP6V2_CODECS

	select MSM_AUDIO_QDSP6V2 if SND_SOC

	select MSM_PM8X60 if PM

	select MSM_RPM_SMD

	select REGULATOR
@@ -1213,54 +1207,6 @@ config MSM_SHOW_RESUME_IRQ 
		the resume loop unrolls. Say Y if you want to debug why the system

		resumed.



config MSM_QDSP6_APRV2

	bool "Audio QDSP6 APRv2 support"

	depends on MSM_SMD

	default n

	help

	  Enable APRv2 IPC protocol support between

	  application processor and QDSP6. APR is

	  used by audio driver to configure QDSP6's

	  ASM, ADM and AFE.



config MSM_QDSP6_APRV3

	bool "Audio Modem DSP APRv3 support"

	depends on MSM_SMD

	help

	  Enable APRv3 IPC protocol support between

	  application processor and Modem DSP. APR is

	  used by audio driver to configure MDSP's

	  ASM, ADM and AFE.



config MSM_QDSP6V2_CODECS

	bool "Audio QDSP6V2 APR support"

	depends on MSM_SMD

	help

	  Enable Audio codecs with APR IPC protocol support between

	  application processor and QDSP6 for B-family. APR is

	  used by audio driver to configure QDSP6's

	  ASM, ADM and AFE.



config MSM_AUDIO_QDSP6V2

        bool "QDSP6V2 HW Audio support"

        select SND_SOC_MSM_QDSP6V2_INTF

        help

          Enable HW audio support in QDSP6V2.

          QDSP6V2 can support HW encoder & decoder and

          audio processing. It will enable support for

          AAC, AMRNB, AMRWB, EVRC, MP3, QCELP among

          others.



config MSM_ADSP_LOADER

        tristate "ADSP loader support"

        select SND_SOC_MSM_APRV2_INTF

	depends on MSM_AUDIO_QDSP6V2

        help

          Enable ADSP image loader.

	  The ADSP loader brings ADSP out of reset

	  for the platforms that use APRv2.

	  Say M if you want to enable this module.



config MSM_ULTRASOUND_B

	bool "QDSP6V2 HW Ultrasound support"

	help

arch/arm/mach-msm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ obj-$(CONFIG_MSM_IPC_ROUTER_SECURITY)+= msm_ipc_router_security.o 
obj-$(CONFIG_MSM_QMI_INTERFACE) += msm_qmi_interface.o

obj-$(CONFIG_MSM_TEST_QMI_CLIENT) += kernel_test_service_v01.o test_qmi_client.o

obj-$(CONFIG_DEBUG_FS) += smd_rpc_sym.o

obj-$(CONFIG_MSM_AUDIO_QDSP6V2) += qdsp6v2/

obj-y += qdsp6v2/

obj-$(CONFIG_PM) += pm-boot.o

obj-$(CONFIG_MSM_IDLE_STATS) += pm-stats.o

obj-$(CONFIG_MSM_NOPM) += no-pm.o

arch/arm/mach-msm/include/mach/qdsp6v2/apr_us.h

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
#ifndef __APR_US_H__

#define __APR_US_H__



#include <mach/qdsp6v2/apr.h>

#include <linux/qdsp6v2/apr.h>



/* ======================================================================= */

/*  Session Level commands */

arch/arm/mach-msm/qdsp6v2/Makefile

+0 −7
Original line number Diff line number Diff line 
obj-$(CONFIG_MSM_QDSP6_APRV2) += apr.o apr_v2.o apr_tal.o dsp_debug.o

obj-$(CONFIG_MSM_QDSP6_APRV3) += apr.o apr_v3.o apr_tal.o

obj-$(CONFIG_MSM_QDSP6V2_CODECS) += aac_in.o qcelp_in.o evrc_in.o amrnb_in.o audio_utils.o

obj-$(CONFIG_MSM_QDSP6V2_CODECS) += audio_wma.o audio_wmapro.o audio_aac.o audio_multi_aac.o audio_utils_aio.o

obj-$(CONFIG_MSM_QDSP6V2_CODECS) += q6audio_v2.o q6audio_v2_aio.o msm_audio_ion.o

obj-$(CONFIG_MSM_QDSP6V2_CODECS)  += audio_mp3.o audio_amrnb.o audio_amrwb.o audio_amrwbplus.o audio_evrc.o audio_qcelp.o amrwb_in.o

obj-$(CONFIG_MSM_ADSP_LOADER) += adsp-loader.o

obj-$(CONFIG_MSM_ULTRASOUND_B) += ultrasound/

drivers/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ obj-$(CONFIG_FB_I810) += video/i810/ 
obj-$(CONFIG_FB_INTEL)          += video/intelfb/



obj-$(CONFIG_PARPORT)		+= parport/

obj-y				+= base/ block/ misc/ mfd/ nfc/

obj-y				+= base/ block/ misc/ mfd/ nfc/ soc/

obj-$(CONFIG_NUBUS)		+= nubus/

obj-y				+= macintosh/

obj-$(CONFIG_IDE)		+= ide/