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

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

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

i.MX fixes for 5.7, round 2:

One imx6q-bx50v3 device tree change to fix an issue, attempting atomic
modeset while using HDMI and display port at the same time causes LDB
clock programming to destroy the programming of HDMI.

* tag 'imx-fixes-5.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: dts/imx6q-bx50v3: Set display interface clock parents

Link: https://lore.kernel.org/r/20200521150719.GB24084@dragon


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 1a55b423 665e7c73

arch/arm/boot/dts/imx6q-b450v3.dts

+0 −7
Original line number Diff line number Diff line
@@ -65,13 +65,6 @@ 
	};

};



&clks {

	assigned-clocks = <&clks IMX6QDL_CLK_LDB_DI0_SEL>,

			  <&clks IMX6QDL_CLK_LDB_DI1_SEL>;

	assigned-clock-parents = <&clks IMX6QDL_CLK_PLL3_USB_OTG>,

				 <&clks IMX6QDL_CLK_PLL3_USB_OTG>;

};



&ldb {

	status = "okay";

arch/arm/boot/dts/imx6q-b650v3.dts

+0 −7
Original line number Diff line number Diff line
@@ -65,13 +65,6 @@ 
	};

};



&clks {

	assigned-clocks = <&clks IMX6QDL_CLK_LDB_DI0_SEL>,

			  <&clks IMX6QDL_CLK_LDB_DI1_SEL>;

	assigned-clock-parents = <&clks IMX6QDL_CLK_PLL3_USB_OTG>,

				 <&clks IMX6QDL_CLK_PLL3_USB_OTG>;

};



&ldb {

	status = "okay";

arch/arm/boot/dts/imx6q-b850v3.dts

+0 −11
Original line number Diff line number Diff line
@@ -53,17 +53,6 @@ 
	};

};



&clks {

	assigned-clocks = <&clks IMX6QDL_CLK_LDB_DI0_SEL>,

			  <&clks IMX6QDL_CLK_LDB_DI1_SEL>,

			  <&clks IMX6QDL_CLK_IPU1_DI0_PRE_SEL>,

			  <&clks IMX6QDL_CLK_IPU2_DI0_PRE_SEL>;

	assigned-clock-parents = <&clks IMX6QDL_CLK_PLL5_VIDEO_DIV>,

				 <&clks IMX6QDL_CLK_PLL5_VIDEO_DIV>,

				 <&clks IMX6QDL_CLK_PLL2_PFD2_396M>,

				 <&clks IMX6QDL_CLK_PLL2_PFD2_396M>;

};



&ldb {

	fsl,dual-channel;

	status = "okay";

arch/arm/boot/dts/imx6q-bx50v3.dtsi

+15 −0
Original line number Diff line number Diff line
@@ -377,3 +377,18 @@ 
		#interrupt-cells = <1>;

	};

};



&clks {

	assigned-clocks = <&clks IMX6QDL_CLK_LDB_DI0_SEL>,

			  <&clks IMX6QDL_CLK_LDB_DI1_SEL>,

			  <&clks IMX6QDL_CLK_IPU1_DI0_PRE_SEL>,

			  <&clks IMX6QDL_CLK_IPU1_DI1_PRE_SEL>,

			  <&clks IMX6QDL_CLK_IPU2_DI0_PRE_SEL>,

			  <&clks IMX6QDL_CLK_IPU2_DI1_PRE_SEL>;

	assigned-clock-parents = <&clks IMX6QDL_CLK_PLL5_VIDEO_DIV>,

				 <&clks IMX6QDL_CLK_PLL5_VIDEO_DIV>,

				 <&clks IMX6QDL_CLK_PLL2_PFD0_352M>,

				 <&clks IMX6QDL_CLK_PLL2_PFD0_352M>,

				 <&clks IMX6QDL_CLK_PLL2_PFD0_352M>,

				 <&clks IMX6QDL_CLK_PLL2_PFD0_352M>;

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE