From 182bc1927b2961b83c36d2aaf9e5d6ed059ea278 Mon Sep 17 00:00:00 2001
From: Mohan Kumar <mkumard@nvidia.com>
Date: Mon, 10 Aug 2015 17:18:19 +0530
Subject: [PATCH] ASoC: tegra-alt: Add Machine driver for Quill

Add the Machine driver support for Quill board which has rt5658 codec
on it.

Bug 200127320

Change-Id: I871d436438dc5830eabe1e0616648bd05886ed6c
Signed-off-by: Mohan Kumar <mkumard@nvidia.com>
Reviewed-on: http://git-master/r/781091
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
---
 sound/soc/tegra-alt/Kconfig  | 35 +++++++++++++++++++++++++++++++++++
 sound/soc/tegra-alt/Makefile |  3 +++
 2 files changed, 38 insertions(+)

diff --git a/sound/soc/tegra-alt/Kconfig b/sound/soc/tegra-alt/Kconfig
index c8531156..0cbe9345 100644
--- a/sound/soc/tegra-alt/Kconfig
+++ b/sound/soc/tegra-alt/Kconfig
@@ -22,6 +22,13 @@ config SND_SOC_TEGRA186_ARAD_ALT
 	help
 	  Say Y or M if you want to add support for Tegra186 ARAD module.
 
+config SND_SOC_TEGRA_ALT_FORCE_CARD_REG
+	tristate "Enable sound card even if audio codec is missing on board"
+	depends on SND_SOC_TEGRA_ALT
+	help
+	  Say Y or M if you want to register the sound card even if audio codec
+	  is not connected/present on board.
+
 config SND_SOC_TEGRA_T186REF_ALT
 	tristate "SoC Audio support for T186Ref"
 	depends on SND_SOC_TEGRA_ALT
@@ -50,6 +57,34 @@ config SND_SOC_TEGRA_T186REF_ALT
 	help
 	  Say Y or M here.
 
+config SND_SOC_TEGRA_T186REF_MOBILE_ALT
+        tristate "SoC Audio support for T186Ref Mobile"
+        depends on SND_SOC_TEGRA_ALT
+        depends on ARCH_TEGRA_18x_SOC
+        select SND_SOC_TEGRA210_XBAR_ALT
+        select SND_SOC_TEGRA210_PCM_ALT
+        select SND_SOC_TEGRA210_ADMA_ALT
+        select SND_SOC_TEGRA210_ADMAIF_ALT
+        select SND_SOC_TEGRA210_I2S_ALT
+        select SND_SOC_TEGRA210_DMIC_ALT
+        select SND_SOC_TEGRA210_AMX_ALT
+        select SND_SOC_TEGRA210_ADX_ALT
+        select SND_SOC_TEGRA210_MIXER_ALT
+        select SND_SOC_TEGRA210_SFC_ALT
+        select SND_SOC_TEGRA210_AFC_ALT
+        select SND_SOC_TEGRA210_MVC_ALT
+        select SND_SOC_TEGRA210_OPE_ALT
+        select SND_SOC_TEGRA210_SPDIF_ALT
+        select SND_SOC_TEGRA210_ADSP_ALT
+        select SND_SOC_TEGRA186_ASRC_ALT
+        select SND_SOC_TEGRA186_ARAD_ALT
+        select SND_SOC_TEGRA186_DSPK_ALT
+        select SND_SOC_TEGRA_ASOC_HWDEP_ALT
+        select SND_SOC_SPDIF
+        select SND_SOC_RT5659
+        help
+          Say Y or M here.
+
 config SND_SOC_TEGRA186_ARAD_WAR
 	def_bool y
 	depends on SND_SOC_TEGRA186_ARAD_ALT
diff --git a/sound/soc/tegra-alt/Makefile b/sound/soc/tegra-alt/Makefile
index cdef1c82..6e8c2e46 100644
--- a/sound/soc/tegra-alt/Makefile
+++ b/sound/soc/tegra-alt/Makefile
@@ -18,5 +18,8 @@ obj-$(CONFIG_SND_SOC_TEGRA186_DSPK_ALT) += snd-soc-tegra186-alt-dspk.o
 # the kernel root dir.
 snd-soc-tegra-alt-t186ref-objs := tegra_t186ref_alt.o tegra_asoc_machine_alt_t18x.o \
 	../../../../$(lastword $(subst /, ,$(srctree)))/sound/soc/tegra-alt/tegra_asoc_machine_alt.o
+snd-soc-tegra-alt-t186ref-mobile-objs := tegra_t186ref_mobile_rt565x.o tegra_asoc_machine_alt_t18x.o \
+        ../../../../$(lastword $(subst /, ,$(srctree)))/sound/soc/tegra-alt/tegra_asoc_machine_alt.o
 
 obj-$(CONFIG_SND_SOC_TEGRA_T186REF_ALT) += snd-soc-tegra-alt-t186ref.o
+obj-$(CONFIG_SND_SOC_TEGRA_T186REF_MOBILE_ALT) += snd-soc-tegra-alt-t186ref-mobile.o