From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 3 Apr 2020 22:05:35 +0000 (-0700)
Subject: Merge tag 'arm-drivers-5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
X-Git-Tag: v5.7-rc1~99
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d18292dc07dbaaacef040a23a5e5e65c6ea61803;p=users%2Fhch%2Fmisc.git

Merge tag 'arm-drivers-5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

Pull ARM driver updates from Arnd Bergmann:
 "These are the usual updates for SoC specific device drivers and
  related subsystems that don't have their own top-level maintainers:

   - ARM SCMI/SCPI updates to allow pluggable transport layers

   - TEE subsystem cleanups

   - A new driver for the Amlogic secure power domain controller

   - Various driver updates for the NXP Layerscape DPAA2, NXP i.MX SCU
     and TI OMAP2+ sysc drivers.

   - Qualcomm SoC driver updates, including a new library module for
     "protection domain" notifications

   - Lots of smaller bugfixes and cleanups in other drivers"

* tag 'arm-drivers-5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (70 commits)
  soc: fsl: qe: fix sparse warnings for ucc_slow.c
  soc: fsl: qe: ucc_slow: remove 0 assignment for kzalloc'ed structure
  soc: fsl: qe: fix sparse warnings for ucc_fast.c
  soc: fsl: qe: fix sparse warnings for qe_ic.c
  soc: fsl: qe: fix sparse warnings for ucc.c
  soc: fsl: qe: fix sparse warning for qe_common.c
  soc: fsl: qe: fix sparse warnings for qe.c
  soc: qcom: Fix QCOM_APR dependencies
  soc: qcom: pdr: Avoid uninitialized use of found in pdr_indication_cb
  soc: imx: drop COMPILE_TEST for IMX_SCU_SOC
  firmware: imx: add COMPILE_TEST for IMX_SCU driver
  soc: imx: gpc: fix power up sequencing
  soc: imx: increase build coverage for imx8m soc driver
  soc: qcom: apr: Add avs/audio tracking functionality
  dt-bindings: soc: qcom: apr: Add protection domain bindings
  soc: qcom: Introduce Protection Domain Restart helpers
  devicetree: bindings: firmware: add ipq806x to qcom_scm
  memory: tegra: Correct debugfs clk rate-range on Tegra124
  memory: tegra: Correct debugfs clk rate-range on Tegra30
  memory: tegra: Correct debugfs clk rate-range on Tegra20
  ...
---

d18292dc07dbaaacef040a23a5e5e65c6ea61803
diff --cc drivers/gpu/drm/omapdrm/dss/omapdss-boot-init.c
index 00372f4ce711,09beda9f5023..72a7da7bfff1
--- a/drivers/gpu/drm/omapdrm/dss/omapdss-boot-init.c
+++ b/drivers/gpu/drm/omapdrm/dss/omapdss-boot-init.c
@@@ -187,16 -207,10 +202,10 @@@ static int __init omapdss_boot_init(voi
  	dss = of_find_matching_node(NULL, omapdss_of_match);
  
  	if (dss == NULL || !of_device_is_available(dss))
 -		return 0;
 +		goto put_node;
  
  	omapdss_walk_device(dss, true);
- 
- 	for_each_available_child_of_node(dss, child) {
- 		if (!of_find_property(child, "compatible", NULL))
- 			continue;
- 
- 		omapdss_walk_device(child, true);
- 	}
+ 	omapdss_find_children(dss);
  
  	while (!list_empty(&dss_conv_list)) {
  		struct dss_conv_node *n;