Unverified Commit 83359f6b authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

i.MX fixes for 6.12:

- An imx8qm change from Alexander Stein to fix VPU IRQs
- An imx8 LVDS subsystem change from Diogo Silva to fix clock-output-names
- An imx8ulp change from Haibo Chen to correct flexspi compatible string
- An imx8mp-skov board change from Liu Ying to set correct clock rate
  for media_isp
- An imx8mp-phyboard change from Marek Vasut to correct Video PLL1 frequency
- An imx8mp change from Peng Fan to correct SDHC IPG clock

* tag 'imx-fixes-6.12' of https://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  arm64: dts: imx8mp-phyboard-pollux: Set Video PLL1 frequency to 506.8 MHz
  arm64: dts: imx8mp: correct sdhc ipg clk
  arm64: dts: imx8mp-skov-revb-mi1010ait-1cp1: Assign "media_isp" clock rate
  arm64: dts: imx8: Fix lvds0 device tree
  arm64: dts: imx8ulp: correct the flexspi compatible string
  arm64: dts: imx8-ss-vpu: Fix imx8qm VPU IRQs

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


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 42f7652d 4fbb7341

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

+6 −6
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ qm_lvds0_lis_lpcg: qxp_mipi1_lis_lpcg: clock-controller@56243000 { 
		compatible = "fsl,imx8qxp-lpcg";

		reg = <0x56243000 0x4>;

		#clock-cells = <1>;

		clock-output-names = "mipi1_lis_lpcg_ipg_clk";

		clock-output-names = "lvds0_lis_lpcg_ipg_clk";

		power-domains = <&pd IMX_SC_R_MIPI_1>;

	};
@@ -22,9 +22,9 @@ qm_lvds0_pwm_lpcg: qxp_mipi1_pwm_lpcg: clock-controller@5624300c { 
		compatible = "fsl,imx8qxp-lpcg";

		reg = <0x5624300c 0x4>;

		#clock-cells = <1>;

		clock-output-names = "mipi1_pwm_lpcg_clk",

				     "mipi1_pwm_lpcg_ipg_clk",

				     "mipi1_pwm_lpcg_32k_clk";

		clock-output-names = "lvds0_pwm_lpcg_clk",

				     "lvds0_pwm_lpcg_ipg_clk",

				     "lvds0_pwm_lpcg_32k_clk";

		power-domains = <&pd IMX_SC_R_MIPI_1_PWM_0>;

	};
@@ -32,8 +32,8 @@ qm_lvds0_i2c0_lpcg: qxp_mipi1_i2c0_lpcg: clock-controller@56243010 { 
		compatible = "fsl,imx8qxp-lpcg";

		reg = <0x56243010 0x4>;

		#clock-cells = <1>;

		clock-output-names = "mipi1_i2c0_lpcg_clk",

				     "mipi1_i2c0_lpcg_ipg_clk";

		clock-output-names = "lvds0_i2c0_lpcg_clk",

				     "lvds0_i2c0_lpcg_ipg_clk";

		power-domains = <&pd IMX_SC_R_MIPI_1_I2C_0>;

	};

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

+2 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ vpu: vpu@2c000000 { 
	mu_m0: mailbox@2d000000 {

		compatible = "fsl,imx6sx-mu";

		reg = <0x2d000000 0x20000>;

		interrupts = <GIC_SPI 469 IRQ_TYPE_LEVEL_HIGH>;

		interrupts = <GIC_SPI 472 IRQ_TYPE_LEVEL_HIGH>;

		#mbox-cells = <2>;

		power-domains = <&pd IMX_SC_R_VPU_MU_0>;

		status = "disabled";
@@ -24,7 +24,7 @@ mu_m0: mailbox@2d000000 { 
	mu1_m0: mailbox@2d020000 {

		compatible = "fsl,imx6sx-mu";

		reg = <0x2d020000 0x20000>;

		interrupts = <GIC_SPI 470 IRQ_TYPE_LEVEL_HIGH>;

		interrupts = <GIC_SPI 473 IRQ_TYPE_LEVEL_HIGH>;

		#mbox-cells = <2>;

		power-domains = <&pd IMX_SC_R_VPU_MU_1>;

		status = "disabled";

arch/arm64/boot/dts/freescale/imx8mp-phyboard-pollux-rdk.dts

+12 −0
Original line number Diff line number Diff line
@@ -218,6 +218,18 @@ ldb_lvds_ch1: endpoint { 
	};

};



&media_blk_ctrl {

	/*

	 * The LVDS panel on this device uses 72.4 MHz pixel clock,

	 * set IMX8MP_VIDEO_PLL1 to 72.4 * 7 = 506.8 MHz so the LDB

	 * serializer and LCDIFv3 scanout engine can reach accurate

	 * pixel clock of exactly 72.4 MHz.

	 */

	assigned-clock-rates = <500000000>, <200000000>,

			       <0>, <0>, <500000000>,

			       <506800000>;

};



&snvs_pwrkey {

	status = "okay";

};

arch/arm64/boot/dts/freescale/imx8mp-skov-revb-mi1010ait-1cp1.dts

+1 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ &media_blk_ctrl { 
	assigned-clock-rates = <500000000>, <200000000>, <0>,

		/* IMX8MP_CLK_MEDIA_DISP2_PIX = pixelclk of lvds panel */

		<68900000>,

		<500000000>,

		/* IMX8MP_VIDEO_PLL1 = IMX8MP_CLK_MEDIA_LDB * 2 */

		<964600000>;

};

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

+3 −3
Original line number Diff line number Diff line
@@ -1261,7 +1261,7 @@ usdhc1: mmc@30b40000 { 
				compatible = "fsl,imx8mp-usdhc", "fsl,imx8mm-usdhc", "fsl,imx7d-usdhc";

				reg = <0x30b40000 0x10000>;

				interrupts = <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&clk IMX8MP_CLK_DUMMY>,

				clocks = <&clk IMX8MP_CLK_IPG_ROOT>,

					 <&clk IMX8MP_CLK_NAND_USDHC_BUS>,

					 <&clk IMX8MP_CLK_USDHC1_ROOT>;

				clock-names = "ipg", "ahb", "per";
@@ -1275,7 +1275,7 @@ usdhc2: mmc@30b50000 { 
				compatible = "fsl,imx8mp-usdhc", "fsl,imx8mm-usdhc", "fsl,imx7d-usdhc";

				reg = <0x30b50000 0x10000>;

				interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&clk IMX8MP_CLK_DUMMY>,

				clocks = <&clk IMX8MP_CLK_IPG_ROOT>,

					 <&clk IMX8MP_CLK_NAND_USDHC_BUS>,

					 <&clk IMX8MP_CLK_USDHC2_ROOT>;

				clock-names = "ipg", "ahb", "per";
@@ -1289,7 +1289,7 @@ usdhc3: mmc@30b60000 { 
				compatible = "fsl,imx8mp-usdhc", "fsl,imx8mm-usdhc", "fsl,imx7d-usdhc";

				reg = <0x30b60000 0x10000>;

				interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&clk IMX8MP_CLK_DUMMY>,

				clocks = <&clk IMX8MP_CLK_IPG_ROOT>,

					 <&clk IMX8MP_CLK_NAND_USDHC_BUS>,

					 <&clk IMX8MP_CLK_USDHC3_ROOT>;

				clock-names = "ipg", "ahb", "per";