From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
To: alsa-devel@alsa-project.org
Cc: tiwai@suse.de,
Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>,
Daniel Drake <drake@endlessm.com>,
Hui Wang <hui.wang@canonical.com>,
Curtis Malainey <cujomalainey@google.com>,
broonie@kernel.org
Subject: [PATCH 1/6] ASoC: Intel: Skylake: move NHLT header to common directory
Date: Fri, 19 Jul 2019 12:06:05 -0500 [thread overview]
Message-ID: <20190719170610.17610-2-pierre-louis.bossart@linux.intel.com> (raw)
In-Reply-To: <20190719170610.17610-1-pierre-louis.bossart@linux.intel.com>
Prepare move from NHLT code to common directory, starting with header.
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---
sound/soc/intel/skylake/skl-nhlt.h => include/sound/intel-nhlt.h | 0
sound/soc/intel/skylake/skl-nhlt.c | 1 +
sound/soc/intel/skylake/skl-ssp-clk.c | 1 +
sound/soc/intel/skylake/skl-topology.c | 1 +
sound/soc/intel/skylake/skl.h | 1 -
5 files changed, 3 insertions(+), 1 deletion(-)
rename sound/soc/intel/skylake/skl-nhlt.h => include/sound/intel-nhlt.h (100%)
diff --git a/sound/soc/intel/skylake/skl-nhlt.h b/include/sound/intel-nhlt.h
similarity index 100%
rename from sound/soc/intel/skylake/skl-nhlt.h
rename to include/sound/intel-nhlt.h
diff --git a/sound/soc/intel/skylake/skl-nhlt.c b/sound/soc/intel/skylake/skl-nhlt.c
index 1132109cb992..aabc5d71650e 100644
--- a/sound/soc/intel/skylake/skl-nhlt.c
+++ b/sound/soc/intel/skylake/skl-nhlt.c
@@ -9,6 +9,7 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
*/
#include <linux/pci.h>
+#include <sound/intel-nhlt.h>
#include "skl.h"
#include "skl-i2s.h"
diff --git a/sound/soc/intel/skylake/skl-ssp-clk.c b/sound/soc/intel/skylake/skl-ssp-clk.c
index 5bb6e40d4d3e..5bfcd46452f9 100644
--- a/sound/soc/intel/skylake/skl-ssp-clk.c
+++ b/sound/soc/intel/skylake/skl-ssp-clk.c
@@ -11,6 +11,7 @@
#include <linux/platform_device.h>
#include <linux/clk-provider.h>
#include <linux/clkdev.h>
+#include <sound/intel-nhlt.h>
#include "skl.h"
#include "skl-ssp-clk.h"
#include "skl-topology.h"
diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c
index 6241e35213af..f8a501cf5fbd 100644
--- a/sound/soc/intel/skylake/skl-topology.c
+++ b/sound/soc/intel/skylake/skl-topology.c
@@ -12,6 +12,7 @@
#include <linux/types.h>
#include <linux/firmware.h>
#include <linux/uuid.h>
+#include <sound/intel-nhlt.h>
#include <sound/soc.h>
#include <sound/soc-topology.h>
#include <uapi/sound/snd_sst_tokens.h>
diff --git a/sound/soc/intel/skylake/skl.h b/sound/soc/intel/skylake/skl.h
index 6070666a6392..928e8115a1a7 100644
--- a/sound/soc/intel/skylake/skl.h
+++ b/sound/soc/intel/skylake/skl.h
@@ -16,7 +16,6 @@
#include <sound/hdaudio_ext.h>
#include <sound/hda_codec.h>
#include <sound/soc.h>
-#include "skl-nhlt.h"
#include "skl-ssp-clk.h"
#define SKL_SUSPEND_DELAY 2000
--
2.20.1
next prev parent reply other threads:[~2019-07-19 17:06 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-19 17:06 [PATCH 0/6] ALSA/HDA: abort probe when DMICs are detected Pierre-Louis Bossart
2019-07-19 17:06 ` Pierre-Louis Bossart [this message]
2019-07-19 17:06 ` [PATCH 2/6] ALSA: hda: move parts of NHLT code to new module Pierre-Louis Bossart
2019-07-19 17:06 ` [PATCH 3/6] ALSA: hda: intel-nhlt: remove useless OR operation Pierre-Louis Bossart
2019-07-19 18:09 ` Takashi Iwai
2019-07-19 18:20 ` Pierre-Louis Bossart
2019-07-19 18:30 ` Takashi Iwai
2019-07-19 17:06 ` [PATCH 4/6] ALSA: hda: intel-nhlt: handle NHLT VENDOR_DEFINED DMIC geometry Pierre-Louis Bossart
2019-07-19 17:06 ` [PATCH 5/6] ASoC: Intel: Skylake: use common NHLT module Pierre-Louis Bossart
2019-07-19 17:06 ` [PATCH 6/6] ALSA: hda/intel: stop probe if DMICS are detected on Skylake+ platforms Pierre-Louis Bossart
2019-07-19 18:13 ` Takashi Iwai
2019-07-19 18:29 ` Pierre-Louis Bossart
2019-07-19 18:55 ` Takashi Iwai
2019-07-19 20:21 ` Pierre-Louis Bossart
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190719170610.17610-2-pierre-louis.bossart@linux.intel.com \
--to=pierre-louis.bossart@linux.intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=cujomalainey@google.com \
--cc=drake@endlessm.com \
--cc=hui.wang@canonical.com \
--cc=tiwai@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.