Unverified Commit c221cc87 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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: default avatarArnd Bergmann <arnd@arndb.de>
parents 51183d3f 89e87d0d

Documentation/devicetree/bindings/arm/fsl.yaml

+8 −1
Original line number Diff line number Diff line
@@ -1105,7 +1105,6 @@ properties: 
              - gateworks,imx8mp-gw74xx   # i.MX8MP Gateworks Board

              - gateworks,imx8mp-gw75xx-2x # i.MX8MP Gateworks Board

              - gateworks,imx8mp-gw82xx-2x # i.MX8MP Gateworks Board

              - gocontroll,moduline-display # GOcontroll Moduline Display controller

              - prt,prt8ml             # Protonic PRT8ML

              - skov,imx8mp-skov-basic # SKOV i.MX8MP baseboard without frontplate

              - skov,imx8mp-skov-revb-hdmi # SKOV i.MX8MP climate control without panel
@@ -1164,6 +1163,14 @@ properties: 
          - const: engicam,icore-mx8mp             # i.MX8MP Engicam i.Core MX8M Plus SoM

          - const: fsl,imx8mp



      - description: Ka-Ro TX8P-ML81 SoM based boards

        items:

          - enum:

              - gocontroll,moduline-display

              - gocontroll,moduline-display-106

          - const: karo,tx8p-ml81

          - const: fsl,imx8mp



      - description: Kontron i.MX8MP OSM-S SoM based Boards

        items:

          - const: kontron,imx8mp-bl-osm-s  # Kontron BL i.MX8MP OSM-S Board

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

+4 −4
Original line number Diff line number Diff line
@@ -248,14 +248,14 @@ ledr3: led@9 { 
		linux,default-trigger = "nand-disk";

	};



	ledg3: led@10 {

		reg = <10>;

	ledg3: led@a {

		reg = <0xa>;

		label = "system:green3:live";

		linux,default-trigger = "heartbeat";

	};



	ledb3: led@11 {

		reg = <11>;

	ledb3: led@b {

		reg = <0xb>;

		label = "system:blue3:cpu";

		linux,default-trigger = "cpu0";

	};

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

+2 −2
Original line number Diff line number Diff line
@@ -398,13 +398,13 @@ leds { 
			#size-cells = <0>;

			led-control = <0x0 0x0 0x3f83f8 0x0>;



			sysled0@3 {

			led@3 {

				reg = <3>;

				label = "system:green:status";

				linux,default-trigger = "default-on";

			};



			sysled1@4 {

			led@4 {

				reg = <4>;

				label = "system:green:act";

				linux,default-trigger = "heartbeat";

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

+2 −2
Original line number Diff line number Diff line
@@ -225,13 +225,13 @@ leds { 
			#size-cells = <0>;

			led-control = <0x0 0x0 0x3f83f8 0x0>;



			sysled3: led3@3 {

			sysled3: led@3 {

				reg = <3>;

				label = "system:red:power";

				linux,default-trigger = "default-on";

			};



			sysled4: led4@4 {

			sysled4: led@4 {

				reg = <4>;

				label = "system:green:act";

				linux,default-trigger = "heartbeat";

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

+2 −2
Original line number Diff line number Diff line
@@ -153,13 +153,13 @@ leds { 
			#size-cells = <0>;

			led-control = <0x0 0x0 0x3f83f8 0x0>;



			sysled3: led3@3 {

			sysled3: led@3 {

				reg = <3>;

				label = "system:red:power";

				linux,default-trigger = "default-on";

			};



			sysled4: led4@4 {

			sysled4: led@4 {

				reg = <4>;

				label = "system:green:act";

				linux,default-trigger = "heartbeat";