Unverified Commit 48519d64 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

i.MX fixes for 6.6:

- A couple of i.MX8MP device tree changes from Adam Ford to fix clock
  configuration regressions caused by 16c98452 ("arm64: dts: imx8mp:
  don't initialize audio clocks from CCM node").
- Fix pmic-irq-hog GPIO line in imx93-tqma9352 device tree.
- Fix a mmemory leak with error handling path of imx_dsp_setup_channels()
  in imx-dsp driver.
- Fix HDMI node in imx8mm-evk device tree.
- Add missing clock enable functionality for imx8mm_soc_uid() function
  in soc-imx8m driver.
- Add missing imx8mm-prt8mm.dtb build target.

* tag 'imx-fixes-6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  arm64: dts: imx: Add imx8mm-prt8mm.dtb to build
  arm64: dts: imx8mm-evk: Fix hdmi@3d node
  soc: imx8m: Enable OCOTP clock for imx8mm before reading registers
  arm64: dts: imx8mp-beacon-kit: Fix audio_pll2 clock
  arm64: dts: imx8mp: Fix SDMA2/3 clocks
  arm64: dts: freescale: tqma9352: Fix gpio hog
  firmware: imx-dsp: Fix an error handling path in imx_dsp_setup_channels()

Link: https://lore.kernel.org/r/20230926123710.GT7231@dragon


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 3c50ffba f09752ea

arch/arm64/boot/dts/freescale/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ dtb-$(CONFIG_ARCH_MXC) += imx8mm-mx8menlo.dtb 
dtb-$(CONFIG_ARCH_MXC) += imx8mm-nitrogen-r2.dtb

dtb-$(CONFIG_ARCH_MXC) += imx8mm-phg.dtb

dtb-$(CONFIG_ARCH_MXC) += imx8mm-phyboard-polis-rdk.dtb

dtb-$(CONFIG_ARCH_MXC) += imx8mm-prt8mm.dtb

dtb-$(CONFIG_ARCH_MXC) += imx8mm-tqma8mqml-mba8mx.dtb

dtb-$(CONFIG_ARCH_MXC) += imx8mm-var-som-symphony.dtb

dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw71xx-0x.dtb

arch/arm64/boot/dts/freescale/imx8mm-evk.dtsi

+20 −12
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ hdmi-connector { 


		port {

			hdmi_connector_in: endpoint {

				remote-endpoint = <&adv7533_out>;

				remote-endpoint = <&adv7535_out>;

			};

		};

	};
@@ -72,6 +72,13 @@ reg_usdhc2_vmmc: regulator-usdhc2 { 
		enable-active-high;

	};



	reg_vddext_3v3: regulator-vddext-3v3 {

		compatible = "regulator-fixed";

		regulator-name = "VDDEXT_3V3";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

	};



	backlight: backlight {

		compatible = "pwm-backlight";

		pwms = <&pwm1 0 5000000 0>;
@@ -317,15 +324,16 @@ &i2c2 { 


	hdmi@3d {

		compatible = "adi,adv7535";

		reg = <0x3d>, <0x3c>, <0x3e>, <0x3f>;

		reg-names = "main", "cec", "edid", "packet";

		reg = <0x3d>;

		interrupt-parent = <&gpio1>;

		interrupts = <9 IRQ_TYPE_EDGE_FALLING>;

		adi,dsi-lanes = <4>;



		adi,input-depth = <8>;

		adi,input-colorspace = "rgb";

		adi,input-clock = "1x";

		adi,input-style = <1>;

		adi,input-justification = "evenly";

		avdd-supply = <&buck5_reg>;

		dvdd-supply = <&buck5_reg>;

		pvdd-supply = <&buck5_reg>;

		a2vdd-supply = <&buck5_reg>;

		v3p3-supply = <&reg_vddext_3v3>;

		v1p2-supply = <&buck5_reg>;



		ports {

			#address-cells = <1>;
@@ -334,7 +342,7 @@ ports { 
			port@0 {

				reg = <0>;



				adv7533_in: endpoint {

				adv7535_in: endpoint {

					remote-endpoint = <&dsi_out>;

				};

			};
@@ -342,7 +350,7 @@ adv7533_in: endpoint { 
			port@1 {

				reg = <1>;



				adv7533_out: endpoint {

				adv7535_out: endpoint {

					remote-endpoint = <&hdmi_connector_in>;

				};

			};
@@ -448,7 +456,7 @@ port@1 { 
			reg = <1>;



			dsi_out: endpoint {

				remote-endpoint = <&adv7533_in>;

				remote-endpoint = <&adv7535_in>;

				data-lanes = <1 2 3 4>;

			};

		};

arch/arm64/boot/dts/freescale/imx8mp-beacon-kit.dts

+3 −2
Original line number Diff line number Diff line
@@ -381,9 +381,10 @@ &pcie_phy { 
&sai3 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_sai3>;

	assigned-clocks = <&clk IMX8MP_CLK_SAI3>;

	assigned-clocks = <&clk IMX8MP_CLK_SAI3>,

			  <&clk IMX8MP_AUDIO_PLL2> ;

	assigned-clock-parents = <&clk IMX8MP_AUDIO_PLL2_OUT>;

	assigned-clock-rates = <12288000>;

	assigned-clock-rates = <12288000>, <361267200>;

	fsl,sai-mclk-direction-output;

	status = "okay";

};

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

+6 −0
Original line number Diff line number Diff line
@@ -790,6 +790,12 @@ pgc_audio: power-domain@5 { 
						reg = <IMX8MP_POWER_DOMAIN_AUDIOMIX>;

						clocks = <&clk IMX8MP_CLK_AUDIO_ROOT>,

							 <&clk IMX8MP_CLK_AUDIO_AXI>;

						assigned-clocks = <&clk IMX8MP_CLK_AUDIO_AHB>,

								  <&clk IMX8MP_CLK_AUDIO_AXI_SRC>;

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

									  <&clk IMX8MP_SYS_PLL1_800M>;

						assigned-clock-rates = <400000000>,

								       <600000000>;

					};



					pgc_gpu2d: power-domain@6 {

arch/arm64/boot/dts/freescale/imx93-tqma9352.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ flash0: flash@0 { 
&gpio1 {

	pmic-irq-hog {

		gpio-hog;

		gpios = <2 GPIO_ACTIVE_LOW>;

		gpios = <3 GPIO_ACTIVE_LOW>;

		input;

		line-name = "PMIC_IRQ#";

	};