Skip to content

Commit b972153

Browse files
crojewsk-intelbroonie
authored andcommitted
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: Cezary Rojewski <cezary.rojewski@intel.com> Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Acked-by: Liam Girdwood <liam.r.girdwood@intel.com> Link: https://lore.kernel.org/r/20201006064907.16277-12-cezary.rojewski@intel.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 7d07f9c commit b972153

11 files changed

Lines changed: 7 additions & 21 deletions

File tree

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
#include <asm/platform_sst_audio.h>
2727
#include "../sst-mfld-platform.h"
2828
#include "sst.h"
29-
#include "../../common/sst-dsp.h"
3029

3130
MODULE_AUTHOR("Vinod Koul <vinod.koul@intel.com>");
3231
MODULE_AUTHOR("Harsha Priya <priya.harsha@intel.com>");

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,13 @@
3434
#define MRFLD_FW_FEATURE_BASE_OFFSET 0x4
3535
#define MRFLD_FW_BSS_RESET_BIT 0
3636

37+
/* SST Shim register map */
38+
#define SST_CSR 0x00
39+
#define SST_ISRX 0x18
40+
#define SST_IMRX 0x28
41+
#define SST_IPCX 0x38 /* IPC IA -> SST */
42+
#define SST_IPCD 0x40 /* IPC SST -> IA */
43+
3744
extern const struct dev_pm_ops intel_sst_pm;
3845
enum sst_states {
3946
SST_FW_LOADING = 1,

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
#include <sound/soc-acpi.h>
3232
#include <sound/soc-acpi-intel-match.h>
3333
#include "../sst-mfld-platform.h"
34-
#include "../../common/sst-dsp.h"
3534
#include "../../common/soc-intel-quirks.h"
3635
#include "sst.h"
3736

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@
2424
#include <asm/platform_sst_audio.h>
2525
#include "../sst-mfld-platform.h"
2626
#include "sst.h"
27-
#include "../../common/sst-dsp.h"
28-
29-
3027

3128
#define NUM_CODEC 2
3229
#define MIN_FRAGMENT 2

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
#include <asm/platform_sst_audio.h>
2525
#include "../sst-mfld-platform.h"
2626
#include "sst.h"
27-
#include "../../common/sst-dsp.h"
2827

2928
struct sst_block *sst_create_block(struct intel_sst_drv *ctx,
3029
u32 msg_id, u32 drv_id)

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
#include <asm/platform_sst_audio.h>
3030
#include "../sst-mfld-platform.h"
3131
#include "sst.h"
32-
#include "../../common/sst-dsp.h"
3332

3433
void memcpy32_toio(void __iomem *dst, const void *src, int count)
3534
{

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
#include <asm/platform_sst_audio.h>
2727
#include "../sst-mfld-platform.h"
2828
#include "sst.h"
29-
#include "../../common/sst-dsp.h"
3029

3130
int sst_shim_write(void __iomem *addr, int offset, int value)
3231
{

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
#include <asm/platform_sst_audio.h>
2424
#include "../sst-mfld-platform.h"
2525
#include "sst.h"
26-
#include "../../common/sst-dsp.h"
2726

2827
int sst_alloc_stream_mrfld(struct intel_sst_drv *sst_drv_ctx, void *params)
2928
{

sound/soc/intel/boards/bytcht_es8316.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
#include <sound/soc.h>
2929
#include <sound/soc-acpi.h>
3030
#include "../atom/sst-atom-controls.h"
31-
#include "../common/sst-dsp.h"
3231
#include "../common/soc-intel-quirks.h"
3332

3433
/* jd-inv + terminating entry */

sound/soc/intel/boards/bytcr_rt5640.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
#include <dt-bindings/sound/rt5640.h>
2929
#include "../../codecs/rt5640.h"
3030
#include "../atom/sst-atom-controls.h"
31-
#include "../common/sst-dsp.h"
3231
#include "../common/soc-intel-quirks.h"
3332

3433
enum {

0 commit comments

Comments
 (0)