From nobody Mon Jun 8 07:29:38 2026 Received: from metis.whiteo.stw.pengutronix.de (metis.whiteo.stw.pengutronix.de [185.203.201.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 62A5547276A for ; Wed, 3 Jun 2026 12:09:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.203.201.7 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780488579; cv=none; b=Zh/ts03Jv++akkZL+c6Dy6UI9jlZcHEetkl6G+SM2qACHohZDeoOVu+0Ltls6Z5wvwpqaWDQ01jeW9XIGB1yCnM/+wxSnFbiqXjwDYZH/Aw78OZM/pXEIk2+rd7lEFoBeeCET83QlebrUXGl90LzP97FxI96VKy7mHFeRxjn4RM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780488579; c=relaxed/simple; bh=w1IEaMTd3EAUbRt/40/yjNMhChHBflCVYbylv3nkaQ8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=sPQjaMDB3wQNBmbLVCZMBmIjd6X6Hv7LKmWZ1sECHqWYSI24EKHgYDSr3JwcG44ZHybwZBkQm+rWYz4KRlplzjcJulpcDukk3SvuABMiWqoE0grE6NGYb2WtpPLPox9w1j2Kuz7EbdjjTab5iUDIYRHt9+f1IIMpvbx+WcT7ls8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de; spf=pass smtp.mailfrom=pengutronix.de; arc=none smtp.client-ip=185.203.201.7 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pengutronix.de Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1wUkPV-00082B-CO; Wed, 03 Jun 2026 14:09:25 +0200 Received: from dude02.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::28]) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1wUkPU-000uUh-1R; Wed, 03 Jun 2026 14:09:24 +0200 Received: from [::1] (helo=dude02.red.stw.pengutronix.de) by dude02.red.stw.pengutronix.de with esmtp (Exim 4.98.2) (envelope-from ) id 1wUkPU-00000007LO8-1KjM; Wed, 03 Jun 2026 14:09:24 +0200 From: Sascha Hauer Date: Wed, 03 Jun 2026 14:09:22 +0200 Subject: [PATCH 1/4] ASoC: fsl: eukrea-tlv320: drop unused machine support Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260603-asoc-remove-mach-types-h-v1-1-2b9446dff0c1@pengutronix.de> References: <20260603-asoc-remove-mach-types-h-v1-0-2b9446dff0c1@pengutronix.de> In-Reply-To: <20260603-asoc-remove-mach-types-h-v1-0-2b9446dff0c1@pengutronix.de> To: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Sen Wang , Jarkko Nikula Cc: linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org, Sascha Hauer X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1780488564; l=2082; i=s.hauer@pengutronix.de; s=20230412; h=from:subject:message-id; bh=w1IEaMTd3EAUbRt/40/yjNMhChHBflCVYbylv3nkaQ8=; b=21W5POJoX0M+pC/12wriS8j9eF4OagFRh2jayKqw7Ml5TJWx1hPjUHNGYsCb1WCNRh5nU20Rw dYH09lUKtDJB5Ja6WLlgz3Y4cWVDgowMIZEGk+Z2j/l7wYtsfa3ywjk X-Developer-Key: i=s.hauer@pengutronix.de; a=ed25519; pk=4kuc9ocmECiBJKWxYgqyhtZOHj5AWi7+d0n/UjhkwTg= X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: s.hauer@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org The Eukrea boards are dt only, platform support has been removed in [1]. Drop the machine_is_* macros which always expand to 0 and remove no longer needed asm/mach-types.h inclusion. [1] 8da4d6b2f7988 ("ARM: mx51: Remove mach-cpuimx51sd board file") f2f55499942a0 ("ARM: imx: Remove eukrea_mbimxsd35 non-dt support") 3877942b0c7f3 ("ARM: imx25: Remove eukrea mx25 board files") 7c5deaf775265 ("ARM: i.MX: Remove mach-cpuimx27sd board file") Signed-off-by: Sascha Hauer --- sound/soc/fsl/eukrea-tlv320.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/sound/soc/fsl/eukrea-tlv320.c b/sound/soc/fsl/eukrea-tlv320.c index 6be074ea0b3f0..551d5c102240b 100644 --- a/sound/soc/fsl/eukrea-tlv320.c +++ b/sound/soc/fsl/eukrea-tlv320.c @@ -19,7 +19,6 @@ #include #include #include -#include =20 #include "../codecs/tlv320aic23.h" #include "imx-ssi.h" @@ -142,8 +141,7 @@ static int eukrea_tlv320_probe(struct platform_device *= pdev) eukrea_tlv320.name =3D "cpuimx-audio"; } =20 - if (machine_is_eukrea_cpuimx27() || - (tmp_np =3D of_find_compatible_node(NULL, NULL, "fsl,imx21-audmux")))= { + if ((tmp_np =3D of_find_compatible_node(NULL, NULL, "fsl,imx21-audmux")))= { imx_audmux_v1_configure_port(MX27_AUDMUX_HPCR1_SSI0, IMX_AUDMUX_V1_PCR_SYN | IMX_AUDMUX_V1_PCR_TFSDIR | @@ -159,13 +157,9 @@ static int eukrea_tlv320_probe(struct platform_device = *pdev) IMX_AUDMUX_V1_PCR_RXDSEL(MX27_AUDMUX_HPCR1_SSI0) ); of_node_put(tmp_np); - } else if (machine_is_eukrea_cpuimx25sd() || - machine_is_eukrea_cpuimx35sd() || - machine_is_eukrea_cpuimx51sd() || - (tmp_np =3D of_find_compatible_node(NULL, NULL, "fsl,imx31-audmux")))= { + } else if ((tmp_np =3D of_find_compatible_node(NULL, NULL, "fsl,imx31-aud= mux"))) { if (!np) - ext_port =3D machine_is_eukrea_cpuimx25sd() ? - 4 : 3; + ext_port =3D 3; =20 imx_audmux_v2_configure_port(int_port, IMX_AUDMUX_V2_PTCR_SYN | --=20 2.47.3 From nobody Mon Jun 8 07:29:38 2026 Received: from metis.whiteo.stw.pengutronix.de (metis.whiteo.stw.pengutronix.de [185.203.201.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7251F47798C for ; Wed, 3 Jun 2026 12:09:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.203.201.7 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780488580; cv=none; b=XIHLTgcIuixUnONRbqEBb2mZvw3l+GvEiHmIEbrMN5fjtQYTatL4Xjy2NJ3rDjZzun7suAI5k7C6u4A8LnDZjgrS9/ktJRQTyKEpeXzUZCNljjL2QeSPo9/x5SeC92m0tC9zwA7v5z+bAzINw2roivPqtOJEfmnxQUM7z1A7BMM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780488580; c=relaxed/simple; bh=m0fPmnr7gG/sozJZ1z4H3lm49M3SBP18S7cA2BtCiX8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=EI/XSl2Sl+P8gHI1ztF2cknvUTK051UTJkoFhivGlq7leyyJmAs8PdtdWm4Rwfnqr/2FfiHVSncsaaMDaHntZdcaRX+Kon7QRsrT7rvI7UwSNZem1pYUeZDLb1iHzY3vwpfqoYc1i2dFTDU9flSCHM7c7yy+xiB9ePzLI4ggwzQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de; spf=pass smtp.mailfrom=pengutronix.de; arc=none smtp.client-ip=185.203.201.7 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pengutronix.de Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1wUkPV-00082A-CP; Wed, 03 Jun 2026 14:09:25 +0200 Received: from dude02.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::28]) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1wUkPU-000uUi-1R; Wed, 03 Jun 2026 14:09:24 +0200 Received: from [::1] (helo=dude02.red.stw.pengutronix.de) by dude02.red.stw.pengutronix.de with esmtp (Exim 4.98.2) (envelope-from ) id 1wUkPU-00000007LO8-1MKA; Wed, 03 Jun 2026 14:09:24 +0200 From: Sascha Hauer Date: Wed, 03 Jun 2026 14:09:23 +0200 Subject: [PATCH 2/4] ASoC: ti: omap3pandora: remove Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260603-asoc-remove-mach-types-h-v1-2-2b9446dff0c1@pengutronix.de> References: <20260603-asoc-remove-mach-types-h-v1-0-2b9446dff0c1@pengutronix.de> In-Reply-To: <20260603-asoc-remove-mach-types-h-v1-0-2b9446dff0c1@pengutronix.de> To: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Sen Wang , Jarkko Nikula Cc: linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org, Sascha Hauer X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1780488564; l=10988; i=s.hauer@pengutronix.de; s=20230412; h=from:subject:message-id; bh=m0fPmnr7gG/sozJZ1z4H3lm49M3SBP18S7cA2BtCiX8=; b=112SkPDXEeq97EryzYJXqy+7mQptTjV70B46SdvzxI9DcjxvgkQhVuKHHUknjmpuefN1I5S2M 18J6YQw/32pAagJDbq10BCPTmAzTLEfcW4P1IVEskirK6/VFAFmPbZ/ X-Developer-Key: i=s.hauer@pengutronix.de; a=ed25519; pk=4kuc9ocmECiBJKWxYgqyhtZOHj5AWi7+d0n/UjhkwTg= X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: s.hauer@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org The omap3pandora driver entirely depends on machine_is_omap3_pandora(). Pandora has been converted to device tree: 7fcf7e061edd3 ("ARM: OMAP2+: Remove legacy booting support for Pandora") Since then machine_is_omap3_pandora() always expands to 0. Remove the long unused driver. Signed-off-by: Sascha Hauer --- sound/soc/ti/Kconfig | 9 -- sound/soc/ti/Makefile | 2 - sound/soc/ti/omap3pandora.c | 290 ----------------------------------------= ---- 3 files changed, 301 deletions(-) diff --git a/sound/soc/ti/Kconfig b/sound/soc/ti/Kconfig index 3323cf96e3095..e5b165e0fc6cc 100644 --- a/sound/soc/ti/Kconfig +++ b/sound/soc/ti/Kconfig @@ -83,15 +83,6 @@ config SND_SOC_NOKIA_RX51 Say Y or M if you want to add support for SoC audio on Nokia RX-51 hardware. This is also known as Nokia N900 product. =20 -config SND_SOC_OMAP3_PANDORA - tristate "SoC Audio support for OMAP3 Pandora" - depends on ARCH_OMAP3 - depends on TWL4030_CORE - select SND_SOC_OMAP_MCBSP - select SND_SOC_TWL4030 - help - Say Y or M if you want to add support for SoC audio on the OMAP3 Pandor= a. - config SND_SOC_OMAP3_TWL4030 tristate "SoC Audio support for OMAP3 based boards with twl4030 codec" depends on ARCH_OMAP3 || COMPILE_TEST && COMMON_CLK diff --git a/sound/soc/ti/Makefile b/sound/soc/ti/Makefile index 421e13bc04dbb..a5f5b284c0e28 100644 --- a/sound/soc/ti/Makefile +++ b/sound/soc/ti/Makefile @@ -26,7 +26,6 @@ obj-$(CONFIG_SND_SOC_OMAP_MCPDM) +=3D snd-soc-omap-mcpdm.o snd-soc-davinci-evm-y :=3D davinci-evm.o snd-soc-n810-y :=3D n810.o snd-soc-rx51-y :=3D rx51.o -snd-soc-omap3pandora-y :=3D omap3pandora.o snd-soc-omap-twl4030-y :=3D omap-twl4030.o snd-soc-omap-abe-twl6040-y :=3D omap-abe-twl6040.o snd-soc-ams-delta-y :=3D ams-delta.o @@ -37,7 +36,6 @@ snd-soc-j721e-evm-y :=3D j721e-evm.o obj-$(CONFIG_SND_SOC_DAVINCI_EVM) +=3D snd-soc-davinci-evm.o obj-$(CONFIG_SND_SOC_NOKIA_N810) +=3D snd-soc-n810.o obj-$(CONFIG_SND_SOC_NOKIA_RX51) +=3D snd-soc-rx51.o -obj-$(CONFIG_SND_SOC_OMAP3_PANDORA) +=3D snd-soc-omap3pandora.o obj-$(CONFIG_SND_SOC_OMAP3_TWL4030) +=3D snd-soc-omap-twl4030.o obj-$(CONFIG_SND_SOC_OMAP_ABE_TWL6040) +=3D snd-soc-omap-abe-twl6040.o obj-$(CONFIG_SND_SOC_OMAP_AMS_DELTA) +=3D snd-soc-ams-delta.o diff --git a/sound/soc/ti/omap3pandora.c b/sound/soc/ti/omap3pandora.c deleted file mode 100644 index f11b1d8a1306c..0000000000000 --- a/sound/soc/ti/omap3pandora.c +++ /dev/null @@ -1,290 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -/* - * omap3pandora.c -- SoC audio for Pandora Handheld Console - * - * Author: Gra=C5=BEvydas Ignotas - */ - -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -#include -#include - -#include "omap-mcbsp.h" - -#define PREFIX "ASoC omap3pandora: " - -static struct regulator *omap3pandora_dac_reg; -static struct gpio_desc *dac_power_gpio; -static struct gpio_desc *amp_power_gpio; - -static int omap3pandora_hw_params(struct snd_pcm_substream *substream, - struct snd_pcm_hw_params *params) -{ - struct snd_soc_pcm_runtime *rtd =3D snd_soc_substream_to_rtd(substream); - struct snd_soc_dai *codec_dai =3D snd_soc_rtd_to_codec(rtd, 0); - struct snd_soc_dai *cpu_dai =3D snd_soc_rtd_to_cpu(rtd, 0); - int ret; - - /* Set the codec system clock for DAC and ADC */ - ret =3D snd_soc_dai_set_sysclk(codec_dai, 0, 26000000, - SND_SOC_CLOCK_IN); - if (ret < 0) { - pr_err(PREFIX "can't set codec system clock\n"); - return ret; - } - - /* Set McBSP clock to external */ - ret =3D snd_soc_dai_set_sysclk(cpu_dai, OMAP_MCBSP_SYSCLK_CLKS_EXT, - 256 * params_rate(params), - SND_SOC_CLOCK_IN); - if (ret < 0) { - pr_err(PREFIX "can't set cpu system clock\n"); - return ret; - } - - ret =3D snd_soc_dai_set_clkdiv(cpu_dai, OMAP_MCBSP_CLKGDV, 8); - if (ret < 0) { - pr_err(PREFIX "can't set SRG clock divider\n"); - return ret; - } - - return 0; -} - -static int omap3pandora_dac_event(struct snd_soc_dapm_widget *w, - struct snd_kcontrol *k, int event) -{ - int ret; - - /* - * The PCM1773 DAC datasheet requires 1ms delay between switching - * VCC power on/off and /PD pin high/low - */ - if (SND_SOC_DAPM_EVENT_ON(event)) { - struct device *dev =3D snd_soc_dapm_to_dev(w->dapm); - - ret =3D regulator_enable(omap3pandora_dac_reg); - if (ret) { - dev_err(dev, "Failed to power DAC: %d\n", ret); - return ret; - } - mdelay(1); - gpiod_set_value(dac_power_gpio, 1); - } else { - gpiod_set_value(dac_power_gpio, 0); - mdelay(1); - regulator_disable(omap3pandora_dac_reg); - } - - return 0; -} - -static int omap3pandora_hp_event(struct snd_soc_dapm_widget *w, - struct snd_kcontrol *k, int event) -{ - if (SND_SOC_DAPM_EVENT_ON(event)) - gpiod_set_value(amp_power_gpio, 1); - else - gpiod_set_value(amp_power_gpio, 0); - - return 0; -} - -/* - * Audio paths on Pandora board: - * - * |O| ---> PCM DAC +-> AMP -> Headphone Jack - * |M| A +--------> Line Out - * |A| <~~clk~~+ - * |P| <--- TWL4030 <--------- Line In and MICs - */ -static const struct snd_soc_dapm_widget omap3pandora_dapm_widgets[] =3D { - SND_SOC_DAPM_DAC_E("PCM DAC", "HiFi Playback", SND_SOC_NOPM, - 0, 0, omap3pandora_dac_event, - SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD), - SND_SOC_DAPM_PGA_E("Headphone Amplifier", SND_SOC_NOPM, - 0, 0, NULL, 0, omap3pandora_hp_event, - SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD), - SND_SOC_DAPM_HP("Headphone Jack", NULL), - SND_SOC_DAPM_LINE("Line Out", NULL), - - SND_SOC_DAPM_MIC("Mic (internal)", NULL), - SND_SOC_DAPM_MIC("Mic (external)", NULL), - SND_SOC_DAPM_LINE("Line In", NULL), -}; - -static const struct snd_soc_dapm_route omap3pandora_map[] =3D { - {"PCM DAC", NULL, "APLL Enable"}, - {"Headphone Amplifier", NULL, "PCM DAC"}, - {"Line Out", NULL, "PCM DAC"}, - {"Headphone Jack", NULL, "Headphone Amplifier"}, - - {"AUXL", NULL, "Line In"}, - {"AUXR", NULL, "Line In"}, - - {"MAINMIC", NULL, "Mic (internal)"}, - {"Mic (internal)", NULL, "Mic Bias 1"}, - - {"SUBMIC", NULL, "Mic (external)"}, - {"Mic (external)", NULL, "Mic Bias 2"}, -}; - -static int omap3pandora_out_init(struct snd_soc_pcm_runtime *rtd) -{ - struct snd_soc_dapm_context *dapm =3D snd_soc_card_to_dapm(rtd->card); - - /* All TWL4030 output pins are floating */ - snd_soc_dapm_disable_pin(dapm, "EARPIECE"); - snd_soc_dapm_disable_pin(dapm, "PREDRIVEL"); - snd_soc_dapm_disable_pin(dapm, "PREDRIVER"); - snd_soc_dapm_disable_pin(dapm, "HSOL"); - snd_soc_dapm_disable_pin(dapm, "HSOR"); - snd_soc_dapm_disable_pin(dapm, "CARKITL"); - snd_soc_dapm_disable_pin(dapm, "CARKITR"); - snd_soc_dapm_disable_pin(dapm, "HFL"); - snd_soc_dapm_disable_pin(dapm, "HFR"); - snd_soc_dapm_disable_pin(dapm, "VIBRA"); - - return 0; -} - -static int omap3pandora_in_init(struct snd_soc_pcm_runtime *rtd) -{ - struct snd_soc_dapm_context *dapm =3D snd_soc_card_to_dapm(rtd->card); - - /* Not comnnected */ - snd_soc_dapm_disable_pin(dapm, "HSMIC"); - snd_soc_dapm_disable_pin(dapm, "CARKITMIC"); - snd_soc_dapm_disable_pin(dapm, "DIGIMIC0"); - snd_soc_dapm_disable_pin(dapm, "DIGIMIC1"); - - return 0; -} - -static const struct snd_soc_ops omap3pandora_ops =3D { - .hw_params =3D omap3pandora_hw_params, -}; - -/* Digital audio interface glue - connects codec <--> CPU */ -SND_SOC_DAILINK_DEFS(out, - DAILINK_COMP_ARRAY(COMP_CPU("omap-mcbsp.2")), - DAILINK_COMP_ARRAY(COMP_CODEC("twl4030-codec", "twl4030-hifi")), - DAILINK_COMP_ARRAY(COMP_PLATFORM("omap-mcbsp.2"))); - -SND_SOC_DAILINK_DEFS(in, - DAILINK_COMP_ARRAY(COMP_CPU("omap-mcbsp.4")), - DAILINK_COMP_ARRAY(COMP_CODEC("twl4030-codec", "twl4030-hifi")), - DAILINK_COMP_ARRAY(COMP_PLATFORM("omap-mcbsp.4"))); - -static struct snd_soc_dai_link omap3pandora_dai[] =3D { - { - .name =3D "PCM1773", - .stream_name =3D "HiFi Out", - .dai_fmt =3D SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | - SND_SOC_DAIFMT_CBC_CFC, - .ops =3D &omap3pandora_ops, - .init =3D omap3pandora_out_init, - SND_SOC_DAILINK_REG(out), - }, { - .name =3D "TWL4030", - .stream_name =3D "Line/Mic In", - .dai_fmt =3D SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | - SND_SOC_DAIFMT_CBC_CFC, - .ops =3D &omap3pandora_ops, - .init =3D omap3pandora_in_init, - SND_SOC_DAILINK_REG(in), - } -}; - -/* SoC card */ -static struct snd_soc_card snd_soc_card_omap3pandora =3D { - .name =3D "omap3pandora", - .owner =3D THIS_MODULE, - .dai_link =3D omap3pandora_dai, - .num_links =3D ARRAY_SIZE(omap3pandora_dai), - - .dapm_widgets =3D omap3pandora_dapm_widgets, - .num_dapm_widgets =3D ARRAY_SIZE(omap3pandora_dapm_widgets), - .dapm_routes =3D omap3pandora_map, - .num_dapm_routes =3D ARRAY_SIZE(omap3pandora_map), -}; - -static struct platform_device *omap3pandora_snd_device; - -static int __init omap3pandora_soc_init(void) -{ - int ret; - - if (!machine_is_omap3_pandora()) - return -ENODEV; - - pr_info("OMAP3 Pandora SoC init\n"); - - omap3pandora_snd_device =3D platform_device_alloc("soc-audio", -1); - if (omap3pandora_snd_device =3D=3D NULL) { - pr_err(PREFIX "Platform device allocation failed\n"); - return -ENOMEM; - } - - platform_set_drvdata(omap3pandora_snd_device, &snd_soc_card_omap3pandora); - - ret =3D platform_device_add(omap3pandora_snd_device); - if (ret) { - pr_err(PREFIX "Unable to add platform device\n"); - goto fail2; - } - - dac_power_gpio =3D devm_gpiod_get(&omap3pandora_snd_device->dev, - "dac", GPIOD_OUT_LOW); - if (IS_ERR(dac_power_gpio)) { - ret =3D PTR_ERR(dac_power_gpio); - goto fail3; - } - - amp_power_gpio =3D devm_gpiod_get(&omap3pandora_snd_device->dev, - "amp", GPIOD_OUT_LOW); - if (IS_ERR(amp_power_gpio)) { - ret =3D PTR_ERR(amp_power_gpio); - goto fail3; - } - - omap3pandora_dac_reg =3D regulator_get(&omap3pandora_snd_device->dev, "vc= c"); - if (IS_ERR(omap3pandora_dac_reg)) { - pr_err(PREFIX "Failed to get DAC regulator from %s: %ld\n", - dev_name(&omap3pandora_snd_device->dev), - PTR_ERR(omap3pandora_dac_reg)); - ret =3D PTR_ERR(omap3pandora_dac_reg); - goto fail3; - } - - return 0; - -fail3: - platform_device_del(omap3pandora_snd_device); -fail2: - platform_device_put(omap3pandora_snd_device); - - return ret; -} -module_init(omap3pandora_soc_init); - -static void __exit omap3pandora_soc_exit(void) -{ - regulator_put(omap3pandora_dac_reg); - platform_device_unregister(omap3pandora_snd_device); -} -module_exit(omap3pandora_soc_exit); - -MODULE_AUTHOR("Grazvydas Ignotas "); -MODULE_DESCRIPTION("ALSA SoC OMAP3 Pandora"); -MODULE_LICENSE("GPL"); --=20 2.47.3 From nobody Mon Jun 8 07:29:38 2026 Received: from metis.whiteo.stw.pengutronix.de (metis.whiteo.stw.pengutronix.de [185.203.201.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DE74643DA55 for ; Wed, 3 Jun 2026 12:09:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.203.201.7 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780488579; cv=none; b=afS8D/B6wRV8eUUmyF7KjOopUPDc1YbzdVVvC1iibQtW/5HDvAZmTU6aoaqMzxqWklyMhwnlJnLd5UhMXCfAhnLgz1IxJaTtevJibkODRbNRZtw3egK1j87u4NtEKQm2F1xtK+b3teAgpc5Og5tJnGcfWoUAyDWI3VvQBf+DdG0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780488579; c=relaxed/simple; bh=adyqpZD+OsKDX6hUpJXWV+uu7IA0qtWgQtlY269SJ9Q=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=axNkyJw9oPKMlfS+krFKZ+hmPjPxo4nTlyO+2I0ZZJxePHbvivQTRDfj6iyOncgI/yL2wLnbltApRuF+waJGdmSUYj9Z/9m6e5gg1bJHN/3QF94Slsfikx0ajS3Nsr3uHpzn7f/3N2PMgqtnFuGDCGF5q8G3cfiXZaVWhsorM6A= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de; spf=pass smtp.mailfrom=pengutronix.de; arc=none smtp.client-ip=185.203.201.7 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pengutronix.de Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1wUkPV-000829-CO; Wed, 03 Jun 2026 14:09:25 +0200 Received: from dude02.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::28]) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1wUkPU-000uUf-1O; Wed, 03 Jun 2026 14:09:24 +0200 Received: from [::1] (helo=dude02.red.stw.pengutronix.de) by dude02.red.stw.pengutronix.de with esmtp (Exim 4.98.2) (envelope-from ) id 1wUkPU-00000007LO8-1NQq; Wed, 03 Jun 2026 14:09:24 +0200 From: Sascha Hauer Date: Wed, 03 Jun 2026 14:09:24 +0200 Subject: [PATCH 3/4] ASoC: ti: rx51: drop unnecessary machine checks Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260603-asoc-remove-mach-types-h-v1-3-2b9446dff0c1@pengutronix.de> References: <20260603-asoc-remove-mach-types-h-v1-0-2b9446dff0c1@pengutronix.de> In-Reply-To: <20260603-asoc-remove-mach-types-h-v1-0-2b9446dff0c1@pengutronix.de> To: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Sen Wang , Jarkko Nikula Cc: linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org, Sascha Hauer X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1780488564; l=1052; i=s.hauer@pengutronix.de; s=20230412; h=from:subject:message-id; bh=adyqpZD+OsKDX6hUpJXWV+uu7IA0qtWgQtlY269SJ9Q=; b=+gIJrFB6ST15XtvA6XJDfuFRriQL2aRfpe12e/5kwDMXrIL+2k8xnd0vcAgSyUpZQ18cHaaRd KZfFcyU8tzcC7TuLw5UYXOsRod6hNpH9oYiDFt9qjSmXpYNQWDrh/CJ X-Developer-Key: i=s.hauer@pengutronix.de; a=ed25519; pk=4kuc9ocmECiBJKWxYgqyhtZOHj5AWi7+d0n/UjhkwTg= X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: s.hauer@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org Nokia N900 is device tree only, machine_is_nokia_rx51() always expands to 0. Testing for of_machine_is_compatible() is unnecessary as the N900 is the only board registering the device node necessary to get to this point, so remove that as well. This makes inclusion of mach-types.h unnecessary. Signed-off-by: Sascha Hauer --- sound/soc/ti/rx51.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/sound/soc/ti/rx51.c b/sound/soc/ti/rx51.c index 7eeb12e5066c4..89338cf145358 100644 --- a/sound/soc/ti/rx51.c +++ b/sound/soc/ti/rx51.c @@ -19,8 +19,6 @@ #include #include =20 -#include - #include "omap-mcbsp.h" =20 enum { @@ -364,9 +362,6 @@ static int rx51_soc_probe(struct platform_device *pdev) struct snd_soc_card *card =3D &rx51_sound_card; int err; =20 - if (!machine_is_nokia_rx51() && !of_machine_is_compatible("nokia,omap3-n9= 00")) - return -ENODEV; - card->dev =3D &pdev->dev; =20 if (np) { --=20 2.47.3 From nobody Mon Jun 8 07:29:38 2026 Received: from metis.whiteo.stw.pengutronix.de (metis.whiteo.stw.pengutronix.de [185.203.201.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D5FC747276E for ; Wed, 3 Jun 2026 12:09:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.203.201.7 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780488577; cv=none; b=bbsUUPXUaGh4ObqCiAWILCTT27PO9tVjdqAWX9Ng/v/60avkjey1fI4fw+T9DCSNiaAzP5VpguArocJp1jk3yaevIHqOVkVo4pHwH11XW3un3k2tvsSkXrjiBSyFjJ1mX+UgnQiuQBEFMSWFQGRa8rha7kKVqeK6Y0fyIpEnzxE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780488577; c=relaxed/simple; bh=7wMy1WO6xvhj/Oe0Gpo6D9YGm7PoPttonv39QVJHKrQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=fl9EIQALGC+QBZXwkuT138nNyhAy0kyZnsBq1cG0oFf8uptT3hRqORniD0h6oXJu381UaXo80jHo1qqifCQiq9Sldwnm23LpccDCT0d3jvwc/Nv83pm0kIjwXbASg+NlKHf53ZMSIXsGa68nX2YOQ/awZw92nnHiUe9iLfXnn+I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de; spf=pass smtp.mailfrom=pengutronix.de; arc=none smtp.client-ip=185.203.201.7 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pengutronix.de Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1wUkPV-000828-CO; Wed, 03 Jun 2026 14:09:25 +0200 Received: from dude02.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::28]) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1wUkPU-000uUj-1O; Wed, 03 Jun 2026 14:09:24 +0200 Received: from [::1] (helo=dude02.red.stw.pengutronix.de) by dude02.red.stw.pengutronix.de with esmtp (Exim 4.98.2) (envelope-from ) id 1wUkPU-00000007LO8-1OVQ; Wed, 03 Jun 2026 14:09:24 +0200 From: Sascha Hauer Date: Wed, 03 Jun 2026 14:09:25 +0200 Subject: [PATCH 4/4] ASoC: ti: n810: drop unused header inclusion Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260603-asoc-remove-mach-types-h-v1-4-2b9446dff0c1@pengutronix.de> References: <20260603-asoc-remove-mach-types-h-v1-0-2b9446dff0c1@pengutronix.de> In-Reply-To: <20260603-asoc-remove-mach-types-h-v1-0-2b9446dff0c1@pengutronix.de> To: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Sen Wang , Jarkko Nikula Cc: linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org, Sascha Hauer X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1780488564; l=602; i=s.hauer@pengutronix.de; s=20230412; h=from:subject:message-id; bh=7wMy1WO6xvhj/Oe0Gpo6D9YGm7PoPttonv39QVJHKrQ=; b=6WwSzIK2ElyBriAPsxvB5FfmoqIjliAJFBa82eL/y3FrXJ4RBqjGiVhCZTmZ6yjttLBUygYms iBtIJUiPkWzDA+2Y19Yie7yhJD4+mURdVpwdMw2AfFeZqEgK929wy+m X-Developer-Key: i=s.hauer@pengutronix.de; a=ed25519; pk=4kuc9ocmECiBJKWxYgqyhtZOHj5AWi7+d0n/UjhkwTg= X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: s.hauer@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org mach-types.h is only needed for machine_is_* macros and is unneeded in this driver. Remove it. Signed-off-by: Sascha Hauer --- sound/soc/ti/n810.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/soc/ti/n810.c b/sound/soc/ti/n810.c index 242b07034816d..ce1e7d796004a 100644 --- a/sound/soc/ti/n810.c +++ b/sound/soc/ti/n810.c @@ -14,7 +14,6 @@ #include #include =20 -#include #include #include #include --=20 2.47.3