Unverified Commit b972153d authored by Cezary Rojewski's avatar Cezary Rojewski Committed by Mark Brown
Browse files

ASoC: Intel: Make atom components independent of sst-dsp 



With sound/soc/intel/haswell and /baytrail gone, registers left within
sst-dsp header are atom-specific. Relocate these to atom internal header
to make atom truely independent of sound/soc/common processing code.

Signed-off-by: default avatarCezary Rojewski <cezary.rojewski@intel.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: default avatarLiam Girdwood <liam.r.girdwood@intel.com>
Link: https://lore.kernel.org/r/20201006064907.16277-12-cezary.rojewski@intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 7d07f9c1

sound/soc/intel/atom/sst/sst.c

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#include <asm/platform_sst_audio.h>

#include "../sst-mfld-platform.h"

#include "sst.h"

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



MODULE_AUTHOR("Vinod Koul <vinod.koul@intel.com>");

MODULE_AUTHOR("Harsha Priya <priya.harsha@intel.com>");

sound/soc/intel/atom/sst/sst.h

+7 −0
Original line number Diff line number Diff line
@@ -34,6 +34,13 @@ 
#define MRFLD_FW_FEATURE_BASE_OFFSET 0x4

#define MRFLD_FW_BSS_RESET_BIT 0



/* SST Shim register map */

#define SST_CSR			0x00

#define SST_ISRX		0x18

#define SST_IMRX		0x28

#define SST_IPCX		0x38 /* IPC IA -> SST */

#define SST_IPCD		0x40 /* IPC SST -> IA */



extern const struct dev_pm_ops intel_sst_pm;

enum sst_states {

	SST_FW_LOADING = 1,

sound/soc/intel/atom/sst/sst_acpi.c

+0 −1
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ 
#include <sound/soc-acpi.h>

#include <sound/soc-acpi-intel-match.h>

#include "../sst-mfld-platform.h"

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

#include "../../common/soc-intel-quirks.h"

#include "sst.h"

sound/soc/intel/atom/sst/sst_drv_interface.c

+0 −3
Original line number Diff line number Diff line
@@ -24,9 +24,6 @@ 
#include <asm/platform_sst_audio.h>

#include "../sst-mfld-platform.h"

#include "sst.h"

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







#define NUM_CODEC 2

#define MIN_FRAGMENT 2

sound/soc/intel/atom/sst/sst_ipc.c

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 
#include <asm/platform_sst_audio.h>

#include "../sst-mfld-platform.h"

#include "sst.h"

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



struct sst_block *sst_create_block(struct intel_sst_drv *ctx,

					u32 msg_id, u32 drv_id)

CRA Git | Maintained and supported by SUSTech CRA and CCSE