Skip to content

Commit 0721401

Browse files
tiwaibroonie
tiwai
authored and
broonie
committed
ASoC: amd: Use *-y instead of *-objs in Makefile
*-objs suffix is reserved rather for (user-space) host programs while usually *-y suffix is used for kernel drivers (although *-objs works for that purpose for now). Let's correct the old usages of *-objs in Makefiles. Signed-off-by: Takashi Iwai <tiwai@suse.de> Link: https://lore.kernel.org/r/20240507155540.24815-5-tiwai@suse.de Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 01e8f66 commit 0721401

8 files changed

Lines changed: 37 additions & 37 deletions

File tree

‎sound/soc/amd/Makefile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# SPDX-License-Identifier: GPL-2.0-only
2-
acp_audio_dma-objs := acp-pcm-dma.o
3-
snd-soc-acp-da7219mx98357-mach-objs := acp-da7219-max98357a.o
4-
snd-soc-acp-rt5645-mach-objs := acp-rt5645.o
5-
snd-soc-acp-es8336-mach-objs := acp-es8336.o
6-
snd-soc-acp-rt5682-mach-objs := acp3x-rt5682-max9836.o
7-
snd-acp-config-objs := acp-config.o
2+
acp_audio_dma-y := acp-pcm-dma.o
3+
snd-soc-acp-da7219mx98357-mach-y := acp-da7219-max98357a.o
4+
snd-soc-acp-rt5645-mach-y := acp-rt5645.o
5+
snd-soc-acp-es8336-mach-y := acp-es8336.o
6+
snd-soc-acp-rt5682-mach-y := acp3x-rt5682-max9836.o
7+
snd-acp-config-y := acp-config.o
88

99
obj-$(CONFIG_SND_SOC_AMD_ACP) += acp_audio_dma.o
1010
obj-$(CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH) += snd-soc-acp-da7219mx98357-mach.o

‎sound/soc/amd/acp/Makefile‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,23 @@
55
# Copyright(c) 2021 Advanced Micro Devices, Inc. All rights reserved.
66

77
#common acp driver
8-
snd-acp-pcm-objs := acp-platform.o
9-
snd-acp-i2s-objs := acp-i2s.o
10-
snd-acp-pdm-objs := acp-pdm.o
11-
snd-acp-legacy-common-objs := acp-legacy-common.o
12-
snd-acp-pci-objs := acp-pci.o
13-
snd-amd-sdw-acpi-objs := amd-sdw-acpi.o
8+
snd-acp-pcm-y := acp-platform.o
9+
snd-acp-i2s-y := acp-i2s.o
10+
snd-acp-pdm-y := acp-pdm.o
11+
snd-acp-legacy-common-y := acp-legacy-common.o
12+
snd-acp-pci-y := acp-pci.o
13+
snd-amd-sdw-acpi-y := amd-sdw-acpi.o
1414

1515
#platform specific driver
16-
snd-acp-renoir-objs := acp-renoir.o
17-
snd-acp-rembrandt-objs := acp-rembrandt.o
18-
snd-acp63-objs := acp63.o
19-
snd-acp70-objs := acp70.o
16+
snd-acp-renoir-y := acp-renoir.o
17+
snd-acp-rembrandt-y := acp-rembrandt.o
18+
snd-acp63-y := acp63.o
19+
snd-acp70-y := acp70.o
2020

2121
#machine specific driver
22-
snd-acp-mach-objs := acp-mach-common.o
23-
snd-acp-legacy-mach-objs := acp-legacy-mach.o acp3x-es83xx/acp3x-es83xx.o
24-
snd-acp-sof-mach-objs := acp-sof-mach.o
22+
snd-acp-mach-y := acp-mach-common.o
23+
snd-acp-legacy-mach-y := acp-legacy-mach.o acp3x-es83xx/acp3x-es83xx.o
24+
snd-acp-sof-mach-y := acp-sof-mach.o
2525

2626
obj-$(CONFIG_SND_SOC_AMD_ACP_PCM) += snd-acp-pcm.o
2727
obj-$(CONFIG_SND_SOC_AMD_ACP_I2S) += snd-acp-i2s.o

‎sound/soc/amd/ps/Makefile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# SPDX-License-Identifier: GPL-2.0-only
22
# Pink Sardine platform Support
3-
snd-pci-ps-objs := pci-ps.o
4-
snd-ps-pdm-dma-objs := ps-pdm-dma.o
5-
snd-soc-ps-mach-objs := ps-mach.o
6-
snd-ps-sdw-dma-objs := ps-sdw-dma.o
3+
snd-pci-ps-y := pci-ps.o
4+
snd-ps-pdm-dma-y := ps-pdm-dma.o
5+
snd-soc-ps-mach-y := ps-mach.o
6+
snd-ps-sdw-dma-y := ps-sdw-dma.o
77

