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

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

Pull SoC fixes from Arnd Bergmann:
 "A couple of fixes for firmware drivers have come up, addressing kernel
  side bugs in op-tee and ff-a code, as well as compatibility issues
  with exynos-acpm and ff-a protocols.

  The only devicetree fixes are for the Apple platform, addressing
  issues with conformance to the bindings for the wlan, spi and mipi
  nodes"

* tag 'soc-fixes-6.16' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
  arm64: dts: apple: Move touchbar mipi {address,size}-cells from dtsi to dts
  arm64: dts: apple: Drop {address,size}-cells from SPI NOR
  arm64: dts: apple: t8103: Fix PCIe BCM4377 nodename
  optee: ffa: fix sleep in atomic context
  firmware: exynos-acpm: fix timeouts on xfers handling
  arm64: defconfig: update renamed PHY_SNPS_EUSB2
  firmware: arm_ffa: Fix the missing entry in struct ffa_indirect_msg_hdr
  firmware: arm_ffa: Replace mutex with rwlock to avoid sleep in atomic context
  firmware: arm_ffa: Move memory allocation outside the mutex locking
  firmware: arm_ffa: Fix memory leak by freeing notifier callback node
parents c435a4f4 3f3fb973

arch/arm64/boot/dts/apple/spi1-nvram.dtsi

+0 −2
Original line number Diff line number Diff line
@@ -20,8 +20,6 @@ flash@0 { 
		compatible = "jedec,spi-nor";

		reg = <0x0>;

		spi-max-frequency = <25000000>;

		#address-cells = <1>;

		#size-cells = <1>;



		partitions {

			compatible = "fixed-partitions";

arch/arm64/boot/dts/apple/t8103-j293.dts

+2 −0
Original line number Diff line number Diff line
@@ -100,6 +100,8 @@ dfr_mipi_out_panel: endpoint@0 { 


&displaydfr_mipi {

	status = "okay";

	#address-cells = <1>;

	#size-cells = <0>;



	dfr_panel: panel@0 {

		compatible = "apple,j293-summit", "apple,summit";

arch/arm64/boot/dts/apple/t8103-jxxx.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ hpm1: usb-pd@3f { 
 */

&port00 {

	bus-range = <1 1>;

	wifi0: network@0,0 {

	wifi0: wifi@0,0 {

		compatible = "pci14e4,4425";

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

		/* To be filled by the loader */

arch/arm64/boot/dts/apple/t8103.dtsi

+0 −2
Original line number Diff line number Diff line
@@ -405,8 +405,6 @@ displaydfr_mipi: dsi@228600000 { 
			compatible = "apple,t8103-display-pipe-mipi", "apple,h7-display-pipe-mipi";

			reg = <0x2 0x28600000 0x0 0x100000>;

			power-domains = <&ps_mipi_dsi>;

			#address-cells = <1>;

			#size-cells = <0>;

			status = "disabled";



			ports {

arch/arm64/boot/dts/apple/t8112-j493.dts

+2 −0
Original line number Diff line number Diff line
@@ -63,6 +63,8 @@ dfr_mipi_out_panel: endpoint@0 { 


&displaydfr_mipi {

	status = "okay";

	#address-cells = <1>;

	#size-cells = <0>;



	dfr_panel: panel@0 {

		compatible = "apple,j493-summit", "apple,summit";