From 338d28218c258d4f1e8f5a80d2e1498caf7a3a9e Mon Sep 17 00:00:00 2001 From: Jon Hunter Date: Thu, 4 Apr 2024 19:53:37 +0100 Subject: [PATCH] ASoC: tegra: Drop 'oot' suffix for upstream drivers When booting kernels that have both the upstream and out-of-tree audio drivers for Tegra present the following errors are observed ... Error: Driver 'tegra210-ahub' is already registered, aborting... Error: Driver 'tegra210-amx' is already registered, aborting... Error: Driver 'tegra186-dspk' is already registered, aborting... Error: Driver 'tegra210-mvc' is already registered, aborting... Error: Driver 'tegra210-adx' is already registered, aborting... Error: Driver 'tegra210-ahub' is already registered, aborting... Error: Driver 'tegra210_mixer' is already registered, aborting... Error: Driver 'tegra186-asrc' is already registered, aborting... Error: Driver 'tegra210-dmic' is already registered, aborting... Error: Driver 'tegra210-i2s' is already registered, aborting... Error: Driver 'tegra210-admaif' is already registered, aborting... The problem is that the upstream Tegra audio drivers are loaded first and then the kernel attempts to load the out-of-tree variants because they have a different name. The out-of-tree are installed under the 'updates' directory in the file-system and by dropping the 'oot' suffix from the driver name, then depmod will not attempt to load both variants of the audio drivers and prioritise loading the drivers in the 'updates' directory. Bug 4590647 Change-Id: I6c6fe1eb84bc9fdfa4a8f4abf1ce3a75f3bfba8a Signed-off-by: Jon Hunter Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3110266 (cherry picked from commit fc8c410eb6e1d43064f832adc645ad9f2afa90dd) Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3112030 Reviewed-by: Brad Griffis Reviewed-by: Sameer Pujar GVS: Gerrit_Virtual_Submit --- sound/soc/tegra/Makefile | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/sound/soc/tegra/Makefile b/sound/soc/tegra/Makefile index ea076010..58dcf20f 100644 --- a/sound/soc/tegra/Makefile +++ b/sound/soc/tegra/Makefile @@ -1,17 +1,17 @@ # SPDX-License-Identifier: GPL-2.0-only -# SPDX-FileCopyrightText: Copyright (c) 2023-2024 NVIDIA CORPORATION. All rights reserved. +# SPDX-FileCopyrightText: Copyright (c) 2023-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. -snd-soc-tegra-utils-oot-objs := tegra_asoc_utils.o tegra_asoc_machine.o \ +snd-soc-tegra-utils-objs := tegra_asoc_utils.o tegra_asoc_machine.o \ tegra_isomgr_bw.o tegra_codecs.o -snd-soc-tegra210-afc-oot-objs := tegra210_afc.o -snd-soc-tegra210-iqc-oot-objs := tegra210_iqc.o -snd-soc-tegra186-arad-oot-objs := tegra186_arad.o -snd-soc-tegra-machine-driver-oot-objs := tegra_machine_driver.o +snd-soc-tegra210-afc-objs := tegra210_afc.o +snd-soc-tegra210-iqc-objs := tegra210_iqc.o +snd-soc-tegra186-arad-objs := tegra186_arad.o +snd-soc-tegra-machine-driver-objs := tegra_machine_driver.o snd-soc-tegra-controls-objs := tegra_mixer_control.o -obj-m += snd-soc-tegra-utils-oot.o -obj-m += snd-soc-tegra210-afc-oot.o -obj-m += snd-soc-tegra210-iqc-oot.o -obj-m += snd-soc-tegra186-arad-oot.o -obj-m += snd-soc-tegra-machine-driver-oot.o +obj-m += snd-soc-tegra-utils.o +obj-m += snd-soc-tegra210-afc.o +obj-m += snd-soc-tegra210-iqc.o +obj-m += snd-soc-tegra186-arad.o +obj-m += snd-soc-tegra-machine-driver.o obj-m += snd-soc-tegra-controls.o