Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Arnd Bergmann <arnd@arndb.de>

+10 -5
+1 -1
arch/arm/boot/dts/nxp/imx/imx6ul.dtsi
··· 339 339 #sound-dai-cells = <0>; 340 340 compatible = "fsl,imx6ul-sai", "fsl,imx6sx-sai"; 341 341 reg = <0x02030000 0x4000>; 342 - interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>; 342 + interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>; 343 343 clocks = <&clks IMX6UL_CLK_SAI3_IPG>, 344 344 <&clks IMX6UL_CLK_SAI3>, 345 345 <&clks IMX6UL_CLK_DUMMY>, <&clks IMX6UL_CLK_DUMMY>;
+2 -2
arch/arm64/boot/dts/freescale/imx8dxl-ss-conn.dtsi
··· 29 29 compatible = "nxp,imx8dxl-dwmac-eqos", "snps,dwmac-5.10a"; 30 30 reg = <0x5b050000 0x10000>; 31 31 interrupt-parent = <&gic>; 32 - interrupts = <GIC_SPI 163 IRQ_TYPE_LEVEL_HIGH>, 33 - <GIC_SPI 162 IRQ_TYPE_LEVEL_HIGH>; 32 + interrupts = <GIC_SPI 162 IRQ_TYPE_LEVEL_HIGH>, 33 + <GIC_SPI 163 IRQ_TYPE_LEVEL_HIGH>; 34 34 interrupt-names = "macirq", "eth_wake_irq"; 35 35 clocks = <&eqos_lpcg IMX_LPCG_CLK_4>, 36 36 <&eqos_lpcg IMX_LPCG_CLK_6>,
+5
arch/arm64/boot/dts/freescale/imx8dxl-ss-hsio.dtsi
··· 54 54 interrupt-names = "dma"; 55 55 }; 56 56 }; 57 + 58 + &pcieb_ep { 59 + interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>; 60 + interrupt-names = "dma"; 61 + };
+2 -2
arch/arm64/boot/dts/freescale/imx8qm-mek.dts
··· 217 217 compatible = "nxp,cbdtu02043", "gpio-sbu-mux"; 218 218 pinctrl-names = "default"; 219 219 pinctrl-0 = <&pinctrl_typec_mux>; 220 - select-gpios = <&lsio_gpio4 6 GPIO_ACTIVE_LOW>; 221 - enable-gpios = <&lsio_gpio4 19 GPIO_ACTIVE_HIGH>; 220 + select-gpios = <&lsio_gpio4 6 GPIO_ACTIVE_HIGH>; 221 + enable-gpios = <&lsio_gpio4 19 GPIO_ACTIVE_LOW>; 222 222 orientation-switch; 223 223 224 224 port {