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. A bulk of this is smaller fixes
  or cleanups, but some of the new material this time around is:

   - Support for Nvidia Tegra234 SoC

   - Ring accelerator support for TI AM65x

   - PRUSS driver for TI platforms

   - Renesas support for R-Car V3U SoC

   - Reset support for Cortex-M4 processor on i.MX8MQ

  There are also new socinfo entries for a handful of different SoCs and
  platforms"

* tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (131 commits)
  drm/mediatek: reduce clear event
  soc: mediatek: cmdq: add clear option in cmdq_pkt_wfe api
  soc: mediatek: cmdq: add jump function
  soc: mediatek: cmdq: add write_s_mask value function
  soc: mediatek: cmdq: add write_s value function
  soc: mediatek: cmdq: add read_s function
  soc: mediatek: cmdq: add write_s_mask function
  soc: mediatek: cmdq: add write_s function
  soc: mediatek: cmdq: add address shift in jump
  soc: mediatek: mtk-infracfg: Fix kerneldoc
  soc: amlogic: pm-domains: use always-on flag
  reset: sti: reset-syscfg: fix struct description warnings
  reset: imx7: add the cm4 reset for i.MX8MQ
  dt-bindings: reset: imx8mq: add m4 reset
  reset: Fix and extend kerneldoc
  reset: reset-zynqmp: Added support for Versal platform
  dt-bindings: reset: Updated binding for Versal reset driver
  reset: imx7: Support module build
  soc: fsl: qe: Remove unnessesary check in ucc_set_tdm_rxtx_clk
  soc: fsl: qman: convert to use be32_add_cpu()
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/cpufreq/scmi-cpufreq.c
index 6dd1311660b561122c7e4516698756b240c3bc83,46b268095421573cee6530fb7dd85d89d68a2c82..e855e8612a67d4ea3b094e2a56cec4c29c7a41d4
--- 1/drivers/cpufreq/scmi-cpufreq.c
--- 2/drivers/cpufreq/scmi-cpufreq.c
+++ b/drivers/cpufreq/scmi-cpufreq.c
@@@ -48,22 -48,30 +48,22 @@@ static unsigned int scmi_cpufreq_get_ra
  static int
  scmi_cpufreq_set_target(struct cpufreq_policy *policy, unsigned int index)
  {
 -      int ret;
        struct scmi_data *priv = policy->driver_data;
-       struct scmi_perf_ops *perf_ops = handle->perf_ops;
+       const struct scmi_perf_ops *perf_ops = handle->perf_ops;
        u64 freq = policy->freq_table[index].frequency;
  
 -      ret = perf_ops->freq_set(handle, priv->domain_id, freq * 1000, false);
 -      if (!ret)
 -              arch_set_freq_scale(policy->related_cpus, freq,
 -                                  policy->cpuinfo.max_freq);
 -      return ret;
 +      return perf_ops->freq_set(handle, priv->domain_id, freq * 1000, false);
  }
  
  static unsigned int scmi_cpufreq_fast_switch(struct cpufreq_policy *policy,
                                             unsigned int target_freq)
  {
        struct scmi_data *priv = policy->driver_data;
-       struct scmi_perf_ops *perf_ops = handle->perf_ops;
+       const struct scmi_perf_ops *perf_ops = handle->perf_ops;
  
        if (!perf_ops->freq_set(handle, priv->domain_id,
 -                              target_freq * 1000, true)) {
 -              arch_set_freq_scale(policy->related_cpus, target_freq,
 -                                  policy->cpuinfo.max_freq);
 +                              target_freq * 1000, true))
                return target_freq;
 -      }
  
        return 0;
  }

diff --cc drivers/dma/ti/k3-udma-glue.c
Simple merge

diff --cc drivers/firmware/Kconfig
Simple merge

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

diff --cc drivers/gpu/drm/mediatek/mtk_drm_crtc.c
Simple merge

diff --cc drivers/memory/omap-gpmc.c
Simple merge

diff --cc drivers/memory/samsung/exynos5422-dmc.c
Simple merge

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

diff --cc drivers/reset/Kconfig
Simple merge

diff --cc drivers/reset/reset-imx7.c
index e8aa8691deb2dbc7bbd62153a5b82943a3c253cb,b60534a1e0efe782fd75c5ee29aec17c4913576c..185a333df66c55286cf69b329420db30956f7239
--- 1/drivers/reset/reset-imx7.c
--- 2/drivers/reset/reset-imx7.c
+++ b/drivers/reset/reset-imx7.c
@@@ -232,12 -235,13 +235,13 @@@ static int imx8mq_reset_set(struct rese
                break;
  
        case IMX8MQ_RESET_PCIE_CTRL_APPS_EN:
 -      case IMX8MQ_RESET_PCIE2_CTRL_APPS_EN:   /* fallthrough */
 -      case IMX8MQ_RESET_MIPI_DSI_PCLK_RESET_N:        /* fallthrough */
 -      case IMX8MQ_RESET_MIPI_DSI_ESC_RESET_N: /* fallthrough */
 -      case IMX8MQ_RESET_MIPI_DSI_DPI_RESET_N: /* fallthrough */
 -      case IMX8MQ_RESET_MIPI_DSI_RESET_N:     /* fallthrough */
 -      case IMX8MQ_RESET_MIPI_DSI_RESET_BYTE_N:        /* fallthrough */
 +      case IMX8MQ_RESET_PCIE2_CTRL_APPS_EN:
 +      case IMX8MQ_RESET_MIPI_DSI_PCLK_RESET_N:
 +      case IMX8MQ_RESET_MIPI_DSI_ESC_RESET_N:
 +      case IMX8MQ_RESET_MIPI_DSI_DPI_RESET_N:
 +      case IMX8MQ_RESET_MIPI_DSI_RESET_N:
 +      case IMX8MQ_RESET_MIPI_DSI_RESET_BYTE_N:
+       case IMX8MQ_RESET_M4_ENABLE:
                value = assert ? 0 : bit;
                break;
        }

diff --cc drivers/soc/qcom/socinfo.c
Simple merge

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

diff --cc drivers/soc/ti/Makefile
index 5463431ec96c8a977a3493800e553b0b0da06aae,18129aa557df800d405d7339841ddcca9cdea7ea..cc3c972fad2edd1bd92886a6f1bf20b611f6bdfe
--- 1/drivers/soc/ti/Makefile
--- 2/drivers/soc/ti/Makefile
+++ b/drivers/soc/ti/Makefile
@@@ -12,4 -12,4 +12,5 @@@ obj-$(CONFIG_TI_SCI_PM_DOMAINS)               += ti_
  obj-$(CONFIG_TI_SCI_INTA_MSI_DOMAIN)  += ti_sci_inta_msi.o
  obj-$(CONFIG_TI_K3_RINGACC)           += k3-ringacc.o
  obj-$(CONFIG_TI_K3_SOCINFO)           += k3-socinfo.o
+ obj-$(CONFIG_TI_PRUSS)                        += pruss.o
 +obj-$(CONFIG_POWER_AVS_OMAP)          += smartreflex.o

diff --cc include/linux/qcom-geni-se.h
Simple merge