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

Pull ARM SoC driver updates from Arnd Bergmann:
 "A number of new drivers get added this time, along with many
  low-priority bugfixes. The most interesting changes by subsystem are:

  bus drivers:
   - Updates to the Broadcom bus interface driver to support newer SoC
     types
   - The TI OMAP sysc driver now supports updated DT bindings

  memory controllers:
   - A new driver for Tegra186 gets added
   - A new driver for the ti-emif sram, to allow relocating
     suspend/resume handlers there

  SoC specific:
   - A new driver for Qualcomm QMI, the interface to the modem on MSM
     SoCs
   - A new driver for power domains on the actions S700 SoC
   - A driver for the Xilinx Zynq VCU logicoreIP

  reset controllers:
   - A new driver for Amlogic Meson-AGX
   - various bug fixes

  tee subsystem:
   - A new user interface got added to enable asynchronous communication
     with the TEE supplicant.
   - A new method of using user space memory for communication with the
     TEE is added"

* tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (84 commits)
  of: platform: fix OF node refcount leak
  soc: fsl: guts: Add a NULL check for devm_kasprintf()
  bus: ti-sysc: Fix smartreflex sysc mask
  psci: add CPU_IDLE dependency
  soc: xilinx: Fix Kconfig alignment
  soc: xilinx: xlnx_vcu: Use bitwise & rather than logical && on clkoutdiv
  soc: xilinx: xlnx_vcu: Depends on HAS_IOMEM for xlnx_vcu
  soc: bcm: brcmstb: Be multi-platform compatible
  soc: brcmstb: biuctrl: exit without warning on non brcmstb platforms
  Revert "soc: brcmstb: Only register SoC device on STB platforms"
  bus: omap: add MODULE_LICENSE tags
  soc: brcmstb: Only register SoC device on STB platforms
  tee: shm: Potential NULL dereference calling tee_shm_register()
  soc: xilinx: xlnx_vcu: Add Xilinx ZYNQMP VCU logicoreIP init driver
  dt-bindings: soc: xilinx: Add DT bindings to xlnx_vcu driver
  soc: xilinx: Create folder structure for soc specific drivers
  of: platform: populate /firmware/ node from of_platform_default_populate_init()
  soc: samsung: Add SPDX license identifiers
  soc: qcom: smp2p: Use common error handling code in qcom_smp2p_probe()
  tee: shm: don't put_page on null shm->pages
  ...

