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

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

i.MX fixes for 6.19:

- A mba8mx fix from Alexander Stein to correct Ethernet PHY IRQ trigger
type
- An i.MX95 fix from Carlos Song to correct I3C2 pclk
- A couple of imx8qm-mek changes from Haibo Chen to fix light sensor
interrupt type and usdhc2 regulator configuration
- An imx6q-ba16 change from Ian Ray to fix RTC interrupt level
- An imx8mp-dhcom-som change from Marek Vasut to fix sporadic Ethernet
link bouncing caused by interruptions on the PHY reference clock
- A couple of imx8mp-tx8p changes from Maud Spierings to fix compatible
and eqos nvmem-cells
- An ARM i.MX fix from Rob Herring to correct mc13xxx LED node names
- An imx8qm-ss-dma change from Sherry Sun to correct DMA channels for
LPUART
- A couple of imx95-toradex-smarc changes from Vitor Soares to fix
ethphy1 interrupt and SMARC_SDIO_WP label position

* tag 'imx-fixes-6.19' of https://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
arm64: dts: mba8mx: Fix Ethernet PHY IRQ support
arm64: dts: imx8qm-ss-dma: correct the dma channels of lpuart
arm64: dts: imx8mp: Fix LAN8740Ai PHY reference clock on DH electronics i.MX8M Plus DHCOM
arm64: dts: freescale: tx8p-ml81: fix eqos nvmem-cells
arm64: dts: freescale: moduline-display: fix compatible
dt-bindings: arm: fsl: moduline-display: fix compatible
ARM: dts: imx6q-ba16: fix RTC interrupt level
arm64: dts: freescale: imx95-toradex-smarc: fix SMARC_SDIO_WP label position
arm64: dts: freescale: imx95-toradex-smarc: use edge trigger for ethphy1 interrupt
arm64: dts: add off-on-delay-us for usdhc2 regulator
arm64: dts: imx8qm-mek: correct the light sensor interrupt type to low level
ARM: dts: nxp: imx: Fix mc13xxx LED node names
arm64: dts: imx95: correct I3C2 pclk to IMX95_CLK_BUSWAKEUP

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Arnd Bergmann c221cc87 51183d3f

