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

Pull ARM SoC-related driver updates from Olof Johansson:
 "Various driver updates for platforms and a couple of the small driver
  subsystems we merge through our tree:

   - A driver for SCU (system control) on NXP i.MX8QXP

   - Qualcomm Always-on Subsystem messaging driver (AOSS QMP)

   - Qualcomm PM support for MSM8998

   - Support for a newer version of DRAM PHY driver for Broadcom (DPFE)

   - Reset controller support for Bitmain BM1880

   - TI SCI (System Control Interface) support for CPU control on AM654
     processors

   - More TI sysc refactoring and rework"

* tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (84 commits)
  reset: remove redundant null check on pointer dev
  soc: rockchip: work around clang warning
  dt-bindings: reset: imx7: Fix the spelling of 'indices'
  soc: imx: Add i.MX8MN SoC driver support
  soc: aspeed: lpc-ctrl: Fix probe error handling
  soc: qcom: geni: Add support for ACPI
  firmware: ti_sci: Fix gcc unused-but-set-variable warning
  firmware: ti_sci: Use the correct style for SPDX License Identifier
  soc: imx8: Use existing of_root directly
  soc: imx8: Fix potential kernel dump in error path
  firmware/psci: psci_checker: Park kthreads before stopping them
  memory: move jedec_ddr.h from include/memory to drivers/memory/
  memory: move jedec_ddr_data.c from lib/ to drivers/memory/
  MAINTAINERS: Remove myself as qcom maintainer
  soc: aspeed: lpc-ctrl: make parameter optional
  soc: qcom: apr: Don't use reg for domain id
  soc: qcom: fix QCOM_AOSS_QMP dependency and build errors
  memory: tegra: Fix -Wunused-const-variable
  firmware: tegra: Early resume BPMP
  soc/tegra: Select pinctrl for Tegra194
  ...

diff --cc MAINTAINERS
index 9bd4c3b,78d8369..bd3fe4f
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -11905,8 -11671,19 +11905,9 @@@ S:  Maintaine
  F:    drivers/mtd/nand/onenand/
  F:    include/linux/mtd/onenand*.h
  
 -ONSTREAM SCSI TAPE DRIVER
 -M:    Willem Riede <osst@riede.org>
 -L:    osst-users@lists.sourceforge.net
 -L:    linux-scsi@vger.kernel.org
 -S:    Maintained
 -F:    Documentation/scsi/osst.txt
 -F:    drivers/scsi/osst.*
 -F:    drivers/scsi/osst_*.h
 -F:    drivers/scsi/st.h
 -
  OP-TEE DRIVER
  M:    Jens Wiklander <jens.wiklander@linaro.org>
+ L:    tee-dev@lists.linaro.org
  S:    Maintained
  F:    drivers/tee/optee/
  

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

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

diff --cc drivers/firmware/ti_sci.c
Simple merge

diff --cc drivers/firmware/ti_sci.h
Simple merge

diff --cc drivers/memory/Kconfig
Simple merge

diff --cc drivers/memory/brcmstb_dpfe.c
Simple merge

diff --cc drivers/memory/emif.c
Simple merge

diff --cc drivers/memory/jedec_ddr.h
index 90a9dab,a2094a9..4a21b50
--- 1/include/memory/jedec_ddr.h
--- 2/drivers/memory/jedec_ddr.h
+++ b/drivers/memory/jedec_ddr.h
@@@ -5,9 -4,13 +5,9 @@@
   * Copyright (C) 2012 Texas Instruments, Inc.
   *
   * Aneesh V <aneesh@ti.com>
 - *
 - * This program is free software; you can redistribute it and/or modify
 - * it under the terms of the GNU General Public License version 2 as
 - * published by the Free Software Foundation.
   */
- #ifndef __LINUX_JEDEC_DDR_H
- #define __LINUX_JEDEC_DDR_H
+ #ifndef __JEDEC_DDR_H
+ #define __JEDEC_DDR_H
  
  #include <linux/types.h>
  

diff --cc drivers/memory/jedec_ddr_data.c
index d0b312e,1f9ca0f..ed601d8
--- 1/lib/jedec_ddr_data.c
--- 2/drivers/memory/jedec_ddr_data.c
+++ b/drivers/memory/jedec_ddr_data.c
@@@ -5,10 -4,15 +5,11 @@@
   * Copyright (C) 2012 Texas Instruments, Inc.
   *
   * Aneesh V <aneesh@ti.com>
 - *
 - * This program is free software; you can redistribute it and/or modify
 - * it under the terms of the GNU General Public License version 2 as
 - * published by the Free Software Foundation.
   */
  
- #include <memory/jedec_ddr.h>
- #include <linux/module.h>
+ #include <linux/export.h>
+ 
+ #include "jedec_ddr.h"
  
  /* LPDDR2 addressing details from JESD209-2 section 2.4 */
  const struct lpddr2_addressing

diff --cc drivers/memory/tegra/tegra124.c
Simple merge

diff --cc drivers/soc/imx/soc-imx8.c
index b1bd8e2,9fb5293..f924ae8
--- 1/drivers/soc/imx/soc-imx8.c
--- 2/drivers/soc/imx/soc-imx8.c
+++ b/drivers/soc/imx/soc-imx8.c
@@@ -96,16 -129,17 +129,20 @@@ static int __init imx8_soc_init(void
        }
  
        soc_dev_attr->revision = imx8_revision(soc_rev);
-       if (!soc_dev_attr->revision)
+       if (!soc_dev_attr->revision) {
+               ret = -ENOMEM;
                goto free_soc;
+       }
  
        soc_dev = soc_device_register(soc_dev_attr);
-       if (IS_ERR(soc_dev))
+       if (IS_ERR(soc_dev)) {
+               ret = PTR_ERR(soc_dev);
                goto free_rev;
+       }
  
 +      if (IS_ENABLED(CONFIG_ARM_IMX_CPUFREQ_DT))
 +              platform_device_register_simple("imx-cpufreq-dt", -1, NULL, 0);
 +
        return 0;
  
  free_rev:

diff --cc drivers/soc/rockchip/pm_domains.c
Simple merge

diff --cc drivers/soc/tegra/pmc.c
Simple merge

diff --cc include/linux/soc/ti/ti_sci_protocol.h
Simple merge

diff --cc lib/Kconfig
Simple merge

diff --cc lib/Makefile
Simple merge