Unverified Commit 65c4ba83 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

i.MX fixes for 6.18, 2nd round:

- Correct i.MX8DXL's pcie-ep interrupt number (Frank Li)
- Swap interrupt numbers of eqos for imx8dxl-ss-conn (Frank Li)
- Correct SAI3 interrupt line for i.MX6UL (Maarten Zanders)
- Correct mux-controller select/enable-gpios polarity for imx8qm-mek
  board (Xu Yang)

* tag 'imx-fixes-6.18-2' of https://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux

:
  arm64: dts: imx8qm-mek: fix mux-controller select/enable-gpios polarity
  ARM: dts: nxp: imx6ul: correct SAI3 interrupt line
  arm64: dts: imx8dxl-ss-conn: swap interrupts number of eqos
  arm64: dts: imx8dxl: Correct pcie-ep interrupt number

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 2eba5e05 e89ee355

arch/arm/boot/dts/nxp/imx/imx6ul.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -339,7 +339,7 @@ sai3: sai@2030000 { 
					#sound-dai-cells = <0>;

					compatible = "fsl,imx6ul-sai", "fsl,imx6sx-sai";

					reg = <0x02030000 0x4000>;

					interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;

					interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;

					clocks = <&clks IMX6UL_CLK_SAI3_IPG>,

						 <&clks IMX6UL_CLK_SAI3>,

						 <&clks IMX6UL_CLK_DUMMY>, <&clks IMX6UL_CLK_DUMMY>;

arch/arm64/boot/dts/freescale/imx8dxl-ss-conn.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -29,8 +29,8 @@ eqos: ethernet@5b050000 { 
		compatible = "nxp,imx8dxl-dwmac-eqos", "snps,dwmac-5.10a";

		reg = <0x5b050000 0x10000>;

		interrupt-parent = <&gic>;

		interrupts = <GIC_SPI 163 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 162 IRQ_TYPE_LEVEL_HIGH>;

		interrupts = <GIC_SPI 162 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 163 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-names = "macirq", "eth_wake_irq";

		clocks = <&eqos_lpcg IMX_LPCG_CLK_4>,

			 <&eqos_lpcg IMX_LPCG_CLK_6>,

arch/arm64/boot/dts/freescale/imx8dxl-ss-hsio.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -54,3 +54,8 @@ pcie0_ep: pcie-ep@5f010000 { 
		interrupt-names = "dma";

	};

};



&pcieb_ep {

	interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>;

	interrupt-names = "dma";

};

arch/arm64/boot/dts/freescale/imx8qm-mek.dts

+2 −2
Original line number Diff line number Diff line
@@ -217,8 +217,8 @@ mux-controller { 
		compatible = "nxp,cbdtu02043", "gpio-sbu-mux";

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_typec_mux>;

		select-gpios = <&lsio_gpio4 6 GPIO_ACTIVE_LOW>;

		enable-gpios = <&lsio_gpio4 19 GPIO_ACTIVE_HIGH>;

		select-gpios = <&lsio_gpio4 6 GPIO_ACTIVE_HIGH>;

		enable-gpios = <&lsio_gpio4 19 GPIO_ACTIVE_LOW>;

		orientation-switch;



		port {