From 1cd212a9b9d50b60915faf16a3707e7b2b1d85ff Mon Sep 17 00:00:00 2001 From: Dipesh Gandhi Date: Thu, 19 Nov 2015 10:00:48 +0530 Subject: [PATCH] ASoC: tegra-alt: machine driver for bali Bug 200133225 Bug 1701860 Bug 1698137 Change-Id: I1e484f771d43f0d35a8a2406c803ae92d797e46f Signed-off-by: Dipesh Gandhi Signed-off-by: Gaurav Tendolkar Reviewed-on: http://git-master/r/834987 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Ravindra Lokhande Reviewed-by: Nitin Pai --- sound/soc/tegra-alt/Kconfig | 12 ++++++++++++ sound/soc/tegra-alt/Makefile | 17 +++++++++-------- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/sound/soc/tegra-alt/Kconfig b/sound/soc/tegra-alt/Kconfig index c58549f7..d2a21930 100644 --- a/sound/soc/tegra-alt/Kconfig +++ b/sound/soc/tegra-alt/Kconfig @@ -29,6 +29,15 @@ config SND_SOC_TEGRA_ALT_FORCE_CARD_REG 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_ASOC_MACHINE_T18X_ALT + tristate "Tegra ASoC machine driver" + depends on SND_SOC_TEGRA_ALT + help + Say Y or M, + if you want to add support for + Tegra ASoC + machine driver. + config SND_SOC_TEGRA_T186REF_ALT tristate "SoC Audio support for T186Ref" depends on SND_SOC_TEGRA_ALT @@ -54,6 +63,7 @@ config SND_SOC_TEGRA_T186REF_ALT select SND_SOC_TEGRA_ASOC_HWDEP_ALT select SND_SOC_SPDIF select SND_SOC_AD193X + select SND_SOC_TEGRA_ASOC_MACHINE_T18X_ALT help Say Y or M here. @@ -82,6 +92,7 @@ config SND_SOC_TEGRA_T186REF_MOBILE_ALT select SND_SOC_TEGRA_ASOC_HWDEP_ALT select SND_SOC_SPDIF select SND_SOC_RT5659 + select SND_SOC_TEGRA_ASOC_MACHINE_T18X_ALT help Say Y or M here. @@ -109,6 +120,7 @@ config SND_SOC_TEGRA_T186REF_AUTO_ALT select SND_SOC_TEGRA186_DSPK_ALT select SND_SOC_TEGRA_ASOC_HWDEP_ALT select SND_SOC_SPDIF + select SND_SOC_TEGRA_ASOC_MACHINE_T18X_ALT help Say Y or M here. diff --git a/sound/soc/tegra-alt/Makefile b/sound/soc/tegra-alt/Makefile index 6459ea05..6162c161 100644 --- a/sound/soc/tegra-alt/Makefile +++ b/sound/soc/tegra-alt/Makefile @@ -6,6 +6,8 @@ snd-soc-tegra186-alt-afc-objs := tegra186_afc_alt.o snd-soc-tegra186-alt-xbar-objs := tegra186_xbar_alt.o snd-soc-tegra186-alt-fpga-clock-objs := ahub_unit_fpga_clock_t18x.o snd-soc-tegra186-alt-dspk-objs := tegra186_dspk_alt.o +snd-soc-tegra-asoc-machine-alt-t18x-objs := tegra_asoc_machine_alt_t18x.o \ + ../../../../$(lastword $(subst /, ,$(srctree)))/sound/soc/tegra-alt/tegra_asoc_machine_alt.o obj-$(CONFIG_SND_SOC_TEGRA186_ASRC_ALT) += snd-soc-tegra186-alt-asrc.o obj-$(CONFIG_SND_SOC_TEGRA186_ARAD_ALT) += snd-soc-tegra186-alt-arad.o @@ -13,15 +15,14 @@ obj-$(CONFIG_SND_SOC_TEGRA210_AFC_ALT) += snd-soc-tegra186-alt-afc.o obj-$(CONFIG_SND_SOC_TEGRA210_XBAR_ALT) += snd-soc-tegra186-alt-xbar.o obj-$(CONFIG_SND_SOC_TEGRA_ALT) += snd-soc-tegra186-alt-fpga-clock.o obj-$(CONFIG_SND_SOC_TEGRA186_DSPK_ALT) += snd-soc-tegra186-alt-dspk.o +obj-$(CONFIG_SND_SOC_TEGRA_ASOC_MACHINE_T18X_ALT) += snd-soc-tegra-asoc-machine-alt-t18x.o + +snd-soc-tegra-alt-t186ref-objs := tegra_t186ref_alt.o +snd-soc-tegra-alt-t186ref-mobile-objs := tegra_t186ref_mobile_rt565x.o +snd-soc-tegra-alt-t186ref-auto-objs := \ + tegra_t186ref_p2382_alt.o \ + tegra_t186ref_bali_alt.o -# The funky manipulation of $(srctree) is for dynamically finding the name of -# 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 -snd-soc-tegra-alt-t186ref-auto-objs := tegra_t186ref_p2382_alt.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 obj-$(CONFIG_SND_SOC_TEGRA_T186REF_AUTO_ALT) += snd-soc-tegra-alt-t186ref-auto.o