Unverified Commit 2916bf22 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

i.MX fixes for 5.19:

- Correct i.MX7 power domain for HSIC USB PHY node to fix an USB Host
  issue, that is all downstream events will be lost if USB host is
  runtime suspended.
- Fix i.MX8M blk-ctrl LCDIF2 power domain to point to refer to the
  correct clock.
- Correct i.MX6Q/DL PU regulator ramp delay to fix some peripherals
  power-up failure especially when the chip is at a low temperature.
- Fix capacitive touch reset polarity for imx6qdl-colibri board.

* tag 'imx-fixes-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  soc: imx: imx8m-blk-ctrl: fix display clock for LCDIF2 power domain
  ARM: dts: imx6qdl-colibri: Fix capacitive touch reset polarity
  ARM: dts: imx6qdl: correct PU regulator ramp delay
  ARM: dts: imx7: Move hsic_phy power domain to HSIC PHY node

Link: https://lore.kernel.org/r/20220614095515.GU254723@dragon


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents b13baccc 7c7eaeef

arch/arm/boot/dts/imx6qdl-colibri.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -593,7 +593,7 @@ 
		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_atmel_conn>;

		reg = <0x4a>;

		reset-gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>;	/* SODIMM 106 */

		reset-gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;	/* SODIMM 106 */

		status = "disabled";

	};

};

arch/arm/boot/dts/imx6qdl.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -762,7 +762,7 @@ 
					regulator-name = "vddpu";

					regulator-min-microvolt = <725000>;

					regulator-max-microvolt = <1450000>;

					regulator-enable-ramp-delay = <150>;

					regulator-enable-ramp-delay = <380>;

					anatop-reg-offset = <0x140>;

					anatop-vol-bit-shift = <9>;

					anatop-vol-bit-width = <5>;

arch/arm/boot/dts/imx7s.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ 
		compatible = "usb-nop-xceiv";

		clocks = <&clks IMX7D_USB_HSIC_ROOT_CLK>;

		clock-names = "main_clk";

		power-domains = <&pgc_hsic_phy>;

		#phy-cells = <0>;

	};
@@ -1153,7 +1154,6 @@ 
				compatible = "fsl,imx7d-usb", "fsl,imx27-usb";

				reg = <0x30b30000 0x200>;

				interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>;

				power-domains = <&pgc_hsic_phy>;

				clocks = <&clks IMX7D_USB_CTRL_CLK>;

				fsl,usbphy = <&usbphynop3>;

				fsl,usbmisc = <&usbmisc3 0>;

drivers/soc/imx/imx8m-blk-ctrl.c

+1 −1
Original line number Diff line number Diff line
@@ -667,7 +667,7 @@ static const struct imx8m_blk_ctrl_domain_data imx8mp_media_blk_ctl_domain_data[ 
	},

	[IMX8MP_MEDIABLK_PD_LCDIF_2] = {

		.name = "mediablk-lcdif-2",

		.clk_names = (const char *[]){ "disp1", "apb", "axi", },

		.clk_names = (const char *[]){ "disp2", "apb", "axi", },

		.num_clks = 3,

		.gpc_name = "lcdif2",

		.rst_mask = BIT(11) | BIT(12) | BIT(24),