Unverified Commit 7e685383 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

Merge tag 'imx-fixes-6.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into for-next

i.MX fixes for 6.9, round 2:

- Fix i.MX8MP the second CSI2 assigned-clock property which got wrong by
  commit f78835d1 ("arm64: dts: imx8mp: reparent MEDIA_MIPI_PHY1_REF
  to CLK_24M")
- Correct USB over-current polarity for imx6ull-tarragon board

* tag 'imx-fixes-6.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: dts: imx6ull-tarragon: fix USB over-current polarity
  arm64: dts: imx8mp: Fix assigned-clocks for second CSI2

Link: https://lore.kernel.org/r/ZioopqscxwUOwQkf@dragon


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 9e0794ae d7f3040a

arch/arm/boot/dts/nxp/imx/imx6ull-tarragon-common.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -805,6 +805,7 @@ &usbotg1 { 
		     &pinctrl_usb_pwr>;

	dr_mode = "host";

	power-active-high;

	over-current-active-low;

	disable-over-current;

	status = "okay";

};

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

+1 −1
Original line number Diff line number Diff line
@@ -1672,7 +1672,7 @@ mipi_csi_1: csi@32e50000 { 
					 <&clk IMX8MP_CLK_MEDIA_MIPI_PHY1_REF_ROOT>,

					 <&clk IMX8MP_CLK_MEDIA_AXI_ROOT>;

				clock-names = "pclk", "wrap", "phy", "axi";

				assigned-clocks = <&clk IMX8MP_CLK_MEDIA_CAM1_PIX>,

				assigned-clocks = <&clk IMX8MP_CLK_MEDIA_CAM2_PIX>,

						  <&clk IMX8MP_CLK_MEDIA_MIPI_PHY1_REF>;

				assigned-clock-parents = <&clk IMX8MP_SYS_PLL2_1000M>,

							 <&clk IMX8MP_CLK_24M>;