Skip to content

Commit c221cc8

Browse files
arndbarndb
committed
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>
2 parents 51183d3 + 89e87d0 commit c221cc8

14 files changed

Lines changed: 35 additions & 23 deletions

‎Documentation/devicetree/bindings/arm/fsl.yaml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1105,7 +1105,6 @@ properties:
11051105
- gateworks,imx8mp-gw74xx # i.MX8MP Gateworks Board
11061106
- gateworks,imx8mp-gw75xx-2x # i.MX8MP Gateworks Board
11071107
- gateworks,imx8mp-gw82xx-2x # i.MX8MP Gateworks Board
1108-
- gocontroll,moduline-display # GOcontroll Moduline Display controller
11091108
- prt,prt8ml # Protonic PRT8ML
11101109
- skov,imx8mp-skov-basic # SKOV i.MX8MP baseboard without frontplate
11111110
- skov,imx8mp-skov-revb-hdmi # SKOV i.MX8MP climate control without panel
@@ -1164,6 +1163,14 @@ properties:
11641163
- const: engicam,icore-mx8mp # i.MX8MP Engicam i.Core MX8M Plus SoM
11651164
- const: fsl,imx8mp
11661165

1166+
- description: Ka-Ro TX8P-ML81 SoM based boards
1167+
items:
1168+
- enum:
1169+
- gocontroll,moduline-display
1170+
- gocontroll,moduline-display-106
1171+
- const: karo,tx8p-ml81
1172+
- const: fsl,imx8mp
1173+
11671174
- description: Kontron i.MX8MP OSM-S SoM based Boards
11681175
items:
11691176
- const: kontron,imx8mp-bl-osm-s # Kontron BL i.MX8MP OSM-S Board

‎arch/arm/boot/dts/nxp/imx/imx27-phytec-phycore-rdk.dts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -248,14 +248,14 @@
248248
linux,default-trigger = "nand-disk";
249249
};
250250

251-
ledg3: led@10 {
252-
reg = <10>;
251+
ledg3: led@a {
252+
reg = <0xa>;
253253
label = "system:green3:live";
254254
linux,default-trigger = "heartbeat";
255255
};
256256

257-
ledb3: led@11 {
258-
reg = <11>;
257+
ledb3: led@b {
258+
reg = <0xb>;
259259
label = "system:blue3:cpu";
260260
linux,default-trigger = "cpu0";
261261
};

‎arch/arm/boot/dts/nxp/imx/imx51-zii-rdu1.dts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -398,13 +398,13 @@
398398
#size-cells = <0>;
399399
led-control = <0x0 0x0 0x3f83f8 0x0>;
400400

401-
sysled0@3 {
401+
led@3 {
402402
reg = <3>;
403403
label = "system:green:status";
404404
linux,default-trigger = "default-on";
405405
};
406406

407-
sysled1@4 {
407+
led@4 {
408408
reg = <4>;
409409
label = "system:green:act";
410410
linux,default-trigger = "heartbeat";

‎arch/arm/boot/dts/nxp/imx/imx51-zii-scu2-mezz.dts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,13 +225,13 @@
225225
#size-cells = <0>;
226226
led-control = <0x0 0x0 0x3f83f8 0x0>;
227227

228-
sysled3: led3@3 {
228+
sysled3: led@3 {
229229
reg = <3>;
230230
label = "system:red:power";
231231
linux,default-trigger = "default-on";
232232
};
233233

234-
sysled4: led4@4 {
234+
sysled4: led@4 {
235235
reg = <4>;
236236
label = "system:green:act";
237237
linux,default-trigger = "heartbeat";

‎arch/arm/boot/dts/nxp/imx/imx51-zii-scu3-esb.dts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,13 +153,13 @@
153153
#size-cells = <0>;
154154
led-control = <0x0 0x0 0x3f83f8 0x0>;
155155

156-
sysled3: led3@3 {
156+
sysled3: led@3 {
157157
reg = <3>;
158158
label = "system:red:power";
159159
linux,default-trigger = "default-on";
160160
};
161161

162-
sysled4: led4@4 {
162+
sysled4: led@4 {
163163
reg = <4>;
164164
label = "system:green:act";
165165
linux,default-trigger = "heartbeat";

‎arch/arm/boot/dts/nxp/imx/imx6q-ba16.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@
337337
pinctrl-0 = <&pinctrl_rtc>;
338338
reg = <0x32>;
339339
interrupt-parent = <&gpio4>;
340-
interrupts = <10 IRQ_TYPE_LEVEL_HIGH>;
340+
interrupts = <10 IRQ_TYPE_LEVEL_LOW>;
341341
};
342342
};
343343

‎arch/arm64/boot/dts/freescale/imx8mp-dhcom-som.dtsi‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@
113113
ethphy0f: ethernet-phy@1 { /* SMSC LAN8740Ai */
114114
compatible = "ethernet-phy-id0007.c110",
115115
"ethernet-phy-ieee802.3-c22";
116+
clocks = <&clk IMX8MP_CLK_ENET_QOS>;
116117
interrupt-parent = <&gpio3>;
117118
interrupts = <19 IRQ_TYPE_LEVEL_LOW>;
118119
pinctrl-0 = <&pinctrl_ethphy0>;

‎arch/arm64/boot/dts/freescale/imx8mp-tx8p-ml81-moduline-display-106.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include "imx8mp-tx8p-ml81.dtsi"
1010

1111
/ {
12-
compatible = "gocontroll,moduline-display", "fsl,imx8mp";
12+
compatible = "gocontroll,moduline-display-106", "karo,tx8p-ml81", "fsl,imx8mp";
1313
chassis-type = "embedded";
1414
hardware = "Moduline Display V1.06";
1515
model = "GOcontroll Moduline Display baseboard";

‎arch/arm64/boot/dts/freescale/imx8mp-tx8p-ml81.dtsi‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
<&clk IMX8MP_SYS_PLL2_100M>,
4848
<&clk IMX8MP_SYS_PLL2_50M>;
4949
assigned-clock-rates = <266000000>, <100000000>, <50000000>;
50+
nvmem-cells = <&eth_mac1>;
5051
phy-handle = <&ethphy0>;
5152
phy-mode = "rmii";
5253
pinctrl-0 = <&pinctrl_eqos>;
@@ -75,6 +76,10 @@
7576
};
7677
};
7778

79+
&fec {
80+
nvmem-cells = <&eth_mac2>;
81+
};
82+
7883
&gpio1 {
7984
gpio-line-names = "SODIMM_152",
8085
"SODIMM_42",

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,7 @@
263263
regulator-max-microvolt = <3000000>;
264264
gpio = <&lsio_gpio4 7 GPIO_ACTIVE_HIGH>;
265265
enable-active-high;
266+
off-on-delay-us = <4800>;
266267
};
267268

268269
reg_audio: regulator-audio {
@@ -576,7 +577,7 @@
576577
compatible = "isil,isl29023";
577578
reg = <0x44>;
578579
interrupt-parent = <&lsio_gpio4>;
579-
interrupts = <11 IRQ_TYPE_EDGE_FALLING>;
580+
interrupts = <11 IRQ_TYPE_LEVEL_LOW>;
580581
};
581582

582583
pressure-sensor@60 {

0 commit comments

Comments
 (0)