Skip to content

Revert "soundwire: initial work" #1262

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
xiulipan wants to merge 1 commit into from
Closed

Revert "soundwire: initial work" #1262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/audio/dai.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,11 +251,10 @@ static struct comp_dev *dai_new(struct sof_ipc_comp *comp)
break;
case SOF_DAI_INTEL_SSP:
case SOF_DAI_INTEL_DMIC:
case SOF_DAI_INTEL_SOUNDWIRE:
default:
dir = DMA_DIR_MEM_TO_DEV | DMA_DIR_DEV_TO_MEM;
caps = DMA_CAP_GP_LP | DMA_CAP_GP_HP;
dma_dev = DMA_DEV_SSP | DMA_DEV_DMIC | DMA_DEV_SOUNDWIRE;
dma_dev = DMA_DEV_SSP | DMA_DEV_DMIC;
break;
}
dd->dma = dma_get(dir, caps, dma_dev, DMA_ACCESS_SHARED);
Expand Down
7 changes: 0 additions & 7 deletions src/drivers/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,13 +103,6 @@ config CAVS_SSP
help
Select this to enable Intel cAVS Synchronous Serial Port (SSP) driver.

config CAVS_SOUNDWIRE
bool "Intel cAVS SoundWire driver"
depends on CAVS
default n
help
Select this to enable Intel cAVS SoundWire driver.

endmenu # "Drivers"

config CAVS_VERSION_1_5
Expand Down
4 changes: 0 additions & 4 deletions src/drivers/intel/cavs/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,3 @@ endif()
if(CONFIG_CAVS_SSP)
add_local_sources(sof ssp.c)
endif()

if(CONFIG_CAVS_SOUNDWIRE)
add_local_sources(sof soundwire.c)
endif()
99 changes: 0 additions & 99 deletions src/drivers/intel/cavs/soundwire.c
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion src/include/sof/dma.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@
#define DMA_DEV_SSP BIT(2) /**< connectable to SSP fifo */
#define DMA_DEV_DMIC BIT(3) /**< connectable to DMIC fifo */
#define DMA_DEV_SSI BIT(4) /**< connectable to SSI / SPI fifo */
#define DMA_DEV_SOUNDWIRE BIT(5) /**< connectable to SoundWire link */

/* DMA access privilege flag */
#define DMA_ACCESS_EXCLUSIVE 1
Expand Down
1 change: 0 additions & 1 deletion src/include/sof/trace.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,6 @@
#define TRACE_CLASS_SELECTOR (29 << 24)
#define TRACE_CLASS_SCHEDULE (30 << 24)
#define TRACE_CLASS_SCHEDULE_LL (31 << 24)
#define TRACE_CLASS_SOUNDWIRE (32 << 24)

#ifdef CONFIG_HOST
extern int test_bench_trace;
Expand Down
2 changes: 1 addition & 1 deletion src/include/uapi/abi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@

/** \brief SOF ABI version major, minor and patch numbers */
#define SOF_ABI_MAJOR 3
#define SOF_ABI_MINOR 5
#define SOF_ABI_MINOR 4
#define SOF_ABI_PATCH 0

/** \brief SOF ABI version number. Format within 32bit word is MMmmmppp */
Expand Down
1 change: 0 additions & 1 deletion src/include/uapi/ipc/dai.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ enum sof_ipc_dai_type {
SOF_DAI_INTEL_SSP, /**< Intel SSP */
SOF_DAI_INTEL_DMIC, /**< Intel DMIC */
SOF_DAI_INTEL_HDA, /**< Intel HD/A */
SOF_DAI_INTEL_SOUNDWIRE, /**< Intel SoundWire */
};

/* general purpose DAI configuration */
Expand Down
6 changes: 2 additions & 4 deletions src/platform/intel/cavs/dma.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,8 +184,7 @@ struct dma dma[CAVS_PLATFORM_NUM_DMACS] = {
.dir = DMA_DIR_MEM_TO_MEM | DMA_DIR_MEM_TO_DEV |
DMA_DIR_DEV_TO_MEM | DMA_DIR_DEV_TO_DEV,
.caps = DMA_CAP_GP_LP,
.devs = DMA_DEV_SSP | DMA_DEV_DMIC |
DMA_DEV_SOUNDWIRE,
.devs = DMA_DEV_SSP | DMA_DEV_DMIC,
.base = LP_GP_DMA_BASE(0),
.channels = 8,
.irq = IRQ_EXT_LP_GPDMA0_LVL5(0, 0),
Expand All @@ -199,8 +198,7 @@ struct dma dma[CAVS_PLATFORM_NUM_DMACS] = {
.dir = DMA_DIR_MEM_TO_MEM | DMA_DIR_MEM_TO_DEV |
DMA_DIR_DEV_TO_MEM | DMA_DIR_DEV_TO_DEV,
.caps = DMA_CAP_GP_LP,
.devs = DMA_DEV_SSP | DMA_DEV_DMIC |
DMA_DEV_SOUNDWIRE,
.devs = DMA_DEV_SSP | DMA_DEV_DMIC,
.base = LP_GP_DMA_BASE(1),
.channels = 8,
.irq = IRQ_EXT_LP_GPDMA1_LVL5(0, 0),
Expand Down