From nobody Tue Mar 3 05:26:40 2026 Received: from mail.hugovil.com (mail.hugovil.com [162.243.120.170]) (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 664133EF0C4; Mon, 2 Mar 2026 19:11:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=162.243.120.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772478674; cv=none; b=pj8GtlfzuuO8JJcZ39utyF6eUgEbw32eABKdarQKRiyg0SC528G/k9I2dLmT/wc7cJuXvaaDQxJxkh4E49LJZ8zEe3Zwb9ToB6D2ofeOFhZubjbGHNTHRLKSgIfVqAssWDYZVzHgw7qSamK1C0yUnaqxhBzVXFNYEOFTtg3QD1U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772478674; c=relaxed/simple; bh=25bXU1YKUwCvu/VmRU8DPBMYNg3M/dK8gRrO/LEs72c=; h=From:To:Cc:Date:Message-ID:In-Reply-To:References:MIME-Version: Subject; b=lbezP7pDOUCIEQepRCjNzVKfFTJmpY/Q58+Mobaz3j4/HjAouig4dG61oUHpQa2S8zr+qJuAvlN2PmlmsrBRIPhkbYh790HcRmX7c9C0yXe8ugsd7nkw8nGSZga8yANncWLeswA0LBJ7r/aVufbJhU4NlEe2CfepWGbBCPEm2Uw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=hugovil.com; spf=pass smtp.mailfrom=hugovil.com; dkim=pass (1024-bit key) header.d=hugovil.com header.i=@hugovil.com header.b=XVsnTCjp; arc=none smtp.client-ip=162.243.120.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=hugovil.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=hugovil.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=hugovil.com header.i=@hugovil.com header.b="XVsnTCjp" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=hugovil.com ; s=x; h=Subject:Content-Transfer-Encoding:MIME-Version:Message-ID:Date:Cc:To :From:subject:date:message-id:reply-to; bh=CFBFNEMKcnSpTHh9SKoOHLvwoACzQuBcBBrl0aFcyCs=; b=XVsnTCjpC/XreXuKvCVw2tRVDn EV10Jpyt5uOpUenopTW8vNRNDZ+zMEYmmlHleqI4x8l6UZhrzA25eFs5ZHLDfOQXlmthKvvlCXohS oamaIlqt/kU+L0hGD3/XVG7Ez9Yoqm+953rg05+MKRbO1lCrTarH6hm7ySx7rqWURKbE=; Received: from modemcable168.174-80-70.mc.videotron.ca ([70.80.174.168]:59962 helo=pettiford.lan) by mail.hugovil.com with esmtpa (Exim 4.92) (envelope-from ) id 1vx8fW-0007Wl-Dj; Mon, 02 Mar 2026 14:11:03 -0500 From: Hugo Villeneuve To: robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, andrzej.hajda@intel.com, neil.armstrong@linaro.org, rfoss@kernel.org, Laurent.pinchart@ideasonboard.com, jonas@kwiboo.se, jernej.skrabec@gmail.com, airlied@gmail.com, simona@ffwll.ch, maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, Frank.Li@nxp.com, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, shawnguo@kernel.org, laurent.pinchart+renesas@ideasonboard.com, antonin.godard@bootlin.com Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, hugo@hugovil.com, Hugo Villeneuve Date: Mon, 2 Mar 2026 14:03:48 -0500 Message-ID: <20260302190953.669325-13-hugo@hugovil.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260302190953.669325-1-hugo@hugovil.com> References: <20260302190953.669325-1-hugo@hugovil.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 70.80.174.168 X-SA-Exim-Mail-From: hugo@hugovil.com X-Spam-Level: X-Spam-Report: * -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP * -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% * [score: 0.0000] Subject: [PATCH 12/14] ARM: dts: imx6ul-var-som: factor out audio support X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.hugovil.com) Content-Type: text/plain; charset="utf-8" From: Hugo Villeneuve Not all boards use the audio codec, so factor out this functionality to a separate DTSI include file. Signed-off-by: Hugo Villeneuve --- .../dts/nxp/imx/imx6ul-var-som-audio.dtsi | 30 +++++++++++++++++++ .../dts/nxp/imx/imx6ul-var-som-common.dtsi | 21 ------------- .../nxp/imx/imx6ul-var-som-concerto-full.dts | 1 + .../dts/nxp/imx/imx6ul-var-som-concerto.dts | 1 + .../nxp/imx/imx6ull-var-som-concerto-full.dts | 1 + .../dts/nxp/imx/imx6ull-var-som-concerto.dts | 1 + 6 files changed, 34 insertions(+), 21 deletions(-) create mode 100644 arch/arm/boot/dts/nxp/imx/imx6ul-var-som-audio.dtsi diff --git a/arch/arm/boot/dts/nxp/imx/imx6ul-var-som-audio.dtsi b/arch/arm= /boot/dts/nxp/imx/imx6ul-var-som-audio.dtsi new file mode 100644 index 0000000000000..3c480bc7a6ad8 --- /dev/null +++ b/arch/arm/boot/dts/nxp/imx/imx6ul-var-som-audio.dtsi @@ -0,0 +1,30 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Audio support for Variscite VAR-SOM-6UL module. + * + * Copyright 2019-2024 Variscite Ltd. + * Copyright 2026 Dimonoff + */ + +&iomuxc { + pinctrl_sai2: sai2grp { + fsl,pins =3D < + MX6UL_PAD_JTAG_TDI__SAI2_TX_BCLK 0x17088 + MX6UL_PAD_JTAG_TDO__SAI2_TX_SYNC 0x17088 + MX6UL_PAD_JTAG_TRST_B__SAI2_TX_DATA 0x11088 + MX6UL_PAD_JTAG_TCK__SAI2_RX_DATA 0x11088 + MX6UL_PAD_JTAG_TMS__SAI2_MCLK 0x17088 + >; + }; +}; + +&sai2 { + pinctrl-names =3D "default"; + pinctrl-0 =3D <&pinctrl_sai2>; + assigned-clocks =3D <&clks IMX6UL_CLK_SAI2_SEL>, + <&clks IMX6UL_CLK_SAI2>; + assigned-clock-parents =3D <&clks IMX6UL_CLK_PLL4_AUDIO_DIV>; + assigned-clock-rates =3D <0>, <12288000>; + fsl,sai-mclk-direction-output; + status =3D "okay"; +}; diff --git a/arch/arm/boot/dts/nxp/imx/imx6ul-var-som-common.dtsi b/arch/ar= m/boot/dts/nxp/imx/imx6ul-var-som-common.dtsi index 70d19eccddb4c..5600eeaa5854d 100644 --- a/arch/arm/boot/dts/nxp/imx/imx6ul-var-som-common.dtsi +++ b/arch/arm/boot/dts/nxp/imx/imx6ul-var-som-common.dtsi @@ -52,16 +52,6 @@ MX6UL_PAD_CSI_MCLK__I2C1_SDA 0x4001b8b0 >; }; =20 - pinctrl_sai2: sai2grp { - fsl,pins =3D < - MX6UL_PAD_JTAG_TDI__SAI2_TX_BCLK 0x17088 - MX6UL_PAD_JTAG_TDO__SAI2_TX_SYNC 0x17088 - MX6UL_PAD_JTAG_TRST_B__SAI2_TX_DATA 0x11088 - MX6UL_PAD_JTAG_TCK__SAI2_RX_DATA 0x11088 - MX6UL_PAD_JTAG_TMS__SAI2_MCLK 0x17088 - >; - }; - pinctrl_tsc: tscgrp { fsl,pins =3D < MX6UL_PAD_GPIO1_IO01__GPIO1_IO01 0xb0 @@ -163,17 +153,6 @@ &pxp { status =3D "okay"; }; =20 -&sai2 { - pinctrl-names =3D "default"; - pinctrl-0 =3D <&pinctrl_sai2>; - assigned-clocks =3D <&clks IMX6UL_CLK_SAI2_SEL>, - <&clks IMX6UL_CLK_SAI2>; - assigned-clock-parents =3D <&clks IMX6UL_CLK_PLL4_AUDIO_DIV>; - assigned-clock-rates =3D <0>, <12288000>; - fsl,sai-mclk-direction-output; - status =3D "okay"; -}; - &snvs_poweroff { status =3D "okay"; }; diff --git a/arch/arm/boot/dts/nxp/imx/imx6ul-var-som-concerto-full.dts b/a= rch/arm/boot/dts/nxp/imx/imx6ul-var-som-concerto-full.dts index b5e6a3306e1cd..64a3cbd8b7c38 100644 --- a/arch/arm/boot/dts/nxp/imx/imx6ul-var-som-concerto-full.dts +++ b/arch/arm/boot/dts/nxp/imx/imx6ul-var-som-concerto-full.dts @@ -13,6 +13,7 @@ #include "imx6ul-var-som-wifi.dtsi" #include "imx6ul-var-som-enet2.dtsi" #include "imx6ul-var-som-enet1.dtsi" +#include "imx6ul-var-som-audio.dtsi" =20 / { model =3D "Variscite VAR-SOM-6UL Concerto Board (6UL CPU)"; diff --git a/arch/arm/boot/dts/nxp/imx/imx6ul-var-som-concerto.dts b/arch/a= rm/boot/dts/nxp/imx/imx6ul-var-som-concerto.dts index d0adcd0e80833..f014ee66e18cb 100644 --- a/arch/arm/boot/dts/nxp/imx/imx6ul-var-som-concerto.dts +++ b/arch/arm/boot/dts/nxp/imx/imx6ul-var-som-concerto.dts @@ -13,6 +13,7 @@ #include "imx6ul-var-som-concerto-common.dtsi" #include "imx6ul-var-som-sd.dtsi" #include "imx6ul-var-som-enet2.dtsi" +#include "imx6ul-var-som-audio.dtsi" =20 / { model =3D "Variscite VAR-SOM-6UL Concerto Board (6UL CPU)"; diff --git a/arch/arm/boot/dts/nxp/imx/imx6ull-var-som-concerto-full.dts b/= arch/arm/boot/dts/nxp/imx/imx6ull-var-som-concerto-full.dts index 86f558c76fb3e..2e1f75d5f25a6 100644 --- a/arch/arm/boot/dts/nxp/imx/imx6ull-var-som-concerto-full.dts +++ b/arch/arm/boot/dts/nxp/imx/imx6ull-var-som-concerto-full.dts @@ -13,6 +13,7 @@ #include "imx6ul-var-som-wifi.dtsi" #include "imx6ul-var-som-enet2.dtsi" #include "imx6ul-var-som-enet1.dtsi" +#include "imx6ul-var-som-audio.dtsi" =20 / { model =3D "Variscite VAR-SOM-6UL Concerto Board (6ULL CPU)"; diff --git a/arch/arm/boot/dts/nxp/imx/imx6ull-var-som-concerto.dts b/arch/= arm/boot/dts/nxp/imx/imx6ull-var-som-concerto.dts index f9bc6a9a5c1be..0d0613e3a34f2 100644 --- a/arch/arm/boot/dts/nxp/imx/imx6ull-var-som-concerto.dts +++ b/arch/arm/boot/dts/nxp/imx/imx6ull-var-som-concerto.dts @@ -12,6 +12,7 @@ #include "imx6ul-var-som-concerto-common.dtsi" #include "imx6ul-var-som-sd.dtsi" #include "imx6ul-var-som-enet2.dtsi" +#include "imx6ul-var-som-audio.dtsi" =20 / { model =3D "Variscite VAR-SOM-6UL Concerto Board (6ULL CPU)"; --=20 2.47.3