Unverified Commit 00f63a0f authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

i.MX fixes for 6.13:

- Add fallback for i.MX8QM ESAI compatible to fix a dt-schema warning
  caused by bindings update
- Fix uSDHC1 clock for i.MX RT1050
- Enable SND_SOC_SPDIF in imx_v6_v7_defconfig to fix a regression caused
  by an i.MX6 SPDIF sound card change in DT
- Fix address length of i.MX95 netcmix_blk_ctrl

* tag 'imx-fixes-6.13' of https://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: dts: imxrt1050: Fix clocks for mmc
  ARM: imx_v6_v7_defconfig: enable SND_SOC_SPDIF
  arm64: dts: imx95: correct the address length of netcmix_blk_ctrl
  arm64: dts: imx8-ss-audio: add fallback compatible string fsl,imx6ull-esai for esai

Link: https://lore.kernel.org/r/Z3Jf9zbv/xH3YzuB@dragon


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 627522c8 5f122030

arch/arm/boot/dts/nxp/imx/imxrt1050.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ usdhc1: mmc@402c0000 { 
			reg = <0x402c0000 0x4000>;

			interrupts = <110>;

			clocks = <&clks IMXRT1050_CLK_IPG_PDOF>,

				<&clks IMXRT1050_CLK_OSC>,

				<&clks IMXRT1050_CLK_AHB_PODF>,

				<&clks IMXRT1050_CLK_USDHC1>;

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

			bus-width = <4>;

arch/arm/configs/imx_v6_v7_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -323,6 +323,7 @@ CONFIG_SND_SOC_IMX_SGTL5000=y 
CONFIG_SND_SOC_FSL_ASOC_CARD=y

CONFIG_SND_SOC_AC97_CODEC=y

CONFIG_SND_SOC_CS42XX8_I2C=y

CONFIG_SND_SOC_SPDIF=y

CONFIG_SND_SOC_TLV320AIC3X_I2C=y

CONFIG_SND_SOC_WM8960=y

CONFIG_SND_SOC_WM8962=y

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

+1 −1
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ asrc0: asrc@59000000 { 
	};



	esai0: esai@59010000 {

		compatible = "fsl,imx8qm-esai";

		compatible = "fsl,imx8qm-esai", "fsl,imx6ull-esai";

		reg = <0x59010000 0x10000>;

		interrupts = <GIC_SPI 409 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&esai0_lpcg IMX_LPCG_CLK_4>,

arch/arm64/boot/dts/freescale/imx8qm-ss-audio.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ sai5_lpcg: clock-controller@59490000 { 
	};



	esai1: esai@59810000 {

		compatible = "fsl,imx8qm-esai";

		compatible = "fsl,imx8qm-esai", "fsl,imx6ull-esai";

		reg = <0x59810000 0x10000>;

		interrupts = <GIC_SPI 411 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&esai1_lpcg IMX_LPCG_CLK_0>,

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

+1 −1
Original line number Diff line number Diff line
@@ -1673,7 +1673,7 @@ pcie1_ep: pcie-ep@4c380000 { 


		netcmix_blk_ctrl: syscon@4c810000 {

			compatible = "nxp,imx95-netcmix-blk-ctrl", "syscon";

			reg = <0x0 0x4c810000 0x0 0x10000>;

			reg = <0x0 0x4c810000 0x0 0x8>;

			#clock-cells = <1>;

			clocks = <&scmi_clk IMX95_CLK_BUSNETCMIX>;

			assigned-clocks = <&scmi_clk IMX95_CLK_BUSNETCMIX>;