| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20260203080137.1492376-4-sherry.sun@nxp.com>
Date: Tue, 3 Feb 2026 16:01:35 +0800
From: Sherry Sun <sherry.sun@....com>
To: Frank.Li@....com,
robh@...nel.org,
krzk+dt@...nel.org,
conor+dt@...nel.org,
s.hauer@...gutronix.de,
festevam@...il.com,
shawnguo@...nel.org,
daniel.baluta@....com,
dario.binacchi@...rulasolutions.com,
alexander.stein@...tq-group.com,
Markus.Niebel@...group.com,
matthias.schiffer@...group.com,
y.moog@...tec.de,
josua@...id-run.com,
francesco.dolcini@...adex.com,
primoz.fiser@...ik.com
Cc: imx@...ts.linux.dev,
kernel@...gutronix.de,
devicetree@...r.kernel.org,
linux-kernel@...r.kernel.org,
linux-arm-kernel@...ts.infradead.org
Subject: [PATCH V5 3/5] arm64: dts: imx93: Move 11x11 EVK specific parts back to imx93-11x11-evk.dts
The previous patch renamed imx93-11x11-evk.dts to imx93-evk-common.dtsi
to prepare for adding the i.MX93 Wireless EVK, which shares most of its
design with the 11x11 EVK.
This patch moves the board specific differences out of
imx93-evk-common.dtsi and back into imx93-11x11-evk.dts, ensuring that
the common dtsi only contains the truly shared parts between the two EVK
boards.
No functional changes intended.
Signed-off-by: Sherry Sun <sherry.sun@....com>
---
.../boot/dts/freescale/imx93-11x11-evk.dts | 206 ++++++++++++++++++
.../boot/dts/freescale/imx93-evk-common.dtsi | 198 -----------------
2 files changed, 206 insertions(+), 198 deletions(-)
diff --git a/arch/arm64/boot/dts/freescale/imx93-11x11-evk.dts b/arch/arm64/boot/dts/freescale/imx93-11x11-evk.dts
index cca923f4ac7a..6b6d06c70af1 100644
--- a/arch/arm64/boot/dts/freescale/imx93-11x11-evk.dts
+++ b/arch/arm64/boot/dts/freescale/imx93-11x11-evk.dts
@@ -11,4 +11,210 @@
/ {
model = "NXP i.MX93 11X11 EVK board";
compatible = "fsl,imx93-11x11-evk", "fsl,imx93";
+
+ aliases {
+ mmc2 = &usdhc3;
+ };
+
+ reg_m2_pwr: regulator-m2-pwr {
+ compatible = "regulator-fixed";
+ regulator-name = "M.2-power";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ gpio = <&pcal6524 13 GPIO_ACTIVE_HIGH>;
+ enable-active-high;
+ };
+
+ reg_usdhc3_vmmc: regulator-usdhc3 {
+ compatible = "regulator-fixed";
+ regulator-name = "WLAN_EN";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ vin-supply = <®_m2_pwr>;
+ gpio = <&pcal6524 20 GPIO_ACTIVE_HIGH>;
+ /*
+ * IW612 wifi chip needs more delay than other wifi chips to complete
+ * the host interface initialization after power up, otherwise the
+ * internal state of IW612 may be unstable, resulting in the failure of
+ * the SDIO3.0 switch voltage.
+ */
+ startup-delay-us = <20000>;
+ enable-active-high;
+ };
+
+ usdhc3_pwrseq: usdhc3_pwrseq {
+ compatible = "mmc-pwrseq-simple";
+ reset-gpios = <&pcal6524 12 GPIO_ACTIVE_LOW>;
+ };
+
+ bt_sco_codec: bt-sco-codec {
+ compatible = "linux,bt-sco";
+ #sound-dai-cells = <1>;
+ };
+
+ sound-bt-sco {
+ compatible = "simple-audio-card";
+ simple-audio-card,name = "bt-sco-audio";
+ simple-audio-card,format = "dsp_a";
+ simple-audio-card,bitclock-inversion;
+ simple-audio-card,frame-master = <&btcpu>;
+ simple-audio-card,bitclock-master = <&btcpu>;
+
+ btcpu: simple-audio-card,cpu {
+ sound-dai = <&sai1>;
+ dai-tdm-slot-num = <2>;
+ dai-tdm-slot-width = <16>;
+ };
+
+ simple-audio-card,codec {
+ sound-dai = <&bt_sco_codec 1>;
+ };
+ };
+
+ sound-micfil {
+ compatible = "fsl,imx-audio-card";
+ model = "micfil-audio";
+
+ pri-dai-link {
+ link-name = "micfil hifi";
+ format = "i2s";
+
+ cpu {
+ sound-dai = <&micfil>;
+ };
+ };
+ };
+};
+
+&micfil {
+ pinctrl-names = "default", "sleep";
+ pinctrl-0 = <&pinctrl_pdm>;
+ pinctrl-1 = <&pinctrl_pdm_sleep>;
+ assigned-clocks = <&clk IMX93_CLK_PDM>;
+ assigned-clock-parents = <&clk IMX93_CLK_AUDIO_PLL>;
+ assigned-clock-rates = <49152000>;
+ status = "okay";
+};
+
+&pcal6524 {
+ m2-pcm-level-shifter-hog {
+ gpio-hog;
+ gpios = <19 GPIO_ACTIVE_HIGH>;
+ output-high;
+ };
+};
+
+&sai1 {
+ pinctrl-names = "default", "sleep";
+ pinctrl-0 = <&pinctrl_sai1>;
+ pinctrl-1 = <&pinctrl_sai1_sleep>;
+ assigned-clocks = <&clk IMX93_CLK_SAI1>;
+ assigned-clock-parents = <&clk IMX93_CLK_AUDIO_PLL>;
+ assigned-clock-rates = <12288000>;
+ fsl,sai-mclk-direction-output;
+ status = "okay";
+};
+
+&usdhc3 {
+ pinctrl-names = "default", "state_100mhz", "state_200mhz", "sleep";
+ pinctrl-0 = <&pinctrl_usdhc3>, <&pinctrl_usdhc3_wlan>;
+ pinctrl-1 = <&pinctrl_usdhc3_100mhz>, <&pinctrl_usdhc3_wlan>;
+ pinctrl-2 = <&pinctrl_usdhc3_200mhz>, <&pinctrl_usdhc3_wlan>;
+ pinctrl-3 = <&pinctrl_usdhc3_sleep>, <&pinctrl_usdhc3_wlan>;
+ mmc-pwrseq = <&usdhc3_pwrseq>;
+ vmmc-supply = <®_usdhc3_vmmc>;
+ bus-width = <4>;
+ keep-power-in-suspend;
+ non-removable;
+ wakeup-source;
+ status = "okay";
+};
+
+&iomuxc {
+ pinctrl_pdm: pdmgrp {
+ fsl,pins = <
+ MX93_PAD_PDM_CLK__PDM_CLK 0x31e
+ MX93_PAD_PDM_BIT_STREAM0__PDM_BIT_STREAM00 0x31e
+ MX93_PAD_PDM_BIT_STREAM1__PDM_BIT_STREAM01 0x31e
+ >;
+ };
+
+ pinctrl_pdm_sleep: pdmsleepgrp {
+ fsl,pins = <
+ MX93_PAD_PDM_CLK__GPIO1_IO08 0x31e
+ MX93_PAD_PDM_BIT_STREAM0__GPIO1_IO09 0x31e
+ MX93_PAD_PDM_BIT_STREAM1__GPIO1_IO10 0x31e
+ >;
+ };
+
+ pinctrl_sai1: sai1grp {
+ fsl,pins = <
+ MX93_PAD_SAI1_TXC__SAI1_TX_BCLK 0x31e
+ MX93_PAD_SAI1_TXFS__SAI1_TX_SYNC 0x31e
+ MX93_PAD_SAI1_TXD0__SAI1_TX_DATA00 0x31e
+ MX93_PAD_SAI1_RXD0__SAI1_RX_DATA00 0x31e
+ >;
+ };
+
+ pinctrl_sai1_sleep: sai1sleepgrp {
+ fsl,pins = <
+ MX93_PAD_SAI1_TXC__GPIO1_IO12 0x51e
+ MX93_PAD_SAI1_TXFS__GPIO1_IO11 0x51e
+ MX93_PAD_SAI1_TXD0__GPIO1_IO13 0x51e
+ MX93_PAD_SAI1_RXD0__GPIO1_IO14 0x51e
+ >;
+ };
+
+ /* need to config the SION for data and cmd pad, refer to ERR052021 */
+ pinctrl_usdhc3: usdhc3grp {
+ fsl,pins = <
+ MX93_PAD_SD3_CLK__USDHC3_CLK 0x1582
+ MX93_PAD_SD3_CMD__USDHC3_CMD 0x40001382
+ MX93_PAD_SD3_DATA0__USDHC3_DATA0 0x40001382
+ MX93_PAD_SD3_DATA1__USDHC3_DATA1 0x40001382
+ MX93_PAD_SD3_DATA2__USDHC3_DATA2 0x40001382
+ MX93_PAD_SD3_DATA3__USDHC3_DATA3 0x40001382
+ >;
+ };
+
+ /* need to config the SION for data and cmd pad, refer to ERR052021 */
+ pinctrl_usdhc3_100mhz: usdhc3-100mhzgrp {
+ fsl,pins = <
+ MX93_PAD_SD3_CLK__USDHC3_CLK 0x158e
+ MX93_PAD_SD3_CMD__USDHC3_CMD 0x4000138e
+ MX93_PAD_SD3_DATA0__USDHC3_DATA0 0x4000138e
+ MX93_PAD_SD3_DATA1__USDHC3_DATA1 0x4000138e
+ MX93_PAD_SD3_DATA2__USDHC3_DATA2 0x4000138e
+ MX93_PAD_SD3_DATA3__USDHC3_DATA3 0x4000138e
+ >;
+ };
+
+ /* need to config the SION for data and cmd pad, refer to ERR052021 */
+ pinctrl_usdhc3_200mhz: usdhc3-200mhzgrp {
+ fsl,pins = <
+ MX93_PAD_SD3_CLK__USDHC3_CLK 0x15fe
+ MX93_PAD_SD3_CMD__USDHC3_CMD 0x400013fe
+ MX93_PAD_SD3_DATA0__USDHC3_DATA0 0x400013fe
+ MX93_PAD_SD3_DATA1__USDHC3_DATA1 0x400013fe
+ MX93_PAD_SD3_DATA2__USDHC3_DATA2 0x400013fe
+ MX93_PAD_SD3_DATA3__USDHC3_DATA3 0x400013fe
+ >;
+ };
+
+ pinctrl_usdhc3_sleep: usdhc3grpsleepgrp {
+ fsl,pins = <
+ MX93_PAD_SD3_CLK__GPIO3_IO20 0x31e
+ MX93_PAD_SD3_CMD__GPIO3_IO21 0x31e
+ MX93_PAD_SD3_DATA0__GPIO3_IO22 0x31e
+ MX93_PAD_SD3_DATA1__GPIO3_IO23 0x31e
+ MX93_PAD_SD3_DATA2__GPIO3_IO24 0x31e
+ MX93_PAD_SD3_DATA3__GPIO3_IO25 0x31e
+ >;
+ };
+
+ pinctrl_usdhc3_wlan: usdhc3wlangrp {
+ fsl,pins = <
+ MX93_PAD_CCM_CLKO1__GPIO3_IO26 0x31e
+ >;
+ };
};
diff --git a/arch/arm64/boot/dts/freescale/imx93-evk-common.dtsi b/arch/arm64/boot/dts/freescale/imx93-evk-common.dtsi
index 6279b8eb4ea7..301e9f05122e 100644
--- a/arch/arm64/boot/dts/freescale/imx93-evk-common.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx93-evk-common.dtsi
@@ -107,15 +107,6 @@ reg_audio_pwr: regulator-audio-pwr {
enable-active-high;
};
- reg_m2_pwr: regulator-m2-pwr {
- compatible = "regulator-fixed";
- regulator-name = "M.2-power";
- regulator-min-microvolt = <3300000>;
- regulator-max-microvolt = <3300000>;
- gpio = <&pcal6524 13 GPIO_ACTIVE_HIGH>;
- enable-active-high;
- };
-
reg_usdhc2_vmmc: regulator-usdhc2 {
compatible = "regulator-fixed";
pinctrl-names = "default";
@@ -128,28 +119,6 @@ reg_usdhc2_vmmc: regulator-usdhc2 {
enable-active-high;
};
- reg_usdhc3_vmmc: regulator-usdhc3 {
- compatible = "regulator-fixed";
- regulator-name = "WLAN_EN";
- regulator-min-microvolt = <3300000>;
- regulator-max-microvolt = <3300000>;
- vin-supply = <®_m2_pwr>;
- gpio = <&pcal6524 20 GPIO_ACTIVE_HIGH>;
- /*
- * IW612 wifi chip needs more delay than other wifi chips to complete
- * the host interface initialization after power up, otherwise the
- * internal state of IW612 may be unstable, resulting in the failure of
- * the SDIO3.0 switch voltage.
- */
- startup-delay-us = <20000>;
- enable-active-high;
- };
-
- usdhc3_pwrseq: usdhc3_pwrseq {
- compatible = "mmc-pwrseq-simple";
- reset-gpios = <&pcal6524 12 GPIO_ACTIVE_LOW>;
- };
-
backlight_lvds: backlight-lvds {
compatible = "pwm-backlight";
pwms = <&adp5585 0 100000 0>;
@@ -161,44 +130,6 @@ backlight_lvds: backlight-lvds {
status = "disabled";
};
- bt_sco_codec: bt-sco-codec {
- compatible = "linux,bt-sco";
- #sound-dai-cells = <1>;
- };
-
- sound-bt-sco {
- compatible = "simple-audio-card";
- simple-audio-card,name = "bt-sco-audio";
- simple-audio-card,format = "dsp_a";
- simple-audio-card,bitclock-inversion;
- simple-audio-card,frame-master = <&btcpu>;
- simple-audio-card,bitclock-master = <&btcpu>;
-
- btcpu: simple-audio-card,cpu {
- sound-dai = <&sai1>;
- dai-tdm-slot-num = <2>;
- dai-tdm-slot-width = <16>;
- };
-
- simple-audio-card,codec {
- sound-dai = <&bt_sco_codec 1>;
- };
- };
-
- sound-micfil {
- compatible = "fsl,imx-audio-card";
- model = "micfil-audio";
-
- pri-dai-link {
- link-name = "micfil hifi";
- format = "i2s";
-
- cpu {
- sound-dai = <&micfil>;
- };
- };
- };
-
sound-wm8962 {
compatible = "fsl,imx-audio-wm8962";
model = "wm8962-audio";
@@ -350,12 +281,6 @@ pcal6524: gpio@22 {
#interrupt-cells = <2>;
interrupt-parent = <&gpio3>;
interrupts = <27 IRQ_TYPE_LEVEL_LOW>;
-
- m2-pcm-level-shifter-hog {
- gpio-hog;
- gpios = <19 GPIO_ACTIVE_HIGH>;
- output-high;
- };
};
pmic@25 {
@@ -548,16 +473,6 @@ bluetooth {
};
};
-&micfil {
- pinctrl-names = "default", "sleep";
- pinctrl-0 = <&pinctrl_pdm>;
- pinctrl-1 = <&pinctrl_pdm_sleep>;
- assigned-clocks = <&clk IMX93_CLK_PDM>;
- assigned-clock-parents = <&clk IMX93_CLK_AUDIO_PLL>;
- assigned-clock-rates = <49152000>;
- status = "okay";
-};
-
&mu1 {
status = "okay";
};
@@ -566,17 +481,6 @@ &mu2 {
status = "okay";
};
-&sai1 {
- pinctrl-names = "default", "sleep";
- pinctrl-0 = <&pinctrl_sai1>;
- pinctrl-1 = <&pinctrl_sai1_sleep>;
- assigned-clocks = <&clk IMX93_CLK_SAI1>;
- assigned-clock-parents = <&clk IMX93_CLK_AUDIO_PLL>;
- assigned-clock-rates = <12288000>;
- fsl,sai-mclk-direction-output;
- status = "okay";
-};
-
&sai3 {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&pinctrl_sai3>;
@@ -647,21 +551,6 @@ &usdhc2 {
no-mmc;
};
-&usdhc3 {
- pinctrl-names = "default", "state_100mhz", "state_200mhz", "sleep";
- pinctrl-0 = <&pinctrl_usdhc3>, <&pinctrl_usdhc3_wlan>;
- pinctrl-1 = <&pinctrl_usdhc3_100mhz>, <&pinctrl_usdhc3_wlan>;
- pinctrl-2 = <&pinctrl_usdhc3_200mhz>, <&pinctrl_usdhc3_wlan>;
- pinctrl-3 = <&pinctrl_usdhc3_sleep>, <&pinctrl_usdhc3_wlan>;
- mmc-pwrseq = <&usdhc3_pwrseq>;
- vmmc-supply = <®_usdhc3_vmmc>;
- bus-width = <4>;
- keep-power-in-suspend;
- non-removable;
- wakeup-source;
- status = "okay";
-};
-
&wdog3 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_wdog>;
@@ -808,40 +697,6 @@ MX93_PAD_CCM_CLKO2__GPIO3_IO27 0x31e
>;
};
- pinctrl_pdm: pdmgrp {
- fsl,pins = <
- MX93_PAD_PDM_CLK__PDM_CLK 0x31e
- MX93_PAD_PDM_BIT_STREAM0__PDM_BIT_STREAM00 0x31e
- MX93_PAD_PDM_BIT_STREAM1__PDM_BIT_STREAM01 0x31e
- >;
- };
-
- pinctrl_pdm_sleep: pdmsleepgrp {
- fsl,pins = <
- MX93_PAD_PDM_CLK__GPIO1_IO08 0x31e
- MX93_PAD_PDM_BIT_STREAM0__GPIO1_IO09 0x31e
- MX93_PAD_PDM_BIT_STREAM1__GPIO1_IO10 0x31e
- >;
- };
-
- pinctrl_sai1: sai1grp {
- fsl,pins = <
- MX93_PAD_SAI1_TXC__SAI1_TX_BCLK 0x31e
- MX93_PAD_SAI1_TXFS__SAI1_TX_SYNC 0x31e
- MX93_PAD_SAI1_TXD0__SAI1_TX_DATA00 0x31e
- MX93_PAD_SAI1_RXD0__SAI1_RX_DATA00 0x31e
- >;
- };
-
- pinctrl_sai1_sleep: sai1sleepgrp {
- fsl,pins = <
- MX93_PAD_SAI1_TXC__GPIO1_IO12 0x51e
- MX93_PAD_SAI1_TXFS__GPIO1_IO11 0x51e
- MX93_PAD_SAI1_TXD0__GPIO1_IO13 0x51e
- MX93_PAD_SAI1_RXD0__GPIO1_IO14 0x51e
- >;
- };
-
/* need to config the SION for data and cmd pad, refer to ERR052021 */
pinctrl_usdhc1: usdhc1grp {
fsl,pins = <
@@ -996,59 +851,6 @@ MX93_PAD_SD2_VSELECT__GPIO3_IO19 0x51e
>;
};
- /* need to config the SION for data and cmd pad, refer to ERR052021 */
- pinctrl_usdhc3: usdhc3grp {
- fsl,pins = <
- MX93_PAD_SD3_CLK__USDHC3_CLK 0x1582
- MX93_PAD_SD3_CMD__USDHC3_CMD 0x40001382
- MX93_PAD_SD3_DATA0__USDHC3_DATA0 0x40001382
- MX93_PAD_SD3_DATA1__USDHC3_DATA1 0x40001382
- MX93_PAD_SD3_DATA2__USDHC3_DATA2 0x40001382
- MX93_PAD_SD3_DATA3__USDHC3_DATA3 0x40001382
- >;
- };
-
- /* need to config the SION for data and cmd pad, refer to ERR052021 */
- pinctrl_usdhc3_100mhz: usdhc3-100mhzgrp {
- fsl,pins = <
- MX93_PAD_SD3_CLK__USDHC3_CLK 0x158e
- MX93_PAD_SD3_CMD__USDHC3_CMD 0x4000138e
- MX93_PAD_SD3_DATA0__USDHC3_DATA0 0x4000138e
- MX93_PAD_SD3_DATA1__USDHC3_DATA1 0x4000138e
- MX93_PAD_SD3_DATA2__USDHC3_DATA2 0x4000138e
- MX93_PAD_SD3_DATA3__USDHC3_DATA3 0x4000138e
- >;
- };
-
- /* need to config the SION for data and cmd pad, refer to ERR052021 */
- pinctrl_usdhc3_200mhz: usdhc3-200mhzgrp {
- fsl,pins = <
- MX93_PAD_SD3_CLK__USDHC3_CLK 0x15fe
- MX93_PAD_SD3_CMD__USDHC3_CMD 0x400013fe
- MX93_PAD_SD3_DATA0__USDHC3_DATA0 0x400013fe
- MX93_PAD_SD3_DATA1__USDHC3_DATA1 0x400013fe
- MX93_PAD_SD3_DATA2__USDHC3_DATA2 0x400013fe
- MX93_PAD_SD3_DATA3__USDHC3_DATA3 0x400013fe
- >;
- };
-
- pinctrl_usdhc3_sleep: usdhc3grpsleepgrp {
- fsl,pins = <
- MX93_PAD_SD3_CLK__GPIO3_IO20 0x31e
- MX93_PAD_SD3_CMD__GPIO3_IO21 0x31e
- MX93_PAD_SD3_DATA0__GPIO3_IO22 0x31e
- MX93_PAD_SD3_DATA1__GPIO3_IO23 0x31e
- MX93_PAD_SD3_DATA2__GPIO3_IO24 0x31e
- MX93_PAD_SD3_DATA3__GPIO3_IO25 0x31e
- >;
- };
-
- pinctrl_usdhc3_wlan: usdhc3wlangrp {
- fsl,pins = <
- MX93_PAD_CCM_CLKO1__GPIO3_IO26 0x31e
- >;
- };
-
pinctrl_wdog: wdoggrp {
fsl,pins = <
MX93_PAD_WDOG_ANY__WDOG1_WDOG_ANY 0x31e
--
2.37.1
Powered by blists - more mailing lists