Unverified Commit 22505963 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'imx-fixes-5.15-2' of... 

Merge tag 'imx-fixes-5.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/fixes

i.MX fixes for 5.15, round 2:

- A couple of fixes from Haibo Chen to update SPI NOR TX bus width for
  i.MX6 and i.MX8 boards.  This becomes necessary because spi-nor driver
  starts using the setting in DT.
- Mark buck2 always-on for i.MX8MM Kontron-n801x-som board to avoid the
  core supply being turned off unexpectedly.
- Fix eSDHC2 device tree settings for LS1028A SoC.
- Disable GIC CPU interface before calling stby-poweroff sequence to fix
  power-off failure on i.MX6.
- Fix M2_RST# GPIO pinmux on i.MX8M venice-gw7902 boards.

* tag 'imx-fixes-5.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  arm64: dts: imx8m*-venice-gw7902: fix M2_RST# gpio
  ARM: imx6: disable the GIC CPU interface before calling stby-poweroff sequence
  arm64: dts: ls1028a: fix eSDHC2 node
  arm64: dts: imx8mm-kontron-n801x-som: do not allow to switch off buck2
  arm64: dts: imx8: change the spi-nor tx
  ARM: dts: imx: change the spi-nor tx

Link: https://lore.kernel.org/r/20211006125734.GA10197@dragon


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 34186b48 3518441d

arch/arm/boot/dts/imx6sx-sdb.dts

+2 −2
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ 
		compatible = "micron,n25q256a", "jedec,spi-nor";

		spi-max-frequency = <29000000>;

		spi-rx-bus-width = <4>;

		spi-tx-bus-width = <4>;

		spi-tx-bus-width = <1>;

		reg = <0>;

	};
@@ -124,7 +124,7 @@ 
		compatible = "micron,n25q256a", "jedec,spi-nor";

		spi-max-frequency = <29000000>;

		spi-rx-bus-width = <4>;

		spi-tx-bus-width = <4>;

		spi-tx-bus-width = <1>;

		reg = <2>;

	};

};

arch/arm/boot/dts/imx6ul-14x14-evk.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -292,7 +292,7 @@ 
		compatible = "micron,n25q256a", "jedec,spi-nor";

		spi-max-frequency = <29000000>;

		spi-rx-bus-width = <4>;

		spi-tx-bus-width = <4>;

		spi-tx-bus-width = <1>;

		reg = <0>;

	};

};

arch/arm/mach-imx/pm-imx6.c

+2 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include <linux/io.h>

#include <linux/irq.h>

#include <linux/genalloc.h>

#include <linux/irqchip/arm-gic.h>

#include <linux/mfd/syscon.h>

#include <linux/mfd/syscon/imx6q-iomuxc-gpr.h>

#include <linux/of.h>
@@ -619,6 +620,7 @@ static void __init imx6_pm_common_init(const struct imx6_pm_socdata 


static void imx6_pm_stby_poweroff(void)

{

	gic_cpu_if_down(0);

	imx6_set_lpm(STOP_POWER_OFF);

	imx6q_suspend_finish(0);

arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -405,9 +405,9 @@ 
			interrupts = <GIC_SPI 63 IRQ_TYPE_LEVEL_HIGH>;

			clock-frequency = <0>; /* fixed up by bootloader */

			clocks = <&clockgen QORIQ_CLK_HWACCEL 1>;

			voltage-ranges = <1800 1800 3300 3300>;

			voltage-ranges = <1800 1800>;

			sdhci,auto-cmd12;

			broken-cd;

			non-removable;

			little-endian;

			bus-width = <4>;

			status = "disabled";

arch/arm64/boot/dts/freescale/imx8mm-beacon-som.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ 
		#size-cells = <1>;

		compatible = "jedec,spi-nor";

		spi-max-frequency = <80000000>;

		spi-tx-bus-width = <4>;

		spi-tx-bus-width = <1>;

		spi-rx-bus-width = <4>;

	};

};