Skip to content

Commit 7d07f9c

Browse files
crojewsk-intelbroonie
crojewsk-intel
authored and
broonie
committed
ASoC: Intel: Remove SST-legacy specific constants
As sound/soc/intel/haswell and /baytrail are no more, all SST-legacy specific constants and registers are redundant so remove them. 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-11-cezary.rojewski@intel.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent b4e6080 commit 7d07f9c

3 files changed

Lines changed: 0 additions & 148 deletions

File tree

‎sound/soc/intel/common/sst-dsp-priv.h‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@
1515

1616
#include "../skylake/skl-sst-dsp.h"
1717

18-
/* do we need to remove or keep */
19-
#define DSP_DRAM_ADDR_OFFSET 0x400000
20-
2118
/*
2219
* DSP Operations exported by platform Audio DSP driver.
2320
*/

‎sound/soc/intel/common/sst-dsp.h‎

Lines changed: 0 additions & 143 deletions
Original file line numberDiff line numberDiff line change
@@ -12,158 +12,15 @@
1212
#include <linux/types.h>
1313
#include <linux/interrupt.h>
1414

15-
/* SST Device IDs */
16-
#define SST_DEV_ID_LYNX_POINT 0x33C8
17-
#define SST_DEV_ID_WILDCAT_POINT 0x3438
18-
#define SST_DEV_ID_BYT 0x0F28
19-
20-
/* Supported SST DMA Devices */
21-
#define SST_DMA_TYPE_DW 1
22-
23-
/* autosuspend delay 5s*/
24-
#define SST_RUNTIME_SUSPEND_DELAY (5 * 1000)
25-
2615
/* SST Shim register map
2716
* The register naming can differ between products. Some products also
2817
* contain extra functionality.
2918
*/
3019
#define SST_CSR 0x00
31-
#define SST_PISR 0x08
32-
#define SST_PIMR 0x10
3320
#define SST_ISRX 0x18
34-
#define SST_ISRD 0x20
3521
#define SST_IMRX 0x28
36-
#define SST_IMRD 0x30
3722
#define SST_IPCX 0x38 /* IPC IA -> SST */
3823
#define SST_IPCD 0x40 /* IPC SST -> IA */
39-
#define SST_ISRSC 0x48
40-
#define SST_ISRLPESC 0x50
41-
#define SST_IMRSC 0x58
42-
#define SST_IMRLPESC 0x60
43-
#define SST_IPCSC 0x68
44-
#define SST_IPCLPESC 0x70
45-
#define SST_CLKCTL 0x78
46-
#define SST_CSR2 0x80
47-
#define SST_LTRC 0xE0
48-
#define SST_HMDC 0xE8
49-
50-
#define SST_SHIM_BEGIN SST_CSR
51-
#define SST_SHIM_END SST_HDMC
52-
53-
#define SST_DBGO 0xF0
54-
55-
#define SST_SHIM_SIZE 0x100
56-
#define SST_PWMCTRL 0x1000
57-
58-
/* SST Shim Register bits
59-
* The register bit naming can differ between products. Some products also
60-
* contain extra functionality.
61-
*/
62-
63-
/* CSR / CS */
64-
#define SST_CSR_RST (0x1 << 1)
65-
#define SST_CSR_SBCS0 (0x1 << 2)
66-
#define SST_CSR_SBCS1 (0x1 << 3)
67-
#define SST_CSR_DCS(x) (x << 4)
68-
#define SST_CSR_DCS_MASK (0x7 << 4)
69-
#define SST_CSR_STALL (0x1 << 10)
70-
#define SST_CSR_S0IOCS (0x1 << 21)
71-
#define SST_CSR_S1IOCS (0x1 << 23)
72-
#define SST_CSR_LPCS (0x1 << 31)
73-
#define SST_CSR_24MHZ_LPCS (SST_CSR_SBCS0 | SST_CSR_SBCS1 | SST_CSR_LPCS)
74-
#define SST_CSR_24MHZ_NO_LPCS (SST_CSR_SBCS0 | SST_CSR_SBCS1)
75-
#define SST_BYT_CSR_RST (0x1 << 0)
76-
#define SST_BYT_CSR_VECTOR_SEL (0x1 << 1)
77-
#define SST_BYT_CSR_STALL (0x1 << 2)
78-
#define SST_BYT_CSR_PWAITMODE (0x1 << 3)
79-
80-
/* ISRX / ISC */
81-
#define SST_ISRX_BUSY (0x1 << 1)
82-
#define SST_ISRX_DONE (0x1 << 0)
83-
#define SST_BYT_ISRX_REQUEST (0x1 << 1)
84-
85-
/* ISRD / ISD */
86-
#define SST_ISRD_BUSY (0x1 << 1)
87-
#define SST_ISRD_DONE (0x1 << 0)
88-
89-
/* IMRX / IMC */
90-
#define SST_IMRX_BUSY (0x1 << 1)
91-
#define SST_IMRX_DONE (0x1 << 0)
92-
#define SST_BYT_IMRX_REQUEST (0x1 << 1)
93-
94-
/* IMRD / IMD */
95-
#define SST_IMRD_DONE (0x1 << 0)
96-
#define SST_IMRD_BUSY (0x1 << 1)
97-
#define SST_IMRD_SSP0 (0x1 << 16)
98-
#define SST_IMRD_DMAC0 (0x1 << 21)
99-
#define SST_IMRD_DMAC1 (0x1 << 22)
100-
#define SST_IMRD_DMAC (SST_IMRD_DMAC0 | SST_IMRD_DMAC1)
101-
102-
/* IPCX / IPCC */
103-
#define SST_IPCX_DONE (0x1 << 30)
104-
#define SST_IPCX_BUSY (0x1 << 31)
105-
#define SST_BYT_IPCX_DONE ((u64)0x1 << 62)
106-
#define SST_BYT_IPCX_BUSY ((u64)0x1 << 63)
107-
108-
/* IPCD */
109-
#define SST_IPCD_DONE (0x1 << 30)
110-
#define SST_IPCD_BUSY (0x1 << 31)
111-
#define SST_BYT_IPCD_DONE ((u64)0x1 << 62)
112-
#define SST_BYT_IPCD_BUSY ((u64)0x1 << 63)
113-
114-
/* CLKCTL */
115-
#define SST_CLKCTL_SMOS(x) (x << 24)
116-
#define SST_CLKCTL_MASK (3 << 24)
117-
#define SST_CLKCTL_DCPLCG (1 << 18)
118-
#define SST_CLKCTL_SCOE1 (1 << 17)
119-
#define SST_CLKCTL_SCOE0 (1 << 16)
120-
121-
/* CSR2 / CS2 */
122-
#define SST_CSR2_SDFD_SSP0 (1 << 1)
123-
#define SST_CSR2_SDFD_SSP1 (1 << 2)
124-
125-
/* LTRC */
126-
#define SST_LTRC_VAL(x) (x << 0)
127-
128-
/* HMDC */
129-
#define SST_HMDC_HDDA0(x) (x << 0)
130-
#define SST_HMDC_HDDA1(x) (x << 7)
131-
#define SST_HMDC_HDDA_E0_CH0 1
132-
#define SST_HMDC_HDDA_E0_CH1 2
133-
#define SST_HMDC_HDDA_E0_CH2 4
134-
#define SST_HMDC_HDDA_E0_CH3 8
135-
#define SST_HMDC_HDDA_E1_CH0 SST_HMDC_HDDA1(SST_HMDC_HDDA_E0_CH0)
136-
#define SST_HMDC_HDDA_E1_CH1 SST_HMDC_HDDA1(SST_HMDC_HDDA_E0_CH1)
137-
#define SST_HMDC_HDDA_E1_CH2 SST_HMDC_HDDA1(SST_HMDC_HDDA_E0_CH2)
138-
#define SST_HMDC_HDDA_E1_CH3 SST_HMDC_HDDA1(SST_HMDC_HDDA_E0_CH3)
139-
#define SST_HMDC_HDDA_E0_ALLCH (SST_HMDC_HDDA_E0_CH0 | SST_HMDC_HDDA_E0_CH1 | \
140-
SST_HMDC_HDDA_E0_CH2 | SST_HMDC_HDDA_E0_CH3)
141-
#define SST_HMDC_HDDA_E1_ALLCH (SST_HMDC_HDDA_E1_CH0 | SST_HMDC_HDDA_E1_CH1 | \
142-
SST_HMDC_HDDA_E1_CH2 | SST_HMDC_HDDA_E1_CH3)
143-
144-
145-
/* SST Vendor Defined Registers and bits */
146-
#define SST_VDRTCTL0 0xa0
147-
#define SST_VDRTCTL1 0xa4
148-
#define SST_VDRTCTL2 0xa8
149-
#define SST_VDRTCTL3 0xaC
150-
151-
/* VDRTCTL0 */
152-
#define SST_VDRTCL0_D3PGD (1 << 0)
153-
#define SST_VDRTCL0_D3SRAMPGD (1 << 1)
154-
#define SST_VDRTCL0_DSRAMPGE_SHIFT 12
155-
#define SST_VDRTCL0_DSRAMPGE_MASK (0xfffff << SST_VDRTCL0_DSRAMPGE_SHIFT)
156-
#define SST_VDRTCL0_ISRAMPGE_SHIFT 2
157-
#define SST_VDRTCL0_ISRAMPGE_MASK (0x3ff << SST_VDRTCL0_ISRAMPGE_SHIFT)
158-
159-
/* VDRTCTL2 */
160-
#define SST_VDRTCL2_DCLCGE (1 << 1)
161-
#define SST_VDRTCL2_DTCGE (1 << 10)
162-
#define SST_VDRTCL2_APLLSE_MASK (1 << 31)
163-
164-
/* PMCS */
165-
#define SST_PMCS 0x84
166-
#define SST_PMCS_PS_MASK 0x3
16724

16825
struct sst_dsp;
16926

‎sound/soc/intel/common/sst-ipc.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
#include <linux/workqueue.h>
1616
#include <linux/sched.h>
1717

18-
#define IPC_MAX_MAILBOX_BYTES 256
19-
2018
struct sst_ipc_message {
2119
u64 header;
2220
void *data;

0 commit comments

Comments
 (0)