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

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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

Linus Torvalds 7 years ago c027c7cf e7c42a89

+5 -3

3 changed files

expand all

arch

arm

boot

dts

gemini-dlink-dir-685.dts

arm64

boot

dts

qcom

msm8998.dtsi

drivers

tee

optee

core.c

+1 -1

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

··· 443 443 }; 444 444 445 445 display-controller@6a000000 { 446 - status = "disabled"; 446 + status = "okay"; 447 447 448 448 port@0 { 449 449 reg = <0>;

+1 -1

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

··· 37 37 }; 38 38 39 39 memory@86200000 { 40 - reg = <0x0 0x86200000 0x0 0x2600000>; 40 + reg = <0x0 0x86200000 0x0 0x2d00000>; 41 41 no-map; 42 42 }; 43 43

+3 -1

drivers/tee/optee/core.c

··· 699 699 return -ENODEV; 700 700 701 701 np = of_find_matching_node(fw_np, optee_match); 702 - if (!np || !of_device_is_available(np)) 702 + if (!np || !of_device_is_available(np)) { 703 + of_node_put(np); 703 704 return -ENODEV; 705 + } 704 706 705 707 optee = optee_probe(np); 706 708 of_node_put(np);

Configure Feed

Configure Feed