diff --cc arch/arm/boot/dts/dra7.dtsi
index daa37a8,5d3c937..e4a420f
--- 1/arch/arm/boot/dts/dra7.dtsi
--- 2/arch/arm/boot/dts/dra7.dtsi
+++ b/arch/arm/boot/dts/dra7.dtsi
@@@ -1523,17 -1498,11 +1523,17 @@@
                };
  
                target-module@4a0dd000 {
-                       compatible = "ti,sysc-omap4-sr";
+                       compatible = "ti,sysc-omap4-sr", "ti,sysc";
                        ti,hwmods = "smartreflex_core";
 -                      reg = <0x4a0dd000 0x4>,
 -                            <0x4a0dd008 0x4>;
 -                      reg-names = "rev", "sysc";
 +                      reg = <0x4a0dd038 0x4>;
 +                      reg-names = "sysc";
 +                      ti,sysc-mask = <SYSC_OMAP3_SR_ENAWAKEUP>;
 +                      ti,sysc-sidle = <SYSC_IDLE_FORCE>,
 +                                      <SYSC_IDLE_NO>,
 +                                      <SYSC_IDLE_SMART>,
 +                                      <SYSC_IDLE_SMART_WKUP>;
 +                      clocks = <&coreaon_clkctrl DRA7_SMARTREFLEX_CORE_CLKCTRL 0>;
 +                      clock-names = "fck";
                        #address-cells = <1>;
                        #size-cells = <1>;
                        ranges = <0 0x4a0dd000 0x001000>;
@@@ -1542,17 -1511,11 +1542,17 @@@
                };
  
                target-module@4a0d9000 {
-                       compatible = "ti,sysc-omap4-sr";
+                       compatible = "ti,sysc-omap4-sr", "ti,sysc";
                        ti,hwmods = "smartreflex_mpu";
 -                      reg = <0x4a0d9000 0x4>,
 -                            <0x4a0d9008 0x4>;
 -                      reg-names = "rev", "sysc";
 +                      reg = <0x4a0d9038 0x4>;
 +                      reg-names = "sysc";
 +                      ti,sysc-mask = <SYSC_OMAP3_SR_ENAWAKEUP>;
 +                      ti,sysc-sidle = <SYSC_IDLE_FORCE>,
 +                                      <SYSC_IDLE_NO>,
 +                                      <SYSC_IDLE_SMART>,
 +                                      <SYSC_IDLE_SMART_WKUP>;
 +                      clocks = <&coreaon_clkctrl DRA7_SMARTREFLEX_MPU_CLKCTRL 0>;
 +                      clock-names = "fck";
                        #address-cells = <1>;
                        #size-cells = <1>;
                        ranges = <0 0x4a0d9000 0x001000>;

diff --cc arch/arm/boot/dts/omap4.dtsi
index 2485496,60244b7..4759048
--- 1/arch/arm/boot/dts/omap4.dtsi
--- 2/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@@ -475,17 -456,11 +475,17 @@@
                };
  
                target-module@4a0db000 {
-                       compatible = "ti,sysc-sr";
+                       compatible = "ti,sysc-omap4-sr", "ti,sysc";
                        ti,hwmods = "smartreflex_iva";
 -                      reg = <0x4a0db000 0x4>,
 -                            <0x4a0db008 0x4>;
 -                      reg-names = "rev", "sysc";
 +                      reg = <0x4a0db038 0x4>;
 +                      reg-names = "sysc";
 +                      ti,sysc-mask = <SYSC_OMAP3_SR_ENAWAKEUP>;
 +                      ti,sysc-sidle = <SYSC_IDLE_FORCE>,
 +                                      <SYSC_IDLE_NO>,
 +                                      <SYSC_IDLE_SMART>,
 +                                      <SYSC_IDLE_SMART_WKUP>;
 +                      clocks = <&l4_ao_clkctrl OMAP4_SMARTREFLEX_IVA_CLKCTRL 0>;
 +                      clock-names = "fck";
                        #address-cells = <1>;
                        #size-cells = <1>;
                        ranges = <0 0x4a0db000 0x001000>;
@@@ -498,17 -473,11 +498,17 @@@
                };
  
                target-module@4a0dd000 {
-                       compatible = "ti,sysc-sr";
+                       compatible = "ti,sysc-omap4-sr", "ti,sysc";
                        ti,hwmods = "smartreflex_core";
 -                      reg = <0x4a0dd000 0x4>,
 -                            <0x4a0dd008 0x4>;
 -                      reg-names = "rev", "sysc";
 +                      reg = <0x4a0dd038 0x4>;
 +                      reg-names = "sysc";
 +                      ti,sysc-mask = <SYSC_OMAP3_SR_ENAWAKEUP>;
 +                      ti,sysc-sidle = <SYSC_IDLE_FORCE>,
 +                                      <SYSC_IDLE_NO>,
 +                                      <SYSC_IDLE_SMART>,
 +                                      <SYSC_IDLE_SMART_WKUP>;
 +                      clocks = <&l4_ao_clkctrl OMAP4_SMARTREFLEX_CORE_CLKCTRL 0>;
 +                      clock-names = "fck";
                        #address-cells = <1>;
                        #size-cells = <1>;
                        ranges = <0 0x4a0dd000 0x001000>;
@@@ -521,17 -490,11 +521,17 @@@
                };
  
                target-module@4a0d9000 {
-                       compatible = "ti,sysc-sr";
+                       compatible = "ti,sysc-omap4-sr", "ti,sysc";
                        ti,hwmods = "smartreflex_mpu";
 -                      reg = <0x4a0d9000 0x4>,
 -                            <0x4a0d9008 0x4>;
 -                      reg-names = "rev", "sysc";
 +                      reg = <0x4a0d9038 0x4>;
 +                      reg-names = "sysc";
 +                      ti,sysc-mask = <SYSC_OMAP3_SR_ENAWAKEUP>;
 +                      ti,sysc-sidle = <SYSC_IDLE_FORCE>,
 +                                      <SYSC_IDLE_NO>,
 +                                      <SYSC_IDLE_SMART>,
 +                                      <SYSC_IDLE_SMART_WKUP>;
 +                      clocks = <&l4_ao_clkctrl OMAP4_SMARTREFLEX_MPU_CLKCTRL 0>;
 +                      clock-names = "fck";
                        #address-cells = <1>;
                        #size-cells = <1>;
                        ranges = <0 0x4a0d9000 0x001000>;
@@@ -866,17 -817,10 +866,17 @@@
                };
  
                target-module@40128000 {
-                       compatible = "ti,sysc-mcasp";
+                       compatible = "ti,sysc-mcasp", "ti,sysc";
                        ti,hwmods = "mcasp";
 -                      reg = <0x40128004 0x4>;
 -                      reg-names = "sysc";
 +                      reg = <0x40128000 0x4>,
 +                            <0x40128004 0x4>;
 +                      reg-names = "rev", "sysc";
 +                      ti,sysc-sidle = <SYSC_IDLE_FORCE>,
 +                                      <SYSC_IDLE_NO>,
 +                                      <SYSC_IDLE_SMART>,
 +                                      <SYSC_IDLE_SMART_WKUP>;
 +                      clocks = <&abe_clkctrl OMAP4_MCASP_CLKCTRL 0>;
 +                      clock-names = "fck";
                        #address-cells = <1>;
                        #size-cells = <1>;
                        ranges = <0x00000000 0x40128000 0x1000>, /* MPU */

diff --cc arch/arm/mach-omap2/omap_hwmod.c
Simple merge

diff --cc arch/arm/mach-omap2/omap_hwmod.h
Simple merge

diff --cc arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
Simple merge

diff --cc arch/arm/mach-omap2/omap_hwmod_7xx_data.c
Simple merge

diff --cc drivers/firmware/Kconfig
Simple merge

diff --cc drivers/of/platform.c
Simple merge

diff --cc drivers/soc/Makefile
Simple merge