From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 5 Jun 2020 02:56:20 +0000 (-0700)
Subject: Merge tag 'arm-drivers-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
X-Git-Tag: v5.15~3696
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=828f3e18e1cb98c68fc6db4d5113513d4a267775;p=platform%2Fkernel%2Flinux-starfive.git

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

Pull ARM/SoC driver updates from Arnd Bergmann:
 "These are updates to SoC specific drivers that did not have another
  subsystem maintainer tree to go through for some reason:

   - Some bus and memory drivers for the MIPS P5600 based Baikal-T1 SoC
     that is getting added through the MIPS tree.

   - There are new soc_device identification drivers for TI K3, Qualcomm
     MSM8939

   - New reset controller drivers for NXP i.MX8MP, Renesas RZ/G1H, and
     Hisilicon hi6220

   - The SCMI firmware interface can now work across ARM SMC/HVC as a
     transport.

   - Mediatek platforms now use a new driver for their "MMSYS" hardware
     block that controls clocks and some other aspects in behalf of the
     media and gpu drivers.

   - Some Tegra processors have improved power management support,
     including getting woken up by the PMIC and cluster power down
     during idle.

   - A new v4l staging driver for Tegra is added.

   - Cleanups and minor bugfixes for TI, NXP, Hisilicon, Mediatek, and
     Tegra"

* tag 'arm-drivers-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (155 commits)
  clk: sprd: fix compile-testing
  bus: bt1-axi: Build the driver into the kernel
  bus: bt1-apb: Build the driver into the kernel
  bus: bt1-axi: Use sysfs_streq instead of strncmp
  bus: bt1-axi: Optimize the return points in the driver
  bus: bt1-apb: Use sysfs_streq instead of strncmp
  bus: bt1-apb: Use PTR_ERR_OR_ZERO to return from request-regs method
  bus: bt1-apb: Fix show/store callback identations
  bus: bt1-apb: Include linux/io.h
  dt-bindings: memory: Add Baikal-T1 L2-cache Control Block binding
  memory: Add Baikal-T1 L2-cache Control Block driver
  bus: Add Baikal-T1 APB-bus driver
  bus: Add Baikal-T1 AXI-bus driver
  dt-bindings: bus: Add Baikal-T1 APB-bus binding
  dt-bindings: bus: Add Baikal-T1 AXI-bus binding
  staging: tegra-video: fix V4L2 dependency
  tee: fix crypto select
  drivers: soc: ti: knav_qmss_queue: Make knav_gp_range_ops static
  soc: ti: add k3 platforms chipid module driver
  dt-bindings: soc: ti: add binding for k3 platforms chipid module
  ...
---

828f3e18e1cb98c68fc6db4d5113513d4a267775
diff --cc drivers/staging/media/Makefile
index e01f13a,ee60488d..71a47b6
--- a/drivers/staging/media/Makefile
+++ b/drivers/staging/media/Makefile
@@@ -4,8 -3,8 +4,9 @@@ obj-$(CONFIG_INTEL_ATOMISP)     += atom
  obj-$(CONFIG_VIDEO_IMX_MEDIA)	+= imx/
  obj-$(CONFIG_VIDEO_MESON_VDEC)	+= meson/vdec/
  obj-$(CONFIG_VIDEO_OMAP4)	+= omap4iss/
 +obj-$(CONFIG_VIDEO_ROCKCHIP_VDEC)	+= rkvdec/
  obj-$(CONFIG_VIDEO_SUNXI)	+= sunxi/
+ obj-$(CONFIG_VIDEO_TEGRA)	+= tegra-video/
  obj-$(CONFIG_TEGRA_VDE)		+= tegra-vde/
  obj-$(CONFIG_VIDEO_HANTRO)	+= hantro/
  obj-$(CONFIG_VIDEO_IPU3_IMGU)	+= ipu3/