Commit da60d154 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'soc-fixes-6.13-3' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc 

Pull SoC fixes from Arnd Bergmann:
 "Over the Christmas break a couple of devicetree fixes came in for
  Rockchips, Qualcomm and NXP/i.MX. These add some missing board
  specific properties, address build time warnings,

  The USB/TOG supoprt on X1 Elite regressed, so two earlier DT changes
  get reverted for now.

  Aside from the devicetree fixes, there is One build fix for the stm32
  firewall driver, and a defconfig change to enable SPDIF support for
  i.MX"

* tag 'soc-fixes-6.13-3' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
  firewall: remove misplaced semicolon from stm32_firewall_get_firewall
  arm64: dts: rockchip: add hevc power domain clock to rk3328
  arm64: dts: rockchip: Fix the SD card detection on NanoPi R6C/R6S
  arm64: dts: qcom: sa8775p: fix the secure device bootup issue
  Revert "arm64: dts: qcom: x1e80100: enable OTG on USB-C controllers"
  Revert "arm64: dts: qcom: x1e80100-crd: enable otg on usb ports"
  arm64: dts: qcom: x1e80100: Fix up BAR space size for PCIe6a
  Revert "arm64: dts: qcom: x1e78100-t14s: enable otg on usb-c ports"
  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
  arm64: dts: rockchip: rename rfkill label for Radxa ROCK 5B
  arm64: dts: rockchip: add reset-names for combphy on rk3568
  arm64: dts: qcom: sa8775p: Fix the size of 'addr_space' regions
parents 77a903cd 5391c5d8

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>;