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

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

Pull ARM SoC fixes from Arnd Bergmann:
 "This is my last set of fixes for 5.16, including

   - multiple code fixes for the op-tee firmware driver

   - Two patches for allwinner SoCs, one fixing the phy mode on a board,
     the other one fixing a driver bug in the "RSB" bus driver. This was
     originally targeted for 5.17, but seemed worth moving to 5.16

   - Two small fixes for devicetree files on i.MX platforms, resolving
     problems with ethernet and i2c"

* tag 'arm-fixes-5.16-4' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
  optee: Suppress false positive kmemleak report in optee_handle_rpc()
  tee: optee: Fix incorrect page free bug
  arm64: dts: lx2160a: fix scl-gpios property name
  tee: handle lookup of shm with reference count 0
  ARM: dts: imx6qdl-wandboard: Fix Ethernet support
  bus: sunxi-rsb: Fix shutdown
  arm64: dts: allwinner: orangepi-zero-plus: fix PHY mode
parents bc491fb1 7ad8b2fc

arch/arm/boot/dts/imx6qdl-wandboard.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -309,6 +309,7 @@ 


		ethphy: ethernet-phy@1 {

			reg = <1>;

			qca,clk-out-frequency = <125000000>;

		};

	};

};

arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus.dts

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ 
	pinctrl-0 = <&emac_rgmii_pins>;

	phy-supply = <&reg_gmac_3v3>;

	phy-handle = <&ext_rgmii_phy>;

	phy-mode = "rgmii";

	phy-mode = "rgmii-id";

	status = "okay";

};

arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -719,7 +719,7 @@ 
			clock-names = "i2c";

			clocks = <&clockgen QORIQ_CLK_PLATFORM_PLL

					    QORIQ_CLK_PLL_DIV(16)>;

			scl-gpio = <&gpio2 15 GPIO_ACTIVE_HIGH>;

			scl-gpios = <&gpio2 15 GPIO_ACTIVE_HIGH>;

			status = "disabled";

		};
@@ -768,7 +768,7 @@ 
			clock-names = "i2c";

			clocks = <&clockgen QORIQ_CLK_PLATFORM_PLL

					    QORIQ_CLK_PLL_DIV(16)>;

			scl-gpio = <&gpio2 16 GPIO_ACTIVE_HIGH>;

			scl-gpios = <&gpio2 16 GPIO_ACTIVE_HIGH>;

			status = "disabled";

		};

drivers/bus/sunxi-rsb.c

+4 −4
Original line number Diff line number Diff line
@@ -687,10 +687,10 @@ static int sunxi_rsb_hw_init(struct sunxi_rsb *rsb) 


static void sunxi_rsb_hw_exit(struct sunxi_rsb *rsb)

{

	/* Keep the clock and PM reference counts consistent. */

	if (pm_runtime_status_suspended(rsb->dev))

		pm_runtime_resume(rsb->dev);

	reset_control_assert(rsb->rstc);



	/* Keep the clock and PM reference counts consistent. */

	if (!pm_runtime_status_suspended(rsb->dev))

		clk_disable_unprepare(rsb->clk);

}

drivers/tee/optee/core.c

+2 −4
Original line number Diff line number Diff line
@@ -48,10 +48,8 @@ int optee_pool_op_alloc_helper(struct tee_shm_pool_mgr *poolm, 
			goto err;

		}



		for (i = 0; i < nr_pages; i++) {

			pages[i] = page;

			page++;

		}

		for (i = 0; i < nr_pages; i++)

			pages[i] = page + i;



		shm->flags |= TEE_SHM_REGISTER;

		rc = shm_register(shm->ctx, shm, pages, nr_pages,