Unverified Commit 0d6a10dc authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

i.MX fixes for 6.1, 2nd round:

- Switch to usb-role-switch for fixing USB device mode on
  tqma8mqml-mba8mx board, so that Dual Role is fully functional.
- A series from Marek Vasut to fix dt-schema warning caused by NAND
  controller size-cells.
- Fix file permission of imx93-pinfunc header.
- Enable OCOTP clock in soc-imx8m driver to fix a kexec kernel hang
  issue.

* tag 'imx-fixes-6.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  soc: imx8m: Enable OCOTP clock before reading the register
  arm64: dts: imx93-pinfunc: drop execution permission
  arm64: dts: imx8mn: Fix NAND controller size-cells
  arm64: dts: imx8mm: Fix NAND controller size-cells
  ARM: dts: imx7: Fix NAND controller size-cells
  arm64: dts: imx8mm-tqma8mqml-mba8mx: Fix USB DR

Link: https://lore.kernel.org/r/20221116090402.GA1274@T480


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents f9084ecb 836fb309

arch/arm/boot/dts/imx7s.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -1273,7 +1273,7 @@ 
		gpmi: nand-controller@33002000 {

			compatible = "fsl,imx7d-gpmi-nand";

			#address-cells = <1>;

			#size-cells = <1>;

			#size-cells = <0>;

			reg = <0x33002000 0x2000>, <0x33004000 0x4000>;

			reg-names = "gpmi-nand", "bch";

			interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;

arch/arm64/boot/dts/freescale/imx8mm-tqma8mqml-mba8mx.dts

+26 −6
Original line number Diff line number Diff line
@@ -34,11 +34,25 @@ 
		off-on-delay-us = <12000>;

	};



	extcon_usbotg1: extcon-usbotg1 {

		compatible = "linux,extcon-usb-gpio";

	connector {

		compatible = "gpio-usb-b-connector", "usb-b-connector";

		type = "micro";

		label = "X19";

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_usb1_extcon>;

		id-gpio = <&gpio1 10 GPIO_ACTIVE_HIGH>;

		pinctrl-0 = <&pinctrl_usb1_connector>;

		id-gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;



		ports {

			#address-cells = <1>;

			#size-cells = <0>;



			port@0 {

				reg = <0>;

				usb_dr_connector: endpoint {

					remote-endpoint = <&usb1_drd_sw>;

				};

			};

		};

	};

};
@@ -105,13 +119,19 @@ 
	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_usbotg1>;

	dr_mode = "otg";

	extcon = <&extcon_usbotg1>;

	srp-disable;

	hnp-disable;

	adp-disable;

	power-active-high;

	over-current-active-low;

	usb-role-switch;

	status = "okay";



	port {

		usb1_drd_sw: endpoint {

			remote-endpoint = <&usb_dr_connector>;

		};

	};

};



&usbotg2 {
@@ -231,7 +251,7 @@ 
			   <MX8MM_IOMUXC_GPIO1_IO13_USB1_OTG_OC		0x84>;

	};



	pinctrl_usb1_extcon: usb1-extcongrp {

	pinctrl_usb1_connector: usb1-connectorgrp {

		fsl,pins = <MX8MM_IOMUXC_GPIO1_IO10_GPIO1_IO10		0x1c0>;

	};

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

+2 −2
Original line number Diff line number Diff line
@@ -1247,7 +1247,7 @@ 
		gpmi: nand-controller@33002000 {

			compatible = "fsl,imx8mm-gpmi-nand", "fsl,imx7d-gpmi-nand";

			#address-cells = <1>;

			#size-cells = <1>;

			#size-cells = <0>;

			reg = <0x33002000 0x2000>, <0x33004000 0x4000>;

			reg-names = "gpmi-nand", "bch";

			interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;

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

+1 −1
Original line number Diff line number Diff line
@@ -1102,7 +1102,7 @@ 
		gpmi: nand-controller@33002000 {

			compatible = "fsl,imx8mn-gpmi-nand", "fsl,imx7d-gpmi-nand";

			#address-cells = <1>;

			#size-cells = <1>;

			#size-cells = <0>;

			reg = <0x33002000 0x2000>, <0x33004000 0x4000>;

			reg-names = "gpmi-nand", "bch";

			interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;

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

100755 → 100644
+0 −0

File mode changed from 100755 to 100644.

View file