Unverified Commit 1e7c8c54 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

i.MX fixes for 6.16:

- Keep LDO5 always on for imx8mm-verdin to fix broken Ethernet support
- Add big-endian property back for LS1046A watchdog, as the removal was
  an accident
- Fix DMA interrupter number of i.MX95 pcie0_ep device
- A set of changes from Tim Harvey to fix TPM SPI frequency on
  imx8mp-venice devices
- A couple of changes from Wei Fang to fix NETC overshoot issue on
  i.MX95 EVK boards

* tag 'imx-fixes-6.16' of https://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  arm64: dts: freescale: imx8mm-verdin: Keep LDO5 always on
  arm64: dts: imx95: Correct the DMA interrupter number of pcie0_ep
  arm64: dts: add big-endian property back into watchdog node
  arm64: dts: imx95-15x15-evk: fix the overshoot issue of NETC
  arm64: dts: imx95-19x19-evk: fix the overshoot issue of NETC
  arm64: dts: imx8mp-venice-gw74xx: fix TPM SPI frequency
  arm64: dts: imx8mp-venice-gw73xx: fix TPM SPI frequency
  arm64: dts: imx8mp-venice-gw72xx: fix TPM SPI frequency
  arm64: dts: imx8mp-venice-gw71xx: fix TPM SPI frequency

Link: https://lore.kernel.org/r/aGzNeZ7KtsRsUkZT@dragon


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 3f3fb973 fbe94be0
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -687,11 +687,12 @@ lpuart5: serial@29a0000 {
		};

		wdog0: watchdog@2ad0000 {
			compatible = "fsl,imx21-wdt";
			compatible = "fsl,ls1046a-wdt", "fsl,imx21-wdt";
			reg = <0x0 0x2ad0000 0x0 0x10000>;
			interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>;
			clocks = <&clockgen QORIQ_CLK_PLATFORM_PLL
					    QORIQ_CLK_PLL_DIV(2)>;
			big-endian;
		};

		edma0: dma-controller@2c00000 {
+1 −0
Original line number Diff line number Diff line
@@ -464,6 +464,7 @@ reg_vdd_phy: LDO4 {
			};

			reg_nvcc_sd: LDO5 {
				regulator-always-on;
				regulator-max-microvolt = <3300000>;
				regulator-min-microvolt = <1800000>;
				regulator-name = "On-module +V3.3_1.8_SD (LDO5)";
+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ &ecspi2 {
	tpm@1 {
		compatible = "atmel,attpm20p", "tcg,tpm_tis-spi";
		reg = <0x1>;
		spi-max-frequency = <36000000>;
		spi-max-frequency = <25000000>;
	};
};

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ &ecspi2 {
	tpm@1 {
		compatible = "atmel,attpm20p", "tcg,tpm_tis-spi";
		reg = <0x1>;
		spi-max-frequency = <36000000>;
		spi-max-frequency = <25000000>;
	};
};

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ &ecspi2 {
	tpm@1 {
		compatible = "atmel,attpm20p", "tcg,tpm_tis-spi";
		reg = <0x1>;
		spi-max-frequency = <36000000>;
		spi-max-frequency = <25000000>;
	};
};

Loading