diff options
author | Sameer Pujar <spujar@nvidia.com> | 2017-08-07 05:49:47 -0400 |
---|---|---|
committer | Sameer Pujar <spujar@nvidia.com> | 2017-08-07 05:49:47 -0400 |
commit | bd23fd2b9c6bee4692d28f8770e9c5128af2cc5f (patch) | |
tree | 1067ab8f81b7207288e1a2f1cfd9fd66cd6c1ed4 /sound/pci/hda | |
parent | a570ab5cd3aa4d6e39773557db8d6e742426fa9f (diff) |
ALSA: hda: makefile and kconfig changes
hda driver is moved to nvidia repo and this would be common
across the kernel versions. Required makefile and kconfig
changes are made to build the hda driver from new path
Bug 200325738
Change-Id: Ie67b1bd835abcb8475c1a189c1848329657af057
Diffstat (limited to 'sound/pci/hda')
-rw-r--r-- | sound/pci/hda/Kconfig.nvidia | 15 | ||||
-rw-r--r-- | sound/pci/hda/Makefile.nvidia | 2 | ||||
-rw-r--r-- | sound/pci/hda/hda_tegra.c | 4 |
3 files changed, 20 insertions, 1 deletions
diff --git a/sound/pci/hda/Kconfig.nvidia b/sound/pci/hda/Kconfig.nvidia new file mode 100644 index 000000000..f6f30e7db --- /dev/null +++ b/sound/pci/hda/Kconfig.nvidia | |||
@@ -0,0 +1,15 @@ | |||
1 | config SND_HDA_TEGRA | ||
2 | tristate "NVIDIA Tegra HD Audio" | ||
3 | depends on ARCH_TEGRA || ARCH_TEGRA_18x_SOC | ||
4 | select SND_HDA | ||
5 | help | ||
6 | Say Y here to support the HDA controller present in NVIDIA | ||
7 | Tegra SoCs | ||
8 | |||
9 | This options enables support for the HD Audio controller | ||
10 | present in some NVIDIA Tegra SoCs, used to communicate audio | ||
11 | to the HDMI output. | ||
12 | |||
13 | To compile this driver as a module, choose M here: the module | ||
14 | will be called snd-hda-tegra. | ||
15 | |||
diff --git a/sound/pci/hda/Makefile.nvidia b/sound/pci/hda/Makefile.nvidia new file mode 100644 index 000000000..62b319a14 --- /dev/null +++ b/sound/pci/hda/Makefile.nvidia | |||
@@ -0,0 +1,2 @@ | |||
1 | snd-hda-tegra-objs := hda_tegra.o | ||
2 | obj-$(CONFIG_SND_HDA_TEGRA) += snd-hda-tegra.o | ||
diff --git a/sound/pci/hda/hda_tegra.c b/sound/pci/hda/hda_tegra.c index e256b6a8a..2472cc94c 100644 --- a/sound/pci/hda/hda_tegra.c +++ b/sound/pci/hda/hda_tegra.c | |||
@@ -2,7 +2,7 @@ | |||
2 | * | 2 | * |
3 | * Implementation of primary ALSA driver code base for NVIDIA Tegra HDA. | 3 | * Implementation of primary ALSA driver code base for NVIDIA Tegra HDA. |
4 | * | 4 | * |
5 | * Copyright (c) 2014-2016, NVIDIA CORPORATION, All rights reserved. | 5 | * Copyright (c) 2014-2017, NVIDIA CORPORATION, All rights reserved. |
6 | * | 6 | * |
7 | * This program is free software; you can redistribute it and/or modify it | 7 | * This program is free software; you can redistribute it and/or modify it |
8 | * under the terms and conditions of the GNU General Public License, | 8 | * under the terms and conditions of the GNU General Public License, |
@@ -573,6 +573,8 @@ static int hda_tegra_create(struct snd_card *card, | |||
573 | if (err < 0) | 573 | if (err < 0) |
574 | return err; | 574 | return err; |
575 | 575 | ||
576 | chip->bus.needs_damn_long_delay = 0; | ||
577 | |||
576 | err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops); | 578 | err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops); |
577 | if (err < 0) { | 579 | if (err < 0) { |
578 | dev_err(card->dev, "Error creating device\n"); | 580 | dev_err(card->dev, "Error creating device\n"); |