+35 -23
+8 -1
Documentation/devicetree/bindings/arm/fsl.yaml
··· 1105 1105 - gateworks,imx8mp-gw74xx # i.MX8MP Gateworks Board 1106 1106 - gateworks,imx8mp-gw75xx-2x # i.MX8MP Gateworks Board 1107 1107 - gateworks,imx8mp-gw82xx-2x # i.MX8MP Gateworks Board 1108 - - gocontroll,moduline-display # GOcontroll Moduline Display controller 1109 1108 - prt,prt8ml # Protonic PRT8ML 1110 1109 - skov,imx8mp-skov-basic # SKOV i.MX8MP baseboard without frontplate 1111 1110 - skov,imx8mp-skov-revb-hdmi # SKOV i.MX8MP climate control without panel ··· 1161 1162 - enum: 1162 1163 - engicam,icore-mx8mp-edimm2.2 # i.MX8MP Engicam i.Core MX8M Plus EDIMM2.2 Starter Kit 1163 1164 - const: engicam,icore-mx8mp # i.MX8MP Engicam i.Core MX8M Plus SoM 1165 + - const: fsl,imx8mp 1166 + 1167 + - description: Ka-Ro TX8P-ML81 SoM based boards 1168 + items: 1169 + - enum: 1170 + - gocontroll,moduline-display 1171 + - gocontroll,moduline-display-106 1172 + - const: karo,tx8p-ml81 1164 1173 - const: fsl,imx8mp 1165 1174 1166 1175 - description: Kontron i.MX8MP OSM-S SoM based Boards
+4 -4
arch/arm/boot/dts/nxp/imx/imx27-phytec-phycore-rdk.dts
··· 248 248 linux,default-trigger = "nand-disk"; 249 249 }; 250 250 251 - ledg3: led@10 { 252 - reg = <10>; 251 + ledg3: led@a { 252 + reg = <0xa>; 253 253 label = "system:green3:live"; 254 254 linux,default-trigger = "heartbeat"; 255 255 }; 256 256 257 - ledb3: led@11 { 258 - reg = <11>; 257 + ledb3: led@b { 258 + reg = <0xb>; 259 259 label = "system:blue3:cpu"; 260 260 linux,default-trigger = "cpu0"; 261 261 };
+2 -2
arch/arm/boot/dts/nxp/imx/imx51-zii-rdu1.dts
··· 398 398 #size-cells = <0>; 399 399 led-control = <0x0 0x0 0x3f83f8 0x0>; 400 400 401 - sysled0@3 { 401 + led@3 { 402 402 reg = <3>; 403 403 label = "system:green:status"; 404 404 linux,default-trigger = "default-on"; 405 405 }; 406 406 407 - sysled1@4 { 407 + led@4 { 408 408 reg = <4>; 409 409 label = "system:green:act"; 410 410 linux,default-trigger = "heartbeat";
+2 -2
arch/arm/boot/dts/nxp/imx/imx51-zii-scu2-mezz.dts
··· 225 225 #size-cells = <0>; 226 226 led-control = <0x0 0x0 0x3f83f8 0x0>; 227 227 228 - sysled3: led3@3 { 228 + sysled3: led@3 { 229 229 reg = <3>; 230 230 label = "system:red:power"; 231 231 linux,default-trigger = "default-on"; 232 232 }; 233 233 234 - sysled4: led4@4 { 234 + sysled4: led@4 { 235 235 reg = <4>; 236 236 label = "system:green:act"; 237 237 linux,default-trigger = "heartbeat";
+2 -2
arch/arm/boot/dts/nxp/imx/imx51-zii-scu3-esb.dts
··· 153 153 #size-cells = <0>; 154 154 led-control = <0x0 0x0 0x3f83f8 0x0>; 155 155 156 - sysled3: led3@3 { 156 + sysled3: led@3 { 157 157 reg = <3>; 158 158 label = "system:red:power"; 159 159 linux,default-trigger = "default-on"; 160 160 }; 161 161 162 - sysled4: led4@4 { 162 + sysled4: led@4 { 163 163 reg = <4>; 164 164 label = "system:green:act"; 165 165 linux,default-trigger = "heartbeat";
+1 -1
arch/arm/boot/dts/nxp/imx/imx6q-ba16.dtsi
··· 337 337 pinctrl-0 = <&pinctrl_rtc>; 338 338 reg = <0x32>; 339 339 interrupt-parent = <&gpio4>; 340 - interrupts = <10 IRQ_TYPE_LEVEL_HIGH>; 340 + interrupts = <10 IRQ_TYPE_LEVEL_LOW>; 341 341 }; 342 342 }; 343 343
+1
arch/arm64/boot/dts/freescale/imx8mp-dhcom-som.dtsi
··· 113 113 ethphy0f: ethernet-phy@1 { /* SMSC LAN8740Ai */ 114 114 compatible = "ethernet-phy-id0007.c110", 115 115 "ethernet-phy-ieee802.3-c22"; 116 + clocks = <&clk IMX8MP_CLK_ENET_QOS>; 116 117 interrupt-parent = <&gpio3>; 117 118 interrupts = <19 IRQ_TYPE_LEVEL_LOW>; 118 119 pinctrl-0 = <&pinctrl_ethphy0>;
+1 -1
arch/arm64/boot/dts/freescale/imx8mp-tx8p-ml81-moduline-display-106.dts
··· 9 9 #include "imx8mp-tx8p-ml81.dtsi" 10 10 11 11 / { 12 - compatible = "gocontroll,moduline-display", "fsl,imx8mp"; 12 + compatible = "gocontroll,moduline-display-106", "karo,tx8p-ml81", "fsl,imx8mp"; 13 13 chassis-type = "embedded"; 14 14 hardware = "Moduline Display V1.06"; 15 15 model = "GOcontroll Moduline Display baseboard";
+5
arch/arm64/boot/dts/freescale/imx8mp-tx8p-ml81.dtsi
··· 47 47 <&clk IMX8MP_SYS_PLL2_100M>, 48 48 <&clk IMX8MP_SYS_PLL2_50M>; 49 49 assigned-clock-rates = <266000000>, <100000000>, <50000000>; 50 + nvmem-cells = <&eth_mac1>; 50 51 phy-handle = <&ethphy0>; 51 52 phy-mode = "rmii"; 52 53 pinctrl-0 = <&pinctrl_eqos>; ··· 74 73 smsc,disable-energy-detect; 75 74 }; 76 75 }; 76 + }; 77 + 78 + &fec { 79 + nvmem-cells = <&eth_mac2>; 77 80 }; 78 81 79 82 &gpio1 {
+2 -1
arch/arm64/boot/dts/freescale/imx8qm-mek.dts
··· 263 263 regulator-max-microvolt = <3000000>; 264 264 gpio = <&lsio_gpio4 7 GPIO_ACTIVE_HIGH>; 265 265 enable-active-high; 266 + off-on-delay-us = <4800>; 266 267 }; 267 268 268 269 reg_audio: regulator-audio { ··· 577 576 compatible = "isil,isl29023"; 578 577 reg = <0x44>; 579 578 interrupt-parent = <&lsio_gpio4>; 580 - interrupts = <11 IRQ_TYPE_EDGE_FALLING>; 579 + interrupts = <11 IRQ_TYPE_LEVEL_LOW>; 581 580 }; 582 581 583 582 pressure-sensor@60 {
+4 -4
arch/arm64/boot/dts/freescale/imx8qm-ss-dma.dtsi
··· 172 172 173 173 &lpuart0 { 174 174 compatible = "fsl,imx8qm-lpuart", "fsl,imx8qxp-lpuart"; 175 - dmas = <&edma2 13 0 0>, <&edma2 12 0 1>; 175 + dmas = <&edma2 12 0 FSL_EDMA_RX>, <&edma2 13 0 0>; 176 176 dma-names = "rx","tx"; 177 177 }; 178 178 179 179 &lpuart1 { 180 180 compatible = "fsl,imx8qm-lpuart", "fsl,imx8qxp-lpuart"; 181 - dmas = <&edma2 15 0 0>, <&edma2 14 0 1>; 181 + dmas = <&edma2 14 0 FSL_EDMA_RX>, <&edma2 15 0 0>; 182 182 dma-names = "rx","tx"; 183 183 }; 184 184 185 185 &lpuart2 { 186 186 compatible = "fsl,imx8qm-lpuart", "fsl,imx8qxp-lpuart"; 187 - dmas = <&edma2 17 0 0>, <&edma2 16 0 1>; 187 + dmas = <&edma2 16 0 FSL_EDMA_RX>, <&edma2 17 0 0>; 188 188 dma-names = "rx","tx"; 189 189 }; 190 190 191 191 &lpuart3 { 192 192 compatible = "fsl,imx8qm-lpuart", "fsl,imx8qxp-lpuart"; 193 - dmas = <&edma2 19 0 0>, <&edma2 18 0 1>; 193 + dmas = <&edma2 18 0 FSL_EDMA_RX>, <&edma2 19 0 0>; 194 194 dma-names = "rx","tx"; 195 195 }; 196 196
+1 -3
arch/arm64/boot/dts/freescale/imx95-toradex-smarc.dtsi
··· 406 406 "", 407 407 "", 408 408 "", 409 - "", 410 - "", 411 409 "SMARC_SDIO_WP"; 412 410 }; 413 411 ··· 580 582 ethphy1: ethernet-phy@1 { 581 583 reg = <1>; 582 584 interrupt-parent = <&som_gpio_expander_1>; 583 - interrupts = <6 IRQ_TYPE_LEVEL_LOW>; 585 + interrupts = <6 IRQ_TYPE_EDGE_FALLING>; 584 586 ti,rx-internal-delay = <DP83867_RGMIIDCTL_2_00_NS>; 585 587 ti,tx-internal-delay = <DP83867_RGMIIDCTL_2_00_NS>; 586 588 };
+1 -1
arch/arm64/boot/dts/freescale/imx95.dtsi
··· 828 828 interrupts = <GIC_SPI 57 IRQ_TYPE_LEVEL_HIGH>; 829 829 #address-cells = <3>; 830 830 #size-cells = <0>; 831 - clocks = <&scmi_clk IMX95_CLK_BUSAON>, 831 + clocks = <&scmi_clk IMX95_CLK_BUSWAKEUP>, 832 832 <&scmi_clk IMX95_CLK_I3C2SLOW>; 833 833 clock-names = "pclk", "fast_clk"; 834 834 status = "disabled";
+1 -1
arch/arm64/boot/dts/freescale/mba8mx.dtsi
··· 192 192 reset-assert-us = <500000>; 193 193 reset-deassert-us = <500>; 194 194 interrupt-parent = <&expander2>; 195 - interrupts = <6 IRQ_TYPE_EDGE_FALLING>; 195 + interrupts = <6 IRQ_TYPE_LEVEL_LOW>; 196 196 }; 197 197 }; 198 198 };