88
obj-$(CONFIG_SND_SOC_AMD_PS) += snd-pci-ps.o
99
obj-$(CONFIG_SND_SOC_AMD_PS) += snd-ps-pdm-dma.o

‎sound/soc/amd/raven/Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# SPDX-License-Identifier: GPL-2.0+
22
# Raven Ridge platform Support
3-
snd-pci-acp3x-objs := pci-acp3x.o
4-
snd-acp3x-pcm-dma-objs := acp3x-pcm-dma.o
5-
snd-acp3x-i2s-objs := acp3x-i2s.o
3+
snd-pci-acp3x-y := pci-acp3x.o
4+
snd-acp3x-pcm-dma-y := acp3x-pcm-dma.o
5+
snd-acp3x-i2s-y := acp3x-i2s.o
66
obj-$(CONFIG_SND_SOC_AMD_ACP3x) += snd-pci-acp3x.o
77
obj-$(CONFIG_SND_SOC_AMD_ACP3x) += snd-acp3x-pcm-dma.o
88
obj-$(CONFIG_SND_SOC_AMD_ACP3x) += snd-acp3x-i2s.o

‎sound/soc/amd/renoir/Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# SPDX-License-Identifier: GPL-2.0+
22
# Renoir platform Support
3-
snd-rn-pci-acp3x-objs := rn-pci-acp3x.o
4-
snd-acp3x-pdm-dma-objs := acp3x-pdm-dma.o
5-
snd-acp3x-rn-objs := acp3x-rn.o
3+
snd-rn-pci-acp3x-y := rn-pci-acp3x.o
4+
snd-acp3x-pdm-dma-y := acp3x-pdm-dma.o
5+
snd-acp3x-rn-y := acp3x-rn.o
66
obj-$(CONFIG_SND_SOC_AMD_RENOIR) += snd-rn-pci-acp3x.o
77
obj-$(CONFIG_SND_SOC_AMD_RENOIR) += snd-acp3x-pdm-dma.o
88
obj-$(CONFIG_SND_SOC_AMD_RENOIR_MACH) += snd-acp3x-rn.o

‎sound/soc/amd/rpl/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# SPDX-License-Identifier: GPL-2.0+
22
# RPL platform Support
3-
snd-rpl-pci-acp6x-objs := rpl-pci-acp6x.o
3+
snd-rpl-pci-acp6x-y := rpl-pci-acp6x.o
44

55
obj-$(CONFIG_SND_SOC_AMD_RPL_ACP6x) += snd-rpl-pci-acp6x.o

‎sound/soc/amd/vangogh/Makefile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# SPDX-License-Identifier: GPL-2.0+
22
# Vangogh platform Support
3-
snd-pci-acp5x-objs := pci-acp5x.o
4-
snd-acp5x-i2s-objs := acp5x-i2s.o
5-
snd-acp5x-pcm-dma-objs := acp5x-pcm-dma.o
6-
snd-soc-acp5x-mach-objs := acp5x-mach.o
3+
snd-pci-acp5x-y := pci-acp5x.o
4+
snd-acp5x-i2s-y := acp5x-i2s.o
5+
snd-acp5x-pcm-dma-y := acp5x-pcm-dma.o
6+
snd-soc-acp5x-mach-y := acp5x-mach.o
77

88
obj-$(CONFIG_SND_SOC_AMD_ACP5x) += snd-pci-acp5x.o
99
obj-$(CONFIG_SND_SOC_AMD_ACP5x) += snd-acp5x-i2s.o

‎sound/soc/amd/yc/Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# SPDX-License-Identifier: GPL-2.0+
22
# Yellow Carp platform Support
3-
snd-pci-acp6x-objs := pci-acp6x.o
4-
snd-acp6x-pdm-dma-objs := acp6x-pdm-dma.o
5-
snd-soc-acp6x-mach-objs := acp6x-mach.o
3+
snd-pci-acp6x-y := pci-acp6x.o
4+
snd-acp6x-pdm-dma-y := acp6x-pdm-dma.o
5+
snd-soc-acp6x-mach-y := acp6x-mach.o
66

77
obj-$(CONFIG_SND_SOC_AMD_ACP6x) += snd-pci-acp6x.o
88
obj-$(CONFIG_SND_SOC_AMD_ACP6x) += snd-acp6x-pdm-dma.o

0 commit comments

Comments
 (0)