Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc (c027c7cf) · Commits · 戴 / test

Pull ARM SoC fixes from Arnd Bergmann: "One more set of simple ARM platform fixes: - A boot regression on qualcomm msm8998 - Gemini display controllers got turned off by accident - incorrect reference counting in optee" * tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: tee: optee: add missing of_node_put after of_device_is_available arm64: dts: qcom: msm8998: Extend TZ reserved memory area ARM: dts: gemini: Re-enable display controller

arch/arm/boot/dts/gemini-dlink-dir-685.dts

+1 −1

Original line number	Diff line number	Diff line
		@@ -443,7 +443,7 @@
		};

		display-controller@6a000000 {
		status = "disabled";
		status = "okay";

		port@0 {
		reg = <0>;

arch/arm64/boot/dts/qcom/msm8998.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -37,7 +37,7 @@
		};

		memory@86200000 {
		reg = <0x0 0x86200000 0x0 0x2600000>;
		reg = <0x0 0x86200000 0x0 0x2d00000>;
		no-map;
		};

drivers/tee/optee/core.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -699,8 +699,10 @@ static int __init optee_driver_init(void)
		return -ENODEV;

		np = of_find_matching_node(fw_np, optee_match);
		if (!np \|\| !of_device_is_available(np))
		if (!np \|\| !of_device_is_available(np)) {
		of_node_put(np);
		return -ENODEV;
		}

		optee = optee_probe(np);
		of_node_put(np);

Admin message