Commit 3d53a7a2 authored Mar 27, 2026 by Krzysztof Kozlowski

Merge tag 'imx-fixes-7.0' of...

Merge tag 'imx-fixes-7.0' of https://git.kernel.org/pub/scm/linux/kernel/git/frank.li/linux into arm/fixes

i.MX fixes for 7.0:

- Revert the NAND property move that broke compatibility across multiple
  imx6/imx7 device trees
- Fix imx8mq-librem5 power management by bumping BUCK1 suspend voltage to
  0.85V and reverting problematic DVS voltage changes
- Correct eMMC pad configuration for imx93-tqma9352 and imx91-tqma9131
- Change usdhc tuning step for eMMC and SD on imx93-9x9-qsb
- Correct gpu_ahb clock frequency for imx8mq

* tag 'imx-fixes-7.0' of https://git.kernel.org/pub/scm/linux/kernel/git/frank.li/linux

:
  arm64: dts: imx8mq-librem5: Bump BUCK1 suspend voltage up to 0.85V
  Revert "arm64: dts: imx8mq-librem5: Set the DVS voltages lower"
  Revert "ARM: dts: imx: move nand related property under nand@0"
  arm64: dts: imx93-tqma9352: improve eMMC pad configuration
  arm64: dts: imx91-tqma9131: improve eMMC pad configuration
  arm64: dts: imx93-9x9-qsb: change usdhc tuning step for eMMC and SD
  arm64: dts: imx8mq: Set the correct gpu_ahb clock frequency

Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>

parents df3ef89d 511f76bf

arch/arm/boot/dts/nxp/imx/imx6-logicpd-som.dtsi

+1 −5

Original line number	Diff line number	Diff line
		@@ -36,12 +36,8 @@ &clks {
		&gpmi {
		pinctrl-names = "default";
		pinctrl-0 = <&pinctrl_gpmi_nand>;
		status = "okay";

		nand@0 {
		reg = <0>;
		nand-on-flash-bbt;
		};
		status = "okay";
		};

		&i2c3 {

arch/arm/boot/dts/nxp/imx/imx6qdl-icore.dtsi

+1 −5

Original line number	Diff line number	Diff line
		@@ -172,12 +172,8 @@ eth_phy: ethernet-phy@0 {
		&gpmi {
		pinctrl-names = "default";
		pinctrl-0 = <&pinctrl_gpmi_nand>;
		status = "okay";

		nand@0 {
		reg = <0>;
		nand-on-flash-bbt;
		};
		status = "okay";
		};

		&i2c1 {

arch/arm/boot/dts/nxp/imx/imx6qdl-phytec-pfla02.dtsi

+1 −5

Original line number	Diff line number	Diff line
		@@ -102,12 +102,8 @@ ethphy: ethernet-phy@0 {
		&gpmi {
		pinctrl-names = "default";
		pinctrl-0 = <&pinctrl_gpmi_nand>;
		status = "okay";

		nand@0 {
		reg = <0>;
		nand-on-flash-bbt;
		};
		status = "okay";
		};

		&i2c1 {

arch/arm/boot/dts/nxp/imx/imx6qdl-phytec-phycore-som.dtsi

+1 −5

Original line number	Diff line number	Diff line
		@@ -73,12 +73,8 @@ ethphy: ethernet-phy@3 {
		&gpmi {
		pinctrl-names = "default";
		pinctrl-0 = <&pinctrl_gpmi_nand>;
		status = "disabled";

		nand@0 {
		reg = <0>;
		nand-on-flash-bbt;
		};
		status = "disabled";
		};

		&i2c3 {

arch/arm/boot/dts/nxp/imx/imx6qdl-skov-cpu.dtsi

+1 −5

Original line number	Diff line number	Diff line
		@@ -260,14 +260,10 @@ fixed-link {
		&gpmi {
		pinctrl-names = "default";
		pinctrl-0 = <&pinctrl_gpmi_nand>;
		nand-on-flash-bbt;
		#address-cells = <1>;
		#size-cells = <0>;
		status = "okay";

		nand@0 {
		reg = <0>;
		nand-on-flash-bbt;
		};
		};

		&i2c3 {