Commit f4f012b0 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

i.MX fixes for 6.18:

- Enable ext4 support explicitly in imx_v6_v7_defconfig to fix a regression
  caused by commit d6ace46c ("ext4: remove obsolete EXT3 config options")
- Correct report-rate-hz setting for imx6ull-engicam-microgea-rmm board
- Fix MSI mapping for i.MX95 PCIe endpoint device nodes
- Fix USB OTG role switching for imx8mp-kontron board
- Fix a dt-schema warning caused by audmux node for imx51-zii-rdu1 board
- Avoid gpio0_mipi_csi GPIOs being deferred for i.MX8 img subsystem

* tag 'imx-fixes-6.18' of https://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux

:
  arm64: dts: imx8mp-kontron: Fix USB OTG role switching
  arm64: dts: imx95: Fix MSI mapping for PCIe endpoint nodes
  arm64: dts: imx8-ss-img: Avoid gpio0_mipi_csi GPIOs being deferred
  arm: imx_v6_v7_defconfig: enable ext4 directly
  ARM: dts: imx51-zii-rdu1: Fix audmux node names
  ARM: dts: imx6ull-engicam-microgea-rmm: fix report-rate-hz value

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents ec0ca4be 65042978

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

+2 −2
Original line number Diff line number Diff line
@@ -259,7 +259,7 @@ &audmux { 
	pinctrl-0 = <&pinctrl_audmux>;

	status = "okay";



	ssi2 {

	mux-ssi2 {

		fsl,audmux-port = <1>;

		fsl,port-config = <

			(IMX_AUDMUX_V2_PTCR_SYN |
@@ -271,7 +271,7 @@ IMX_AUDMUX_V2_PDCR_RXDSEL(2) 
		>;

	};



	aud3 {

	mux-aud3 {

		fsl,audmux-port = <2>;

		fsl,port-config = <

			IMX_AUDMUX_V2_PTCR_SYN

arch/arm/boot/dts/nxp/imx/imx6ull-engicam-microgea-rmm.dts

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ touchscreen: touchscreen@38 { 
		interrupt-parent = <&gpio2>;

		interrupts = <8 IRQ_TYPE_EDGE_FALLING>;

		reset-gpios = <&gpio2 14 GPIO_ACTIVE_LOW>;

		report-rate-hz = <6>;

		report-rate-hz = <60>;

		/* settings valid only for Hycon touchscreen */

		touchscreen-size-x = <1280>;

		touchscreen-size-y = <800>;

arch/arm64/boot/dts/freescale/imx8-ss-img.dtsi

+0 −2
Original line number Diff line number Diff line
@@ -67,7 +67,6 @@ irqsteer_csi0: irqsteer@58220000 { 
		power-domains = <&pd IMX_SC_R_CSI_0>;

		fsl,channel = <0>;

		fsl,num-irqs = <32>;

		status = "disabled";

	};



	gpio0_mipi_csi0: gpio@58222000 {
@@ -144,7 +143,6 @@ irqsteer_csi1: irqsteer@58240000 { 
		power-domains = <&pd IMX_SC_R_CSI_1>;

		fsl,channel = <0>;

		fsl,num-irqs = <32>;

		status = "disabled";

	};



	gpio0_mipi_csi1: gpio@58242000 {

arch/arm64/boot/dts/freescale/imx8mp-kontron-bl-osm-s.dts

+19 −5
Original line number Diff line number Diff line
@@ -16,11 +16,20 @@ aliases { 
		ethernet1 = &eqos;

	};



	extcon_usbc: usbc {

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

	connector {

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

		id-gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;

		label = "Type-C";

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_usb1_id>;

		id-gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;

		type = "micro";

		vbus-supply = <&reg_usb1_vbus>;



		port {

			usb_dr_connector: endpoint {

				remote-endpoint = <&usb3_dwc>;

			};

		};

	};



	leds {
@@ -244,9 +253,15 @@ &usb_dwc3_0 { 
	hnp-disable;

	srp-disable;

	dr_mode = "otg";

	extcon = <&extcon_usbc>;

	usb-role-switch;

	role-switch-default-mode = "peripheral";

	status = "okay";



	port {

		usb3_dwc: endpoint {

			remote-endpoint = <&usb_dr_connector>;

		};

	};

};



&usb_dwc3_1 {
@@ -273,7 +288,6 @@ &usb3_1 { 
};



&usb3_phy0 {

	vbus-supply = <&reg_usb1_vbus>;

	status = "okay";

};

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

+2 −1
Original line number Diff line number Diff line
@@ -1886,7 +1886,7 @@ pcie0_ep: pcie-ep@4c300000 { 
			assigned-clock-rates = <3600000000>, <100000000>, <10000000>;

			assigned-clock-parents = <0>, <0>,

						 <&scmi_clk IMX95_CLK_SYSPLL1_PFD1_DIV2>;

			msi-map = <0x0 &its 0x98 0x1>;

			msi-map = <0x0 &its 0x10 0x1>;

			power-domains = <&scmi_devpd IMX95_PD_HSIO_TOP>;

			status = "disabled";

		};
@@ -1963,6 +1963,7 @@ pcie1_ep: pcie-ep@4c380000 { 
			assigned-clock-rates = <3600000000>, <100000000>, <10000000>;

			assigned-clock-parents = <0>, <0>,

						 <&scmi_clk IMX95_CLK_SYSPLL1_PFD1_DIV2>;

			msi-map = <0x0 &its 0x98 0x1>;

			power-domains = <&scmi_devpd IMX95_PD_HSIO_TOP>;

			status = "disabled";

		};