Merge "arch/arm: Update the compilation flags for the QDSP interface." (42c03bd3) · Commits · e / devices / android_kernel_sony_msm8994

arch/arm/mach-msm/Kconfig

+3 −0

Original line number	Diff line number	Diff line
		@@ -88,6 +88,9 @@ config ARCH_MPQ8092
		select CPU_V7
		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_NOPM
		select MEMORY_HOLE_CARVEOUT
		select DONT_MAP_HOLE_AFTER_MEMBANK0

+24 −0

Original line number	Diff line number	Diff line
		@@ -29,6 +29,12 @@ static struct gpiomux_setting gpio_uart_config = {
		.pull = GPIOMUX_PULL_NONE,
		};

		static struct gpiomux_setting slimbus = {
		.func = GPIOMUX_FUNC_1,
		.drv = GPIOMUX_DRV_8MA,
		.pull = GPIOMUX_PULL_KEEPER,
		};

		static struct msm_gpiomux_config msm_blsp_configs[] __initdata = {
		{
		.gpio = 6, /* BLSP1 QUP2 I2C_SDA */
		@@ -91,6 +97,22 @@ static struct msm_gpiomux_config msm_ehci_configs[] = {
		},
		};

		static struct msm_gpiomux_config mpq8092_slimbus_config[] __initdata = {
		{
		.gpio = 43, /* slimbus clk */
		.settings = {
		[GPIOMUX_SUSPENDED] = &slimbus,
		},
		},
		{
		.gpio = 44, /* slimbus data */
		.settings = {
		[GPIOMUX_SUSPENDED] = &slimbus,
		},
		},
		};


		void __init mpq8092_init_gpiomux(void)
		{
		int rc;
		@@ -103,4 +125,6 @@ void __init mpq8092_init_gpiomux(void)

		msm_gpiomux_install(msm_blsp_configs, ARRAY_SIZE(msm_blsp_configs));
		msm_gpiomux_install(msm_ehci_configs, ARRAY_SIZE(msm_ehci_configs));
		msm_gpiomux_install(mpq8092_slimbus_config,
		ARRAY_SIZE(mpq8092_slimbus_config));
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -18,7 +18,7 @@

		#if defined(CONFIG_ARCH_MSM8974) \
		\|\| defined(CONFIG_ARCH_MSM8226) \|\| defined(CONFIG_ARCH_MSM8610) \
		\|\| defined(CONFIG_ARCH_APQ8084)
		\|\| defined(CONFIG_ARCH_APQ8084) \|\| defined(CONFIG_ARCH_MPQ8092)

		#include <sound/apr_audio-v2.h>
		#include <sound/q6asm-v2.h>