[Sound-open-firmware] [PATCH] topology: rename topologies to use sof prefix
Liam Girdwood
liam.r.girdwood at linux.intel.com
Fri Apr 13 15:47:47 CEST 2018
Use sof- prefix instead of reef-
Signed-off-by: Liam Girdwood <liam.r.girdwood at linux.intel.com>
---
topology/Makefile.am | 54 ++++++-----
topology/reef-bxt-nocodec.m4 | 100 ---------------------
.../{reef-apl-nocodec.m4 => sof-apl-nocodec.m4} | 0
.../{reef-apl-tdf8532.m4 => sof-apl-tdf8532.m4} | 0
topology/{reef-bdw-rt286.m4 => sof-bdw-rt286.m4} | 0
topology/{reef-bdw-rt5640.m4 => sof-bdw-rt5640.m4} | 0
topology/{reef-byt-da7213.m4 => sof-byt-da7213.m4} | 0
.../{reef-byt-nocodec.m4 => sof-byt-nocodec.m4} | 0
topology/{reef-byt-rt5640.m4 => sof-byt-rt5640.m4} | 0
topology/{reef-byt-rt5645.m4 => sof-byt-rt5645.m4} | 0
topology/{reef-byt-rt5651.m4 => sof-byt-rt5651.m4} | 0
.../{reef-cht-max98090.m4 => sof-cht-max98090.m4} | 0
.../{reef-cht-nocodec.m4 => sof-cht-nocodec.m4} | 0
topology/{reef-cnl-rt274.m4 => sof-cnl-rt274.m4} | 0
topology/{reef-hsw-rt5640.m4 => sof-hsw-rt5640.m4} | 0
15 files changed, 26 insertions(+), 128 deletions(-)
delete mode 100644 topology/reef-bxt-nocodec.m4
rename topology/{reef-apl-nocodec.m4 => sof-apl-nocodec.m4} (100%)
rename topology/{reef-apl-tdf8532.m4 => sof-apl-tdf8532.m4} (100%)
rename topology/{reef-bdw-rt286.m4 => sof-bdw-rt286.m4} (100%)
rename topology/{reef-bdw-rt5640.m4 => sof-bdw-rt5640.m4} (100%)
rename topology/{reef-byt-da7213.m4 => sof-byt-da7213.m4} (100%)
rename topology/{reef-byt-nocodec.m4 => sof-byt-nocodec.m4} (100%)
rename topology/{reef-byt-rt5640.m4 => sof-byt-rt5640.m4} (100%)
rename topology/{reef-byt-rt5645.m4 => sof-byt-rt5645.m4} (100%)
rename topology/{reef-byt-rt5651.m4 => sof-byt-rt5651.m4} (100%)
rename topology/{reef-cht-max98090.m4 => sof-cht-max98090.m4} (100%)
rename topology/{reef-cht-nocodec.m4 => sof-cht-nocodec.m4} (100%)
rename topology/{reef-cnl-rt274.m4 => sof-cnl-rt274.m4} (100%)
rename topology/{reef-hsw-rt5640.m4 => sof-hsw-rt5640.m4} (100%)
diff --git a/topology/Makefile.am b/topology/Makefile.am
index 31d266e..73e10e9 100644
--- a/topology/Makefile.am
+++ b/topology/Makefile.am
@@ -16,20 +16,19 @@ DEPS = \
#
MACHINES = \
- reef-cht-nocodec.tplg \
- reef-cht-max98090.tplg \
- reef-apl-nocodec.tplg \
- reef-bxt-nocodec.tplg \
- reef-byt-nocodec.tplg \
- reef-bdw-rt286.tplg \
- reef-bdw-rt5640.tplg \
- reef-byt-rt5640.tplg \
- reef-byt-rt5645.tplg \
- reef-byt-rt5651.tplg \
- reef-byt-da7213.tplg \
- reef-cnl-rt274.tplg \
- reef-hsw-rt5640.tplg \
- reef-apl-tdf8532.tplg
+ sof-cht-nocodec.tplg \
+ sof-cht-max98090.tplg \
+ sof-apl-nocodec.tplg \
+ sof-byt-nocodec.tplg \
+ sof-bdw-rt286.tplg \
+ sof-bdw-rt5640.tplg \
+ sof-byt-rt5640.tplg \
+ sof-byt-rt5645.tplg \
+ sof-byt-rt5651.tplg \
+ sof-byt-da7213.tplg \
+ sof-cnl-rt274.tplg \
+ sof-hsw-rt5640.tplg \
+ sof-apl-tdf8532.tplg
# Uncomment the following line if you want to debug conf files
.PRECIOUS: %.conf
@@ -47,17 +46,16 @@ clean-local:
rm -f *.tplg
EXTRA_DIST = \
- reef-cht-nocodec.m4 \
- reef-cht-max98090.m4 \
- reef-apl-nocodec.m4 \
- reef-bxt-nocodec.m4 \
- reef-byt-nocodec.m4 \
- reef-bdw-rt286.m4 \
- reef-bdw-rt5640.m4 \
- reef-byt-rt5640.m4 \
- reef-byt-rt5645.m4 \
- reef-byt-rt5651.m4 \
- reef-byt-da7213.m4 \
- reef-cnl-rt274.m4 \
- reef-hsw-rt5640.m4 \
- reef-apl-tdf8532.m4
+ sof-cht-nocodec.m4 \
+ sof-cht-max98090.m4 \
+ sof-apl-nocodec.m4 \
+ sof-byt-nocodec.m4 \
+ sof-bdw-rt286.m4 \
+ sof-bdw-rt5640.m4 \
+ sof-byt-rt5640.m4 \
+ sof-byt-rt5645.m4 \
+ sof-byt-rt5651.m4 \
+ sof-byt-da7213.m4 \
+ sof-cnl-rt274.m4 \
+ sof-hsw-rt5640.m4 \
+ sof-apl-tdf8532.m4
diff --git a/topology/reef-bxt-nocodec.m4 b/topology/reef-bxt-nocodec.m4
deleted file mode 100644
index 7e2b624..0000000
--- a/topology/reef-bxt-nocodec.m4
+++ /dev/null
@@ -1,100 +0,0 @@
-#
-# Topology for generic Broxton board with no codec.
-#
-
-# Include topology builder
-include(`utils.m4')
-include(`dai.m4')
-include(`pipeline.m4')
-
-# Include TLV library
-include(`common/tlv.m4')
-
-# Include Token library
-include(`sof/tokens.m4')
-
-# Include Broxton DSP configuration
-include(`dsps/bxt.m4')
-
-#
-# Define the pipelines
-#
-# PCM0 ----> volume ---------------+
-# |--low latency mixer ----> volume ----> SSP2
-# PCM2 ----> SRC -----> volume ----+
-# |
-# Tone -----> volume ----+
-#
-# PCM1 <---- Volume <---- SSP2
-#
-
-# Low Latency playback pipeline 1 on PCM 0 using max 2 channels of s32le.
-# Schedule 48 frames per 1000us deadline on core 0 with priority 0
-# Use DMAC 0 channel 1 for PCM audio playback data
-PIPELINE_PCM_ADD(sof/pipe-low-latency-playback.m4,
- 1, 0, 2, s32le,
- 48, 1000, 0, 0, 0, 1)
-
-# Low Latency capture pipeline 2 on PCM 0 using max 2 channels of s32le.
-# Schedule 48 frames per 1000us deadline on core 0 with priority 0
-# Use DMAC 0 channel 2 for PCM audio capture data
-PIPELINE_PCM_ADD(sof/pipe-low-latency-capture.m4,
- 2, 0, 2, s32le,
- 48, 1000, 0, 0, 0, 2)
-
-# PCM Media Playback pipeline 3 on PCM 1 using max 2 channels of s32le.
-# Schedule 192 frames per 4000us deadline on core 0 with priority 1
-# Use DMAC 0 channel 3 for PCM audio playback data
-PIPELINE_PCM_ADD(sof/pipe-pcm-media.m4,
- 3, 1, 2, s32le,
- 192, 4000, 1, 0, 0, 3)
-
-# Tone Playback pipeline 5 using max 2 channels of s32le.
-# Schedule 192 frames per 4000us deadline on core 0 with priority 2
-PIPELINE_ADD(sof/pipe-tone.m4,
- 5, 2, s32le,
- 192, 4000, 2, 0)
-
-# Connect pipelines together
-SectionGraph."pipe-bxt-nocodec" {
- index "0"
-
- lines [
- # media 0
- dapm(PIPELINE_MIXER_1, PIPELINE_SOURCE_3)
- #tone
- dapm(PIPELINE_MIXER_1, PIPELINE_SOURCE_5)
- ]
-}
-
-#
-# DAI configuration
-#
-# SSP port 2 is our only pipeline DAI
-#
-
-# playback DAI is SSP2 using 2 periods
-# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0
-DAI_ADD(sof/pipe-dai-playback.m4,
- 1, SSP, 2, NoCodec,
- PIPELINE_SOURCE_1, 2, s24le,
- 48, 1000, 0, 0)
-
-# capture DAI is SSP2 using 2 periods
-# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0
-DAI_ADD(sof/pipe-dai-capture.m4,
- 2, SSP, 2, NoCodec,
- PIPELINE_SINK_2, 2, s24le,
- 48, 1000, 0, 0)
-
-# PCM Low Latency
-PCM_DUPLEX_ADD(Low Latency, 6, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2)
-
-#
-# BE configurations - overrides config in ACPI if present
-#
-DAI_CONFIG(SSP, 2, NoCodec, I2S, 24,
- DAI_CLOCK(mclk, 19200000, slave),
- DAI_CLOCK(bclk, 2400000, slave),
- DAI_CLOCK(fsync, 48000, slave),
- DAI_TDM(2, 25, 3, 3))
diff --git a/topology/reef-apl-nocodec.m4 b/topology/sof-apl-nocodec.m4
similarity index 100%
rename from topology/reef-apl-nocodec.m4
rename to topology/sof-apl-nocodec.m4
diff --git a/topology/reef-apl-tdf8532.m4 b/topology/sof-apl-tdf8532.m4
similarity index 100%
rename from topology/reef-apl-tdf8532.m4
rename to topology/sof-apl-tdf8532.m4
diff --git a/topology/reef-bdw-rt286.m4 b/topology/sof-bdw-rt286.m4
similarity index 100%
rename from topology/reef-bdw-rt286.m4
rename to topology/sof-bdw-rt286.m4
diff --git a/topology/reef-bdw-rt5640.m4 b/topology/sof-bdw-rt5640.m4
similarity index 100%
rename from topology/reef-bdw-rt5640.m4
rename to topology/sof-bdw-rt5640.m4
diff --git a/topology/reef-byt-da7213.m4 b/topology/sof-byt-da7213.m4
similarity index 100%
rename from topology/reef-byt-da7213.m4
rename to topology/sof-byt-da7213.m4
diff --git a/topology/reef-byt-nocodec.m4 b/topology/sof-byt-nocodec.m4
similarity index 100%
rename from topology/reef-byt-nocodec.m4
rename to topology/sof-byt-nocodec.m4
diff --git a/topology/reef-byt-rt5640.m4 b/topology/sof-byt-rt5640.m4
similarity index 100%
rename from topology/reef-byt-rt5640.m4
rename to topology/sof-byt-rt5640.m4
diff --git a/topology/reef-byt-rt5645.m4 b/topology/sof-byt-rt5645.m4
similarity index 100%
rename from topology/reef-byt-rt5645.m4
rename to topology/sof-byt-rt5645.m4
diff --git a/topology/reef-byt-rt5651.m4 b/topology/sof-byt-rt5651.m4
similarity index 100%
rename from topology/reef-byt-rt5651.m4
rename to topology/sof-byt-rt5651.m4
diff --git a/topology/reef-cht-max98090.m4 b/topology/sof-cht-max98090.m4
similarity index 100%
rename from topology/reef-cht-max98090.m4
rename to topology/sof-cht-max98090.m4
diff --git a/topology/reef-cht-nocodec.m4 b/topology/sof-cht-nocodec.m4
similarity index 100%
rename from topology/reef-cht-nocodec.m4
rename to topology/sof-cht-nocodec.m4
diff --git a/topology/reef-cnl-rt274.m4 b/topology/sof-cnl-rt274.m4
similarity index 100%
rename from topology/reef-cnl-rt274.m4
rename to topology/sof-cnl-rt274.m4
diff --git a/topology/reef-hsw-rt5640.m4 b/topology/sof-hsw-rt5640.m4
similarity index 100%
rename from topology/reef-hsw-rt5640.m4
rename to topology/sof-hsw-rt5640.m4
--
2.14.1
More information about the Sound-open-firmware
mailing list