From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 17 Dec 2020 00:38:41 +0000 (-0800)
Subject: Merge tag 'arm-soc-drivers-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v5.11-rc1~90
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=48c1c40ab40cb087b992e7b77518c3a2926743cc;p=linux-platform-drivers-x86.git

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

Pull ARM SoC driver updates from Arnd Bergmann:
 "There are a couple of subsystems maintained by other people that merge
  their drivers through the SoC tree, those changes include:

   - The SCMI firmware framework gains support for sensor notifications
     and for controlling voltage domains.

   - A large update for the Tegra memory controller driver, integrating
     it better with the interconnect framework

   - The memory controller subsystem gains support for Mediatek MT8192

   - The reset controller framework gains support for sharing pulsed
     resets

  For Soc specific drivers in drivers/soc, the main changes are

   - The Allwinner/sunxi MBUS gets a rework for the way it handles
     dma_map_ops and offsets between physical and dma address spaces.

   - An errata fix plus some cleanups for Freescale Layerscape SoCs

   - A cleanup for renesas drivers regarding MMIO accesses.

   - New SoC specific drivers for Mediatek MT8192 and MT8183 power
     domains

   - New SoC specific drivers for Aspeed AST2600 LPC bus control and SoC
     identification.

   - Core Power Domain support for Qualcomm MSM8916, MSM8939, SDM660 and
     SDX55.

   - A rework of the TI AM33xx 'genpd' power domain support to use
     information from DT instead of platform data

   - Support for TI AM64x SoCs

   - Allow building some Amlogic drivers as modules instead of built-in

  Finally, there are numerous cleanups and smaller bug fixes for
  Mediatek, Tegra, Samsung, Qualcomm, TI OMAP, Amlogic, Rockchips,
  Renesas, and Xilinx SoCs"

* tag 'arm-soc-drivers-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (222 commits)
  soc: mediatek: mmsys: Specify HAS_IOMEM dependency for MTK_MMSYS
  firmware: xilinx: Properly align function parameter
  firmware: xilinx: Add a blank line after function declaration
  firmware: xilinx: Remove additional newline
  firmware: xilinx: Fix kernel-doc warnings
  firmware: xlnx-zynqmp: fix compilation warning
  soc: xilinx: vcu: add missing register NUM_CORE
  soc: xilinx: vcu: use vcu-settings syscon registers
  dt-bindings: soc: xlnx: extract xlnx, vcu-settings to separate binding
  soc: xilinx: vcu: drop useless success message
  clk: samsung: mark PM functions as __maybe_unused
  soc: samsung: exynos-chipid: initialize later - with arch_initcall
  soc: samsung: exynos-chipid: order list of SoCs by name
  memory: jz4780_nemc: Fix potential NULL dereference in jz4780_nemc_probe()
  memory: ti-emif-sram: only build for ARMv7
  memory: tegra30: Support interconnect framework
  memory: tegra20: Support hardware versioning and clean up OPP table initialization
  dt-bindings: memory: tegra20-emc: Document opp-supported-hw property
  soc: rockchip: io-domain: Fix error return code in rockchip_iodomain_probe()
  reset-controller: ti: force the write operation when assert or deassert
  ...
---

48c1c40ab40cb087b992e7b77518c3a2926743cc
diff --cc drivers/staging/media/sunxi/cedrus/cedrus.c
index 18d54f9fd715,d5fca10ea5b4..ddad5d274ee8
--- a/drivers/staging/media/sunxi/cedrus/cedrus.c
+++ b/drivers/staging/media/sunxi/cedrus/cedrus.c
@@@ -584,11 -522,7 +584,10 @@@ static const struct cedrus_variant sun5
  
  static const struct cedrus_variant sun50i_h6_cedrus_variant = {
  	.capabilities	= CEDRUS_CAPABILITY_UNTILED |
 -			  CEDRUS_CAPABILITY_H265_DEC,
 +			  CEDRUS_CAPABILITY_MPEG2_DEC |
 +			  CEDRUS_CAPABILITY_H264_DEC |
 +			  CEDRUS_CAPABILITY_H265_DEC |
 +			  CEDRUS_CAPABILITY_VP8_DEC,
- 	.quirks		= CEDRUS_QUIRK_NO_DMA_OFFSET,
  	.mod_rate	= 600000000,
  };
  
diff --cc drivers/staging/media/sunxi/cedrus/cedrus.h
index e61c41853ba2,626090a5811c..c96077aaef49
--- a/drivers/staging/media/sunxi/cedrus/cedrus.h
+++ b/drivers/staging/media/sunxi/cedrus/cedrus.h
@@@ -29,12 -28,7 +29,10 @@@
  
  #define CEDRUS_CAPABILITY_UNTILED	BIT(0)
  #define CEDRUS_CAPABILITY_H265_DEC	BIT(1)
 +#define CEDRUS_CAPABILITY_H264_DEC	BIT(2)
 +#define CEDRUS_CAPABILITY_MPEG2_DEC	BIT(3)
 +#define CEDRUS_CAPABILITY_VP8_DEC	BIT(4)
  
- #define CEDRUS_QUIRK_NO_DMA_OFFSET	BIT(0)
- 
  enum cedrus_codec {
  	CEDRUS_CODEC_MPEG2,
  	CEDRUS_CODEC_H264,
diff --cc include/linux/dma-mapping.h
index 2aaed35b556d,199d85285246..2e49996a8f39
--- a/include/linux/dma-mapping.h
+++ b/include/linux/dma-mapping.h
@@@ -558,11 -558,6 +558,4 @@@ static inline int dma_mmap_wc(struct de
  #define dma_unmap_len_set(PTR, LEN_NAME, VAL)    do { } while (0)
  #endif
  
- /*
-  * Legacy interface to set up the dma offset map.  Drivers really should not
-  * actually use it, but we have a few legacy cases left.
-  */
- int dma_direct_set_offset(struct device *dev, phys_addr_t cpu_start,
- 		dma_addr_t dma_start, u64 size);
 -extern const struct dma_map_ops dma_virt_ops;
--
  #endif /* _LINUX_DMA_MAPPING_H */