Unverified Commit 8a74191c authored Jan 30, 2023 by Arnd Bergmann

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

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

i.MX fixes for 6.2, round 2:

- Update MAINTAINERS i.MX entry to match arm64 freescale DTS.
- Drop misused 'uart-has-rtscts' from imx8m-venice boards.
- Fix USB host over-current polarity for imx7d-smegw01 board.
- Fix a typo in i.MX8DXL sc_pwrkey property name.
- Fix GPIO watchdog property for i.MX8MM eDM SBC board.
- Keep Ethernet PHY powered on imx8mm-verdin to avoid kernel crash.
- Fix configuration of i.MX8MM pad UART1_DTE_RX.

* tag 'imx-fixes-6.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: dts: imx7d-smegw01: Fix USB host over-current polarity
  arm64: dts: imx8mm-verdin: Do not power down eth-phy
  MAINTAINERS: match freescale ARM64 DT directory in i.MX entry
  arm64: dts: imx8mm: Fix pad control for UART1_DTE_RX
  arm64: dts: freescale: imx8dxl: fix sc_pwrkey's property name linux,keycode
  arm64: dts: imx8m-venice: Remove incorrect 'uart-has-rtscts'
  arm64: dts: imx8mm: Reinstate GPIO watchdog always-running property on eDM SBC

Link: https://lore.kernel.org/r/20230130003614.GP20713@T480


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

parents a6e6ceb2 1febf88e

MAINTAINERS

+3 −0

Original line number	Diff line number	Diff line
		@@ -2211,6 +2211,9 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
		S: Maintained
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git
		X: drivers/media/i2c/
		F: arch/arm64/boot/dts/freescale/
		X: arch/arm64/boot/dts/freescale/fsl-*
		X: arch/arm64/boot/dts/freescale/qoriq-*
		N: imx
		N: mxs

arch/arm/boot/dts/imx7d-smegw01.dts

+2 −1

Original line number	Diff line number	Diff line
		@@ -198,6 +198,7 @@
		&usbotg2 {
		pinctrl-names = "default";
		pinctrl-0 = <&pinctrl_usbotg2>;
		over-current-active-low;
		dr_mode = "host";
		status = "okay";
		};
		@@ -374,7 +375,7 @@

		pinctrl_usbotg2: usbotg2grp {
		fsl,pins = <
		MX7D_PAD_UART3_RTS_B__USB_OTG2_OC 0x04
		MX7D_PAD_UART3_RTS_B__USB_OTG2_OC 0x5c
		>;
		};

arch/arm64/boot/dts/freescale/imx8dxl.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -164,7 +164,7 @@

		sc_pwrkey: keys {
		compatible = "fsl,imx8qxp-sc-key", "fsl,imx-sc-key";
		linux,keycode = <KEY_POWER>;
		linux,keycodes = <KEY_POWER>;
		wakeup-source;
		};

arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc.dts

+1 −0

Original line number	Diff line number	Diff line
		@@ -88,6 +88,7 @@
		pinctrl-names = "default";
		pinctrl-0 = <&pinctrl_watchdog_gpio>;
		compatible = "linux,wdt-gpio";
		always-running;
		gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>;
		hw_algo = "level";
		/* Reset triggers in 2..3 seconds */

arch/arm64/boot/dts/freescale/imx8mm-pinfunc.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -602,7 +602,7 @@
		#define MX8MM_IOMUXC_UART1_RXD_GPIO5_IO22 0x234 0x49C 0x000 0x5 0x0
		#define MX8MM_IOMUXC_UART1_RXD_TPSMP_HDATA24 0x234 0x49C 0x000 0x7 0x0
		#define MX8MM_IOMUXC_UART1_TXD_UART1_DCE_TX 0x238 0x4A0 0x000 0x0 0x0
		#define MX8MM_IOMUXC_UART1_TXD_UART1_DTE_RX 0x238 0x4A0 0x4F4 0x0 0x0
		#define MX8MM_IOMUXC_UART1_TXD_UART1_DTE_RX 0x238 0x4A0 0x4F4 0x0 0x1
		#define MX8MM_IOMUXC_UART1_TXD_ECSPI3_MOSI 0x238 0x4A0 0x000 0x1 0x0
		#define MX8MM_IOMUXC_UART1_TXD_GPIO5_IO23 0x238 0x4A0 0x000 0x5 0x0
		#define MX8MM_IOMUXC_UART1_TXD_TPSMP_HDATA25 0x238 0x4A0 0x000 0x7 0x0