Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ASoC: topology: Move skl-tplg-interface.h to uapi

skl-tplg-interface.h describes firmware format details for Skylake
topology files. It is part of the ABI and should reside in the uapi
directory.

While moving the file, also replace the license boilerplate with
the SPDX License Identifier.

No functional change.

Signed-off-by: Guenter Roeck <groeck@chromium.org>
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Guenter Roeck and committed by
Mark Brown
0c24fdc0 348f4822

+5 -14
+1 -1
sound/soc/intel/skylake/skl-debug.c
··· 15 15 16 16 #include <linux/pci.h> 17 17 #include <linux/debugfs.h> 18 + #include <uapi/sound/skl-tplg-interface.h> 18 19 #include "skl.h" 19 20 #include "skl-sst-dsp.h" 20 21 #include "skl-sst-ipc.h" 21 - #include "skl-tplg-interface.h" 22 22 #include "skl-topology.h" 23 23 #include "../common/sst-dsp.h" 24 24 #include "../common/sst-dsp-priv.h"
+1 -1
sound/soc/intel/skylake/skl-messages.c
··· 21 21 #include <linux/pci.h> 22 22 #include <sound/core.h> 23 23 #include <sound/pcm.h> 24 + #include <uapi/sound/skl-tplg-interface.h> 24 25 #include "skl-sst-dsp.h" 25 26 #include "cnl-sst-dsp.h" 26 27 #include "skl-sst-ipc.h" ··· 29 28 #include "../common/sst-dsp.h" 30 29 #include "../common/sst-dsp-priv.h" 31 30 #include "skl-topology.h" 32 - #include "skl-tplg-interface.h" 33 31 34 32 static int skl_alloc_dma_buf(struct device *dev, 35 33 struct snd_dma_buffer *dmab, size_t size)
+1 -1
sound/soc/intel/skylake/skl-topology.c
··· 23 23 #include <sound/soc.h> 24 24 #include <sound/soc-topology.h> 25 25 #include <uapi/sound/snd_sst_tokens.h> 26 + #include <uapi/sound/skl-tplg-interface.h> 26 27 #include "skl-sst-dsp.h" 27 28 #include "skl-sst-ipc.h" 28 29 #include "skl-topology.h" 29 30 #include "skl.h" 30 - #include "skl-tplg-interface.h" 31 31 #include "../common/sst-dsp.h" 32 32 #include "../common/sst-dsp-priv.h" 33 33
+1 -1
sound/soc/intel/skylake/skl-topology.h
··· 25 25 26 26 #include <sound/hdaudio_ext.h> 27 27 #include <sound/soc.h> 28 + #include <uapi/sound/skl-tplg-interface.h> 28 29 #include "skl.h" 29 - #include "skl-tplg-interface.h" 30 30 31 31 #define BITS_PER_BYTE 8 32 32 #define MAX_TS_GROUPS 8
+1 -10
sound/soc/intel/skylake/skl-tplg-interface.h include/uapi/sound/skl-tplg-interface.h
··· 1 + /* SPDX-License-Identifier: GPL-2.0 */ 1 2 /* 2 3 * skl-tplg-interface.h - Intel DSP FW private data interface 3 4 * 4 5 * Copyright (C) 2015 Intel Corp 5 6 * Author: Jeeja KP <jeeja.kp@intel.com> 6 7 * Nilofer, Samreen <samreen.nilofer@intel.com> 7 - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 8 - * 9 - * This program is free software; you can redistribute it and/or modify 10 - * it under the terms of the GNU General Public License as version 2, as 11 - * published by the Free Software Foundation. 12 - * 13 - * This program is distributed in the hope that it will be useful, but 14 - * WITHOUT ANY WARRANTY; without even the implied warranty of 15 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 16 - * General Public License for more details. 17 8 */ 18 9 19 10 #ifndef __HDA_TPLG_INTERFACE_H__