Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 0c24fdc0 authored by Guenter Roeck's avatar Guenter Roeck Committed by Mark Brown
Browse files

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: default avatarGuenter Roeck <groeck@chromium.org>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 348f4822

sound/soc/intel/skylake/skl-tplg-interface.h→include/uapi/sound/skl-tplg-interface.h

+1 −10
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 * skl-tplg-interface.h - Intel DSP FW private data interface

 *

 * Copyright (C) 2015 Intel Corp

 * Author: Jeeja KP <jeeja.kp@intel.com>

 *	    Nilofer, Samreen <samreen.nilofer@intel.com>

 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as version 2, as

 * published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful, but

 * WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

 * General Public License for more details.

 */



#ifndef __HDA_TPLG_INTERFACE_H__

sound/soc/intel/skylake/skl-debug.c

+1 −1
Original line number Diff line number Diff line
@@ -15,10 +15,10 @@ 


#include <linux/pci.h>

#include <linux/debugfs.h>

#include <uapi/sound/skl-tplg-interface.h>

#include "skl.h"

#include "skl-sst-dsp.h"

#include "skl-sst-ipc.h"

#include "skl-tplg-interface.h"

#include "skl-topology.h"

#include "../common/sst-dsp.h"

#include "../common/sst-dsp-priv.h"

sound/soc/intel/skylake/skl-messages.c

+1 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/pci.h>

#include <sound/core.h>

#include <sound/pcm.h>

#include <uapi/sound/skl-tplg-interface.h>

#include "skl-sst-dsp.h"

#include "cnl-sst-dsp.h"

#include "skl-sst-ipc.h"
@@ -28,7 +29,6 @@ 
#include "../common/sst-dsp.h"

#include "../common/sst-dsp-priv.h"

#include "skl-topology.h"

#include "skl-tplg-interface.h"



static int skl_alloc_dma_buf(struct device *dev,

		struct snd_dma_buffer *dmab, size_t size)

sound/soc/intel/skylake/skl-topology.c

+1 −1
Original line number Diff line number Diff line
@@ -23,11 +23,11 @@ 
#include <sound/soc.h>

#include <sound/soc-topology.h>

#include <uapi/sound/snd_sst_tokens.h>

#include <uapi/sound/skl-tplg-interface.h>

#include "skl-sst-dsp.h"

#include "skl-sst-ipc.h"

#include "skl-topology.h"

#include "skl.h"

#include "skl-tplg-interface.h"

#include "../common/sst-dsp.h"

#include "../common/sst-dsp-priv.h"

sound/soc/intel/skylake/skl-topology.h

+1 −1
Original line number Diff line number Diff line
@@ -25,8 +25,8 @@ 


#include <sound/hdaudio_ext.h>

#include <sound/soc.h>

#include <uapi/sound/skl-tplg-interface.h>

#include "skl.h"

#include "skl-tplg-interface.h"



#define BITS_PER_BYTE 8

#define MAX_TS_GROUPS 8