]> git.baikalelectronics.ru Git - kernel.git/commitdiff
Merge tag 'arm-drivers-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 26 May 2022 17:32:47 +0000 (10:32 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 26 May 2022 17:32:47 +0000 (10:32 -0700)
Pull ARM driver updates from Arnd Bergmann:
 "There are minor updates to SoC specific drivers for chips by Rockchip,
  Samsung, NVIDIA, TI, NXP, i.MX, Qualcomm, and Broadcom.

  Noteworthy driver changes include:

   - Several conversions of DT bindings to yaml format.

   - Renesas adds driver support for R-Car V4H, RZ/V2M and RZ/G2UL SoCs.

   - Qualcomm adds a bus driver for the SSC (Snapdragon Sensor Core),
     and support for more chips in the RPMh power domains and the
     soc-id.

   - NXP has a new driver for the HDMI blk-ctrl on i.MX8MP.

   - Apple M1 gains support for the on-chip NVMe controller, making it
     possible to finally use the internal disks. This also includes SoC
     drivers for their RTKit IPC and for the SART DMA address filter.

  For other subsystems that merge their drivers through the SoC tree, we
  have

   - Firmware drivers for the ARM firmware stack including TEE, OP-TEE,
     SCMI and FF-A get a number of smaller updates and cleanups. OP-TEE
     now has a cache for firmware argument structures as an
     optimization, and SCMI now supports the 3.1 version of the
     specification.

   - Reset controller updates to Amlogic, ASpeed, Renesas and ACPI
     drivers

   - Memory controller updates for Tegra, and a few updates for other
     platforms"

* tag 'arm-drivers-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (159 commits)
  memory: tegra: Add MC error logging on Tegra186 onward
  memory: tegra: Add memory controller channels support
  memory: tegra: Add APE memory clients for Tegra234
  memory: tegra: Add Tegra234 support
  nvme-apple: fix sparse endianess warnings
  soc/tegra: pmc: Document core domain fields
  soc: qcom: pdr: use static for servreg_* variables
  soc: imx: fix semicolon.cocci warnings
  soc: renesas: R-Car V3U is R-Car Gen4
  soc: imx: add i.MX8MP HDMI blk-ctrl
  soc: imx: imx8m-blk-ctrl: Add i.MX8MP media blk-ctrl
  soc: imx: add i.MX8MP HSIO blk-ctrl
  soc: imx: imx8m-blk-ctrl: set power device name
  soc: qcom: llcc: Add sc8180x and sc8280xp configurations
  dt-bindings: arm: msm: Add sc8180x and sc8280xp LLCC compatibles
  soc/tegra: pmc: Select REGMAP
  dt-bindings: reset: st,sti-powerdown: Convert to yaml
  dt-bindings: reset: st,sti-picophyreset: Convert to yaml
  dt-bindings: reset: socfpga: Convert to yaml
  dt-bindings: reset: snps,axs10x-reset: Convert to yaml
  ...

1  2 
Documentation/devicetree/bindings/arm/qcom.yaml
Documentation/devicetree/bindings/memory-controllers/renesas,rpc-if.yaml
Documentation/devicetree/bindings/soc/qcom/qcom,geni-se.yaml
Documentation/devicetree/bindings/soc/qcom/qcom,smd-rpm.yaml
Documentation/devicetree/bindings/timer/samsung,exynos4210-mct.yaml
MAINTAINERS
drivers/bus/ti-sysc.c
drivers/memory/renesas-rpc-if.c
drivers/soc/imx/imx8m-blk-ctrl.c
drivers/soc/rockchip/pm_domains.c
drivers/tee/optee/ffa_abi.c

index 142b2cb4504e27887cc7fb2eba4f543c012127f2,1584944c7ac4080e4f26b3461f7d6eaf1ab21d7a..9c81d00b12e093b1669b345ce55dffa05022eec7
@@@ -19,11 -19,23 +19,22 @@@ description: |
  
  properties:
    compatible:
-     enum:
-       - samsung,exynos4210-mct
-       - samsung,exynos4412-mct
+     oneOf:
+       - enum:
+           - samsung,exynos4210-mct
+           - samsung,exynos4412-mct
+       - items:
+           - enum:
+               - samsung,exynos3250-mct
+               - samsung,exynos5250-mct
+               - samsung,exynos5260-mct
+               - samsung,exynos5420-mct
+               - samsung,exynos5433-mct
+               - samsung,exynos850-mct
+               - tesla,fsd-mct
+           - const: samsung,exynos4210-mct
  
    clocks:
 -    minItems: 2
      maxItems: 2
  
    clock-names:
diff --cc MAINTAINERS
Simple merge
Simple merge
index 019a0822bde0e4134c4910653af0dda8d405d85b,f4d62242c90a3e1a031b3e0403adc89b12df207e..4316988d791a527f48bc845b27cdd26cc46874b9
@@@ -499,18 -468,11 +498,12 @@@ int rpcif_manual_xfer(struct rpcif *rpc
  
                        smenr |= RPCIF_SMENR_SPIDE(rpcif_bits_set(rpc, nbytes));
                        regmap_write(rpc->regmap, RPCIF_SMENR, smenr);
 +                      rpc->xfer_size = nbytes;
  
                        memcpy(data, rpc->buffer + pos, nbytes);
-                       if (nbytes == 8) {
-                               regmap_write(rpc->regmap, RPCIF_SMWDR1,
-                                            data[0]);
-                               regmap_write(rpc->regmap, RPCIF_SMWDR0,
-                                            data[1]);
-                       } else {
-                               regmap_write(rpc->regmap, RPCIF_SMWDR0,
-                                            data[0]);
-                       }
+                       if (nbytes == 8)
+                               regmap_write(rpc->regmap, RPCIF_SMWDR1, *p++);
+                       regmap_write(rpc->regmap, RPCIF_SMWDR0, *p);
  
                        regmap_write(rpc->regmap, RPCIF_SMCR, smcr);
                        ret = wait_msg_xfer_end(rpc);
Simple merge
Simple merge
Simple merge