From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 5 Dec 2019 19:43:31 +0000 (-0800)
Subject: Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
X-Git-Tag: v5.10.7~3704
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ec939e4c94bd3ef2fd4f34c15f8aaf79bd0c5ee1;p=platform%2Fkernel%2Flinux-rpi.git

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

Pull ARM SoC driver updates from Olof Johansson:
 "Various driver updates for platforms:

   - A larger set of work on Tegra 2/3 around memory controller and
     regulator features, some fuse cleanups, etc..

   - MMP platform drivers, in particular for USB PHY, and other smaller
     additions.

   - Samsung Exynos 5422 driver for DMC (dynamic memory configuration),
     and ASV (adaptive voltage), allowing the platform to run at more
     optimal operating points.

   - Misc refactorings and support for RZ/G2N and R8A774B1 from Renesas

   - Clock/reset control driver for TI/OMAP

   - Meson-A1 reset controller support

   - Qualcomm sdm845 and sda845 SoC IDs for socinfo"

* tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (150 commits)
  firmware: arm_scmi: Fix doorbell ring logic for !CONFIG_64BIT
  soc: fsl: add RCPM driver
  dt-bindings: fsl: rcpm: Add 'little-endian' and update Chassis definition
  memory: tegra: Consolidate registers definition into common header
  memory: tegra: Ensure timing control debug features are disabled
  memory: tegra: Introduce Tegra30 EMC driver
  memory: tegra: Do not handle error from wait_for_completion_timeout()
  memory: tegra: Increase handshake timeout on Tegra20
  memory: tegra: Print a brief info message about EMC timings
  memory: tegra: Pre-configure debug register on Tegra20
  memory: tegra: Include io.h instead of iopoll.h
  memory: tegra: Adapt for Tegra20 clock driver changes
  memory: tegra: Don't set EMC rate to maximum on probe for Tegra20
  memory: tegra: Add gr2d and gr3d to DRM IOMMU group
  memory: tegra: Set DMA mask based on supported address bits
  soc: at91: Add Atmel SFR SN (Serial Number) support
  memory: atmel-ebi: switch to SPDX license identifiers
  memory: atmel-ebi: move NUM_CS definition inside EBI driver
  soc: mediatek: Refactor bus protection control
  soc: mediatek: Refactor sram control
  ...
---

ec939e4c94bd3ef2fd4f34c15f8aaf79bd0c5ee1
diff --cc drivers/reset/core.c
index 3c9a64c,329c785..ca1d491
--- a/drivers/reset/core.c
+++ b/drivers/reset/core.c
@@@ -76,9 -76,12 +76,11 @@@ static const char *rcdev_name(struct re
   * of_reset_simple_xlate - translate reset_spec to the reset line number
   * @rcdev: a pointer to the reset controller device
   * @reset_spec: reset line specifier as found in the device tree
 - * @flags: a flags pointer to fill in (optional)
   *
-  * This simple translation function should be used for reset controllers
-  * with 1:1 mapping, where reset lines can be indexed by number without gaps.
+  * This static translation function is used by default if of_xlate in
+  * :c:type:`reset_controller_dev` is not set. It is useful for all reset
+  * controllers with 1:1 mapping, where reset lines can be indexed by number
+  * without gaps.
   */
  static int of_reset_simple_xlate(struct reset_controller_dev *rcdev,
  			  const struct of_phandle_args *reset_spec)