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

Pull ARM SoC late updates from Olof Johansson:
 "This is a branch with a few merge requests that either came in late,
  or took a while longer for us to review and merge than usual and thus
  cut it a bit close to the merge window. We stage them in a separate
  branch and if things look good, we still send them up -- and that's
  the case here.

  This is mostly DT additions for Renesas platforms, adding IP block
  descriptions for existing and new SoCs.

  There are also some driver updates for Qualcomm platforms for SMEM/QMI
  and GENI, which is their generalized serial protocol interface"

* tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (186 commits)
  soc: qcom: smem: introduce qcom_smem_virt_to_phys()
  soc: qcom: qmi: fix a buffer sizing bug
  MAINTAINERS: Update pattern for qcom_scm
  soc: Unconditionally include qcom Makefile
  soc: qcom: smem: check sooner in qcom_smem_set_global_partition()
  soc: qcom: smem: fix qcom_smem_set_global_partition()
  soc: qcom: smem: fix off-by-one error in qcom_smem_alloc_private()
  soc: qcom: smem: byte swap values properly
  soc: qcom: smem: return proper type for cached entry functions
  soc: qcom: smem: fix first cache entry calculation
  soc: qcom: cmd-db: Make endian-agnostic
  drivers: qcom: add command DB driver
  arm64: dts: renesas: salvator-common: Add ADV7482 support
  ARM: dts: r8a7740: Add CEU1
  ARM: dts: r8a7740: Add CEU0
  arm64: dts: renesas: salvator-common: enable VIN
  arm64: dts: renesas: r8a77970: add VIN and CSI-2 nodes
  arm64: dts: renesas: r8a77965: add VIN and CSI-2 nodes
  arm64: dts: renesas: r8a7796: add VIN and CSI-2 nodes
  arm64: dts: renesas: r8a7795-es1: add CSI-2 node
  ...

diff --combined MAINTAINERS
index 0ee6fe9,218476d..12b2767
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -767,14 -767,12 +767,14 @@@ F:      drivers/gpu/drm/amd/amdgpu/amdgpu_am
  F:    drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
  F:    drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c
  F:    drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c
 +F:    drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c
  F:    drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_fence.c
  F:    drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
  F:    drivers/gpu/drm/amd/amdkfd/
  F:    drivers/gpu/drm/amd/include/cik_structs.h
  F:    drivers/gpu/drm/amd/include/kgd_kfd_interface.h
  F:    drivers/gpu/drm/amd/include/vi_structs.h
 +F:    drivers/gpu/drm/amd/include/v9_structs.h
  F:    include/uapi/linux/kfd_ioctl.h
  
  AMD SEATTLE DEVICE TREE SUPPORT
@@@ -796,14 -794,6 +796,14 @@@ M:       Michael Hanselmann <linux-kernel@han
  S:    Supported
  F:    drivers/macintosh/ams/
  
 +ANALOG DEVICES INC AD5686 DRIVER
 +M:    Stefan Popa <stefan.popa@analog.com>
 +L:    linux-pm@vger.kernel.org
 +W:    http://ez.analog.com/community/linux-device-drivers
 +S:    Supported
 +F:    drivers/iio/dac/ad5686*
 +F:    drivers/iio/dac/ad5696*
 +
  ANALOG DEVICES INC AD9389B DRIVER
  M:    Hans Verkuil <hans.verkuil@cisco.com>
  L:    linux-media@vger.kernel.org
@@@ -1143,12 -1133,10 +1143,12 @@@ F:   arch/arm/mach-actions
  F:    arch/arm/boot/dts/owl-*
  F:    arch/arm64/boot/dts/actions/
  F:    drivers/clocksource/owl-*
 +F:    drivers/pinctrl/actions/*
  F:    drivers/soc/actions/
  F:    include/dt-bindings/power/owl-*
  F:    include/linux/soc/actions/
  F:    Documentation/devicetree/bindings/arm/actions.txt
 +F:    Documentation/devicetree/bindings/pinctrl/actions,s900-pinctrl.txt
  F:    Documentation/devicetree/bindings/power/actions,owl-sps.txt
  F:    Documentation/devicetree/bindings/timer/actions,owl-timer.txt
  
@@@ -1419,7 -1407,6 +1419,7 @@@ M:      Shawn Guo <shawnguo@kernel.org
  M:    Sascha Hauer <s.hauer@pengutronix.de>
  R:    Pengutronix Kernel Team <kernel@pengutronix.de>
  R:    Fabio Estevam <fabio.estevam@nxp.com>
 +R:    NXP Linux Team <linux-imx@nxp.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git
@@@ -1830,7 -1817,7 +1830,7 @@@ F:      drivers/spi/spi-qup.
  F:    drivers/tty/serial/msm_serial.c
  F:    drivers/*/pm8???-*
  F:    drivers/mfd/ssbi.c
- F:    drivers/firmware/qcom_scm.c
+ F:    drivers/firmware/qcom_scm*
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux.git
  
  ARM/RADISYS ENP2611 MACHINE SUPPORT
@@@ -2344,16 -2331,8 +2344,16 @@@ S:    Maintaine
  F:    drivers/gpio/gpio-ath79.c
  F:    Documentation/devicetree/bindings/gpio/gpio-ath79.txt
  
 +ATHEROS 71XX/9XXX USB PHY DRIVER
 +M:    Alban Bedel <albeu@free.fr>
 +W:    https://github.com/AlbanBedel/linux
 +T:    git git://github.com/AlbanBedel/linux
 +S:    Maintained
 +F:    drivers/phy/qualcomm/phy-ath79-usb.c
 +F:    Documentation/devicetree/bindings/phy/phy-ath79-usb.txt
 +
  ATHEROS ATH GENERIC UTILITIES
 -M:    "Luis R. Rodriguez" <mcgrof@do-not-panic.com>
 +M:    Kalle Valo <kvalo@codeaurora.org>
  L:    linux-wireless@vger.kernel.org
  S:    Supported
  F:    drivers/net/wireless/ath/*
@@@ -2368,7 -2347,7 +2368,7 @@@ S:      Maintaine
  F:    drivers/net/wireless/ath/ath5k/
  
  ATHEROS ATH6KL WIRELESS DRIVER
 -M:    Kalle Valo <kvalo@qca.qualcomm.com>
 +M:    Kalle Valo <kvalo@codeaurora.org>
  L:    linux-wireless@vger.kernel.org
  W:    http://wireless.kernel.org/en/users/Drivers/ath6kl
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
@@@ -2542,6 -2521,8 +2542,6 @@@ F:      kernel/audit
  
  AUXILIARY DISPLAY DRIVERS
  M:    Miguel Ojeda Sandonis <miguel.ojeda.sandonis@gmail.com>
 -W:    http://miguelojeda.es/auxdisplay.htm
 -W:    http://jair.lab.fi.uva.es/~migojed/auxdisplay.htm
  S:    Maintained
  F:    drivers/auxdisplay/
  F:    include/linux/cfag12864b.h
@@@ -2607,7 -2588,6 +2607,7 @@@ BACKLIGHT CLASS/SUBSYSTE
  M:    Lee Jones <lee.jones@linaro.org>
  M:    Daniel Thompson <daniel.thompson@linaro.org>
  M:    Jingoo Han <jingoohan1@gmail.com>
 +L:    dri-devel@lists.freedesktop.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git
  S:    Maintained
  F:    drivers/video/backlight/
@@@ -2742,13 -2722,13 +2742,13 @@@ L:   netdev@vger.kernel.or
  L:    linux-kernel@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git
 +Q:    https://patchwork.ozlabs.org/project/netdev/list/?delegate=77147
  S:    Supported
  F:    arch/x86/net/bpf_jit*
  F:    Documentation/networking/filter.txt
  F:    Documentation/bpf/
  F:    include/linux/bpf*
  F:    include/linux/filter.h
 -F:    include/trace/events/bpf.h
  F:    include/trace/events/xdp.h
  F:    include/uapi/linux/bpf*
  F:    include/uapi/linux/filter.h
@@@ -2761,7 -2741,6 +2761,7 @@@ F:      net/sched/act_bpf.
  F:    net/sched/cls_bpf.c
  F:    samples/bpf/
  F:    tools/bpf/
 +F:    tools/lib/bpf/
  F:    tools/testing/selftests/bpf/
  
  BROADCOM B44 10/100 ETHERNET DRIVER
@@@ -3157,13 -3136,6 +3157,13 @@@ S:    Supporte
  F:    Documentation/filesystems/caching/cachefiles.txt
  F:    fs/cachefiles/
  
 +CADENCE MIPI-CSI2 BRIDGES
 +M:    Maxime Ripard <maxime.ripard@bootlin.com>
 +L:    linux-media@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/media/cdns,*.txt
 +F:    drivers/media/platform/cadence/cdns-csi2*
 +
  CADET FM/AM RADIO RECEIVER DRIVER
  M:    Hans Verkuil <hverkuil@xs4all.nl>
  L:    linux-media@vger.kernel.org
@@@ -3392,12 -3364,16 +3392,12 @@@ F:   include/linux/usb/wusb
  
  CFAG12864B LCD DRIVER
  M:    Miguel Ojeda Sandonis <miguel.ojeda.sandonis@gmail.com>
 -W:    http://miguelojeda.es/auxdisplay.htm
 -W:    http://jair.lab.fi.uva.es/~migojed/auxdisplay.htm
  S:    Maintained
  F:    drivers/auxdisplay/cfag12864b.c
  F:    include/linux/cfag12864b.h
  
  CFAG12864BFB LCD FRAMEBUFFER DRIVER
  M:    Miguel Ojeda Sandonis <miguel.ojeda.sandonis@gmail.com>
 -W:    http://miguelojeda.es/auxdisplay.htm
 -W:    http://jair.lab.fi.uva.es/~migojed/auxdisplay.htm
  S:    Maintained
  F:    drivers/auxdisplay/cfag12864bfb.c
  F:    include/linux/cfag12864b.h
@@@ -3455,12 -3431,6 +3455,12 @@@ S:    Maintaine
  F:    Documentation/devicetree/bindings/input/touchscreen/chipone_icn8318.txt
  F:    drivers/input/touchscreen/chipone_icn8318.c
  
 +CHIPONE ICN8505 I2C TOUCHSCREEN DRIVER
 +M:    Hans de Goede <hdegoede@redhat.com>
 +L:    linux-input@vger.kernel.org
 +S:    Maintained
 +F:    drivers/input/touchscreen/chipone_icn8505.c
 +
  CHROME HARDWARE PLATFORM SUPPORT
  M:    Benson Leung <bleung@chromium.org>
  M:    Olof Johansson <olof@lixom.net>
@@@ -3589,7 -3559,6 +3589,7 @@@ F:      drivers/clk
  X:    drivers/clk/clkdev.c
  F:    include/linux/clk-pr*
  F:    include/linux/clk/
 +F:    include/linux/of_clk.h
  
  COMMON INTERNET FILE SYSTEM (CIFS)
  M:    Steve French <sfrench@samba.org>
@@@ -4340,7 -4309,7 +4340,7 @@@ F:      Documentation/driver-api/dma-buf.rs
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  
  DMA GENERIC OFFLOAD ENGINE SUBSYSTEM
 -M:    Vinod Koul <vinod.koul@intel.com>
 +M:    Vinod Koul <vkoul@kernel.org>
  L:    dmaengine@vger.kernel.org
  Q:    https://patchwork.kernel.org/project/linux-dmaengine/list/
  S:    Maintained
@@@ -4361,14 -4330,12 +4361,14 @@@ W:   http://git.infradead.org/users/hch/d
  S:    Supported
  F:    lib/dma-debug.c
  F:    lib/dma-direct.c
 +F:    lib/dma-noncoherent.c
  F:    lib/dma-virt.c
  F:    drivers/base/dma-mapping.c
  F:    drivers/base/dma-coherent.c
  F:    include/asm-generic/dma-mapping.h
  F:    include/linux/dma-direct.h
  F:    include/linux/dma-mapping.h
 +F:    include/linux/dma-noncoherent.h
  
  DME1737 HARDWARE MONITOR DRIVER
  M:    Juerg Haefliger <juergh@gmail.com>
@@@ -4432,12 -4399,6 +4432,12 @@@ L:    linux-kernel@vger.kernel.or
  S:    Maintained
  F:    drivers/staging/fsl-dpaa2/ethsw
  
 +DPAA2 PTP CLOCK DRIVER
 +M:    Yangbo Lu <yangbo.lu@nxp.com>
 +L:    linux-kernel@vger.kernel.org
 +S:    Maintained
 +F:    drivers/staging/fsl-dpaa2/rtc
 +
  DPT_I2O SCSI RAID DRIVER
  M:    Adaptec OEM Raid Solutions <aacraid@microsemi.com>
  L:    linux-scsi@vger.kernel.org
@@@ -4708,7 -4669,7 +4708,7 @@@ F:      Documentation/devicetree/bindings/di
  
  DRM DRIVERS FOR FREESCALE DCU
  M:    Stefan Agner <stefan@agner.ch>
 -M:    Alison Wang <alison.wang@freescale.com>
 +M:    Alison Wang <alison.wang@nxp.com>
  L:    dri-devel@lists.freedesktop.org
  S:    Supported
  F:    drivers/gpu/drm/fsl-dcu/
@@@ -4819,14 -4780,6 +4819,14 @@@ S:    Maintaine
  F:    drivers/gpu/drm/omapdrm/
  F:    Documentation/devicetree/bindings/display/ti/
  
 +DRM DRIVERS FOR V3D
 +M:    Eric Anholt <eric@anholt.net>
 +S:    Supported
 +F:    drivers/gpu/drm/v3d/
 +F:    include/uapi/drm/v3d_drm.h
 +F:    Documentation/devicetree/bindings/display/brcm,bcm-v3d.txt
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +
  DRM DRIVERS FOR VC4
  M:    Eric Anholt <eric@anholt.net>
  T:    git git://github.com/anholt/linux
@@@ -4873,15 -4826,6 +4873,15 @@@ S:    Maintaine
  F:    drivers/gpu/drm/tinydrm/
  F:    include/drm/tinydrm/
  
 +DRM DRIVERS FOR XEN
 +M:    Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +L:    dri-devel@lists.freedesktop.org
 +L:    xen-devel@lists.xen.org
 +S:    Supported
 +F:    drivers/gpu/drm/xen/
 +F:    Documentation/gpu/xen-front.rst
 +
  DRM TTM SUBSYSTEM
  M:    Christian Koenig <christian.koenig@amd.com>
  M:    Roger He <Hongbo.He@amd.com>
@@@ -5373,6 -5317,7 +5373,6 @@@ F:      include/linux/*mdio*.
  F:    include/linux/of_net.h
  F:    include/linux/phy.h
  F:    include/linux/phy_fixed.h
 -F:    include/linux/platform_data/mdio-gpio.h
  F:    include/linux/platform_data/mdio-bcm-unimac.h
  F:    include/trace/events/mdio.h
  F:    include/uapi/linux/mdio.h
@@@ -5443,6 -5388,7 +5443,6 @@@ S:      Maintaine
  F:    drivers/iommu/exynos-iommu.c
  
  EZchip NPS platform support
 -M:    Elad Kanfi <eladkan@mellanox.com>
  M:    Vineet Gupta <vgupta@synopsys.com>
  S:    Supported
  F:    arch/arc/plat-eznps
@@@ -5468,19 -5414,6 +5468,19 @@@ S:    Maintaine
  F:    Documentation/hwmon/f71805f
  F:    drivers/hwmon/f71805f.c
  
 +FADDR2LINE
 +M:    Josh Poimboeuf <jpoimboe@redhat.com>
 +S:    Maintained
 +F:    scripts/faddr2line
 +
 +FAILOVER MODULE
 +M:    Sridhar Samudrala <sridhar.samudrala@intel.com>
 +L:    netdev@vger.kernel.org
 +S:    Supported
 +F:    net/core/failover.c
 +F:    include/net/failover.h
 +F:    Documentation/networking/failover.rst
 +
  FANOTIFY
  M:    Jan Kara <jack@suse.cz>
  R:    Amir Goldstein <amir73il@gmail.com>
@@@ -5633,7 -5566,6 +5633,7 @@@ S:      Maintaine
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/atull/linux-fpga.git
  Q:    http://patchwork.kernel.org/project/linux-fpga/list/
  F:    Documentation/fpga/
 +F:    Documentation/driver-api/fpga/
  F:    Documentation/devicetree/bindings/fpga/
  F:    drivers/fpga/
  F:    include/linux/fpga/
@@@ -5691,6 -5623,7 +5691,6 @@@ M:      Claudiu Manoil <claudiu.manoil@nxp.c
  L:    netdev@vger.kernel.org
  S:    Maintained
  F:    drivers/net/ethernet/freescale/gianfar*
 -X:    drivers/net/ethernet/freescale/gianfar_ptp.c
  F:    Documentation/devicetree/bindings/net/fsl-tsec-phy.txt
  
  FREESCALE GPMI NAND DRIVER
@@@ -5737,14 -5670,6 +5737,14 @@@ S:    Maintaine
  F:    drivers/net/ethernet/freescale/fman
  F:    Documentation/devicetree/bindings/powerpc/fsl/fman.txt
  
 +FREESCALE QORIQ PTP CLOCK DRIVER
 +M:    Yangbo Lu <yangbo.lu@nxp.com>
 +L:    netdev@vger.kernel.org
 +S:    Maintained
 +F:    drivers/ptp/ptp_qoriq.c
 +F:    include/linux/fsl/ptp_qoriq.h
 +F:    Documentation/devicetree/bindings/ptp/ptp-qoriq.txt
 +
  FREESCALE QUAD SPI DRIVER
  M:    Han Xu <han.xu@nxp.com>
  L:    linux-mtd@lists.infradead.org
@@@ -6024,8 -5949,8 +6024,8 @@@ S:      Maintaine
  F:    scripts/get_maintainer.pl
  
  GFS2 FILE SYSTEM
 -M:    Steven Whitehouse <swhiteho@redhat.com>
  M:    Bob Peterson <rpeterso@redhat.com>
 +M:    Andreas Gruenbacher <agruenba@redhat.com>
  L:    cluster-devel@redhat.com
  W:    http://sources.redhat.com/cluster/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git
@@@ -6293,7 -6218,6 +6293,7 @@@ L:      linux-hwmon@vger.kernel.or
  W:    http://hwmon.wiki.kernel.org/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git
  S:    Maintained
 +F:    Documentation/devicetree/bindings/hwmon/
  F:    Documentation/hwmon/
  F:    drivers/hwmon/
  F:    include/linux/hwmon*.h
@@@ -6580,15 -6504,9 +6580,15 @@@ F:    Documentation/networking/hinic.tx
  F:    drivers/net/ethernet/huawei/hinic/
  
  HUGETLB FILESYSTEM
 -M:    Nadia Yvette Chambers <nyc@holomorphy.com>
 +M:    Mike Kravetz <mike.kravetz@oracle.com>
 +L:    linux-mm@kvack.org
  S:    Maintained
  F:    fs/hugetlbfs/
 +F:    mm/hugetlb.c
 +F:    include/linux/hugetlb.h
 +F:    Documentation/admin-guide/mm/hugetlbpage.rst
 +F:    Documentation/vm/hugetlbfs_reserv.rst
 +F:    Documentation/ABI/testing/sysfs-kernel-mm-hugepages
  
  HVA ST MEDIA DRIVER
  M:    Jean-Christophe Trotin <jean-christophe.trotin@st.com>
@@@ -6828,12 -6746,6 +6828,12 @@@ L:    linux-scsi@vger.kernel.or
  S:    Supported
  F:    drivers/scsi/ibmvscsi/ibmvfc*
  
 +IBM Power Virtual Management Channel Driver
 +M:    Bryant G. Ly <bryantly@linux.vnet.ibm.com>
 +M:    Steven Royer <seroyer@linux.vnet.ibm.com>
 +S:    Supported
 +F:    drivers/misc/ibmvmc.*
 +
  IBM Power Virtual SCSI Device Drivers
  M:    Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
  L:    linux-scsi@vger.kernel.org
@@@ -6985,15 -6897,6 +6985,15 @@@ F:    drivers/staging/iio
  F:    include/linux/iio/
  F:    tools/iio/
  
 +IIO UNIT CONVERTER
 +M:    Peter Rosin <peda@axentia.se>
 +L:    linux-iio@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/iio/afe/current-sense-amplifier.txt
 +F:    Documentation/devicetree/bindings/iio/afe/current-sense-shunt.txt
 +F:    Documentation/devicetree/bindings/iio/afe/voltage-divider.txt
 +F:    drivers/iio/afe/iio-rescale.c
 +
  IKANOS/ADI EAGLE ADSL USB DRIVER
  M:    Matthieu Castet <castet.matthieu@free.fr>
  M:    Stanislaw Gruszka <stf_xl@wp.pl>
@@@ -7126,13 -7029,14 +7126,13 @@@ L:   linux-fbdev@vger.kernel.or
  S:    Maintained
  F:    drivers/video/fbdev/i810/
  
 -INTEL ASoC BDW/HSW DRIVERS
 +INTEL ASoC DRIVERS
 +M:    Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
 +M:    Liam Girdwood <liam.r.girdwood@linux.intel.com>
  M:    Jie Yang <yang.jie@linux.intel.com>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
  S:    Supported
 -F:    sound/soc/intel/common/sst-dsp*
 -F:    sound/soc/intel/common/sst-firmware.c
 -F:    sound/soc/intel/boards/broadwell.c
 -F:    sound/soc/intel/haswell/
 +F:    sound/soc/intel/
  
  INTEL C600 SERIES SAS CONTROLLER DRIVER
  M:    Intel SCU Linux support <intel-linux-scu@intel.com>
@@@ -7167,8 -7071,8 +7167,8 @@@ Q:      http://patchwork.ozlabs.org/project/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-queue.git
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue.git
  S:    Supported
 -F:    Documentation/networking/e100.txt
 -F:    Documentation/networking/e1000.txt
 +F:    Documentation/networking/e100.rst
 +F:    Documentation/networking/e1000.rst
  F:    Documentation/networking/e1000e.txt
  F:    Documentation/networking/igb.txt
  F:    Documentation/networking/igbvf.txt
@@@ -7728,9 -7632,8 +7728,9 @@@ M:      Masahiro Yamada <yamada.masahiro@soc
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kconfig
  L:    linux-kbuild@vger.kernel.org
  S:    Maintained
 -F:    Documentation/kbuild/kconfig-language.txt
 +F:    Documentation/kbuild/kconfig*
  F:    scripts/kconfig/
 +F:    scripts/Kconfig.include
  
  KDUMP
  M:    Dave Young <dyoung@redhat.com>
@@@ -7749,11 -7652,11 +7749,11 @@@ W:   https://linuxtv.or
  S:    Maintained
  F:    drivers/media/radio/radio-keene*
  
 -KERNEL AUTOMOUNTER v4 (AUTOFS4)
 +KERNEL AUTOMOUNTER
  M:    Ian Kent <raven@themaw.net>
  L:    autofs@vger.kernel.org
  S:    Maintained
 -F:    fs/autofs4/
 +F:    fs/autofs/
  
  KERNEL BUILD + files below scripts/ (unless maintained elsewhere)
  M:    Masahiro Yamada <yamada.masahiro@socionext.com>
@@@ -7795,7 -7698,6 +7795,7 @@@ KERNEL SELFTEST FRAMEWOR
  M:    Shuah Khan <shuah@kernel.org>
  L:    linux-kselftest@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git
 +Q:    https://patchwork.kernel.org/project/linux-kselftest/list/
  S:    Maintained
  F:    tools/testing/selftests/
  F:    Documentation/dev-tools/kselftest*
@@@ -7997,6 -7899,8 +7997,6 @@@ F:      kernel/kprobes.
  
  KS0108 LCD CONTROLLER DRIVER
  M:    Miguel Ojeda Sandonis <miguel.ojeda.sandonis@gmail.com>
 -W:    http://miguelojeda.es/auxdisplay.htm
 -W:    http://jair.lab.fi.uva.es/~migojed/auxdisplay.htm
  S:    Maintained
  F:    Documentation/auxdisplay/ks0108
  F:    drivers/auxdisplay/ks0108.c
@@@ -8054,13 -7958,6 +8054,13 @@@ S:    Maintaine
  F:    Documentation/misc-devices/eeprom
  F:    drivers/misc/eeprom/eeprom.c
  
 +LEGO MINDSTORMS EV3
 +R:    David Lechner <david@lechnology.com>
 +S:    Maintained
 +F:    arch/arm/boot/dts/da850-lego-ev3.dts
 +F:    Documentation/devicetree/bindings/power/supply/lego_ev3_battery.txt
 +F:    drivers/power/supply/lego_ev3_battery.c
 +
  LEGO USB Tower driver
  M:    Juergen Stuber <starblue@users.sourceforge.net>
  L:    legousb-devel@lists.sourceforge.net
@@@ -8306,7 -8203,7 +8306,7 @@@ F:      drivers/misc/lkdtm/
  
  LINUX KERNEL MEMORY CONSISTENCY MODEL (LKMM)
  M:    Alan Stern <stern@rowland.harvard.edu>
 -M:    Andrea Parri <parri.andrea@gmail.com>
 +M:    Andrea Parri <andrea.parri@amarulasolutions.com>
  M:    Will Deacon <will.deacon@arm.com>
  M:    Peter Zijlstra <peterz@infradead.org>
  M:    Boqun Feng <boqun.feng@gmail.com>
@@@ -8413,7 -8310,6 +8413,7 @@@ F:      Documentation/admin-guide/LSM/LoadPi
  LOCKING PRIMITIVES
  M:    Peter Zijlstra <peterz@infradead.org>
  M:    Ingo Molnar <mingo@redhat.com>
 +M:    Will Deacon <will.deacon@arm.com>
  L:    linux-kernel@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking/core
  S:    Maintained
@@@ -8448,6 -8344,7 +8448,6 @@@ L:      linux-scsi@vger.kernel.or
  W:    http://www.avagotech.com/support/
  S:    Supported
  F:    drivers/message/fusion/
 -F:    drivers/scsi/mpt2sas/
  F:    drivers/scsi/mpt3sas/
  
  LSILOGIC/SYMBIOS/NCR 53C8XX and 53C1010 PCI-SCSI drivers
@@@ -8569,7 -8466,6 +8569,7 @@@ M:      Vivien Didelot <vivien.didelot@savoi
  L:    netdev@vger.kernel.org
  S:    Maintained
  F:    drivers/net/dsa/mv88e6xxx/
 +F:    linux/platform_data/mv88e6xxx.h
  F:    Documentation/devicetree/bindings/net/dsa/marvell.txt
  
  MARVELL ARMADA DRM SUPPORT
@@@ -8927,7 -8823,6 +8927,7 @@@ L:      linux-media@vger.kernel.or
  L:    linux-renesas-soc@vger.kernel.org
  T:    git git://linuxtv.org/media_tree.git
  S:    Supported
 +F:    Documentation/devicetree/bindings/media/renesas,rcar-csi2.txt
  F:    Documentation/devicetree/bindings/media/rcar_vin.txt
  F:    drivers/media/platform/rcar-vin/
  
@@@ -9054,13 -8949,6 +9054,13 @@@ L:    linux-wireless@vger.kernel.or
  S:    Maintained
  F:    drivers/net/wireless/mediatek/mt7601u/
  
 +MEDIATEK NAND CONTROLLER DRIVER
 +M:    Xiaolei Li <xiaolei.li@mediatek.com>
 +L:    linux-mtd@lists.infradead.org
 +S:    Maintained
 +F:    drivers/mtd/nand/raw/mtk_*
 +F:    Documentation/devicetree/bindings/mtd/mtk-nand.txt
 +
  MEDIATEK RANDOM NUMBER GENERATOR SUPPORT
  M:    Sean Wang <sean.wang@mediatek.com>
  S:    Maintained
@@@ -9131,18 -9019,18 +9131,18 @@@ W:   http://www.mellanox.co
  Q:    http://patchwork.ozlabs.org/project/netdev/list/
  F:    drivers/net/ethernet/mellanox/mlx5/core/en_*
  
 -MELLANOX ETHERNET INNOVA DRIVER
 -M:    Ilan Tayari <ilant@mellanox.com>
 +MELLANOX ETHERNET INNOVA DRIVERS
  R:    Boris Pismenny <borisp@mellanox.com>
  L:    netdev@vger.kernel.org
  S:    Supported
  W:    http://www.mellanox.com
  Q:    http://patchwork.ozlabs.org/project/netdev/list/
 +F:    drivers/net/ethernet/mellanox/mlx5/core/en_accel/*
 +F:    drivers/net/ethernet/mellanox/mlx5/core/accel/*
  F:    drivers/net/ethernet/mellanox/mlx5/core/fpga/*
  F:    include/linux/mlx5/mlx5_ifc_fpga.h
  
  MELLANOX ETHERNET INNOVA IPSEC DRIVER
 -M:    Ilan Tayari <ilant@mellanox.com>
  R:    Boris Pismenny <borisp@mellanox.com>
  L:    netdev@vger.kernel.org
  S:    Supported
@@@ -9198,6 -9086,7 +9198,6 @@@ F:      include/uapi/rdma/mlx4-abi.
  
  MELLANOX MLX5 core VPI driver
  M:    Saeed Mahameed <saeedm@mellanox.com>
 -M:    Matan Barak <matanb@mellanox.com>
  M:    Leon Romanovsky <leonro@mellanox.com>
  L:    netdev@vger.kernel.org
  L:    linux-rdma@vger.kernel.org
@@@ -9208,6 -9097,7 +9208,6 @@@ F:      drivers/net/ethernet/mellanox/mlx5/c
  F:    include/linux/mlx5/
  
  MELLANOX MLX5 IB driver
 -M:    Matan Barak <matanb@mellanox.com>
  M:    Leon Romanovsky <leonro@mellanox.com>
  L:    linux-rdma@vger.kernel.org
  W:    http://www.mellanox.com
@@@ -9398,12 -9288,6 +9398,12 @@@ F:    include/linux/cciss*.
  F:    include/uapi/linux/cciss*.h
  F:    Documentation/scsi/smartpqi.txt
  
 +MICROSEMI ETHERNET SWITCH DRIVER
 +M:    Alexandre Belloni <alexandre.belloni@bootlin.com>
 +L:    netdev@vger.kernel.org
 +S:    Supported
 +F:    drivers/net/ethernet/mscc/
 +
  MICROSOFT SURFACE PRO 3 BUTTON DRIVER
  M:    Chen Yu <yu.c.chen@intel.com>
  L:    platform-driver-x86@vger.kernel.org
@@@ -9517,13 -9401,6 +9517,13 @@@ Q:    http://patchwork.linuxtv.org/project
  S:    Maintained
  F:    drivers/media/dvb-frontends/mn88473*
  
 +PCI DRIVER FOR MOBIVEIL PCIE IP
 +M:    Subrahmanya Lingappa <l.subrahmanya@mobiveil.co.in>
 +L:    linux-pci@vger.kernel.org
 +S:    Supported
 +F:    Documentation/devicetree/bindings/pci/mobiveil-pcie.txt
 +F:    drivers/pci/host/pcie-mobiveil.c
 +
  MODULE SUPPORT
  M:    Jessica Yu <jeyu@kernel.org>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux.git modules-next
@@@ -9705,7 -9582,6 +9705,7 @@@ F:      drivers/net/ethernet/myricom/myri10g
  
  NAND FLASH SUBSYSTEM
  M:    Boris Brezillon <boris.brezillon@bootlin.com>
 +M:    Miquel Raynal <miquel.raynal@bootlin.com>
  R:    Richard Weinberger <richard@nod.at>
  L:    linux-mtd@lists.infradead.org
  W:    http://www.linux-mtd.infradead.org/
@@@ -9761,14 -9637,6 +9761,14 @@@ S:    Maintaine
  F:    Documentation/hwmon/nct6775
  F:    drivers/hwmon/nct6775.c
  
 +NET_FAILOVER MODULE
 +M:    Sridhar Samudrala <sridhar.samudrala@intel.com>
 +L:    netdev@vger.kernel.org
 +S:    Supported
 +F:    driver/net/net_failover.c
 +F:    include/net/net_failover.h
 +F:    Documentation/networking/net_failover.rst
 +
  NETEFFECT IWARP RNIC DRIVER (IW_NES)
  M:    Faisal Latif <faisal.latif@intel.com>
  L:    linux-rdma@vger.kernel.org
@@@ -9830,7 -9698,7 +9830,7 @@@ S:      Maintaine
  F:    drivers/net/ethernet/netronome/
  
  NETWORK BLOCK DEVICE (NBD)
 -M:    Josef Bacik <jbacik@fb.com>
 +M:    Josef Bacik <josef@toxicpanda.com>
  S:    Maintained
  L:    linux-block@vger.kernel.org
  L:    nbd@other.debian.org
@@@ -9962,21 -9830,8 +9962,21 @@@ F:    net/ipv6/calipso.
  F:    net/netfilter/xt_CONNSECMARK.c
  F:    net/netfilter/xt_SECMARK.c
  
 +NETWORKING [TCP]
 +M:    Eric Dumazet <edumazet@google.com>
 +L:    netdev@vger.kernel.org
 +S:    Maintained
 +F:    net/ipv4/tcp*.c
 +F:    net/ipv4/syncookies.c
 +F:    net/ipv6/tcp*.c
 +F:    net/ipv6/syncookies.c
 +F:    include/uapi/linux/tcp.h
 +F:    include/net/tcp.h
 +F:    include/linux/tcp.h
 +F:    include/trace/events/tcp.h
 +
  NETWORKING [TLS]
 -M:    Ilya Lesokhin <ilyal@mellanox.com>
 +M:    Boris Pismenny <borisp@mellanox.com>
  M:    Aviad Yehezkel <aviadye@mellanox.com>
  M:    Dave Watson <davejwatson@fb.com>
  L:    netdev@vger.kernel.org
@@@ -10499,7 -10354,6 +10499,7 @@@ T:   git git://linuxtv.org/media_tree.gi
  S:    Odd fixes
  F:    drivers/media/i2c/ov772x.c
  F:    include/media/i2c/ov772x.h
 +F:    Documentation/devicetree/bindings/media/i2c/ov772x.txt
  
  OMNIVISION OV7740 SENSOR DRIVER
  M:    Wenyou Yang <wenyou.yang@microchip.com>
@@@ -10550,14 -10404,12 +10550,14 @@@ F:        drivers/infiniband/ulp/opa_vni
  
  OPEN FIRMWARE AND DEVICE TREE OVERLAYS
  M:    Pantelis Antoniou <pantelis.antoniou@konsulko.com>
 +M:    Frank Rowand <frowand.list@gmail.com>
  L:    devicetree@vger.kernel.org
  S:    Maintained
  F:    Documentation/devicetree/dynamic-resolution-notes.txt
  F:    Documentation/devicetree/overlay-notes.txt
  F:    drivers/of/overlay.c
  F:    drivers/of/resolver.c
 +K:    of_overlay_notifier_
  
  OPEN FIRMWARE AND FLATTENED DEVICE TREE
  M:    Rob Herring <robh+dt@kernel.org>
@@@ -10869,9 -10721,9 +10869,9 @@@ F:   Documentation/devicetree/bindings/pc
  F:    drivers/pci/cadence/pcie-cadence*
  
  PCI DRIVER FOR FREESCALE LAYERSCAPE
 -M:    Minghuan Lian <minghuan.Lian@freescale.com>
 -M:    Mingkai Hu <mingkai.hu@freescale.com>
 -M:    Roy Zang <tie-fei.zang@freescale.com>
 +M:    Minghuan Lian <minghuan.Lian@nxp.com>
 +M:    Mingkai Hu <mingkai.hu@nxp.com>
 +M:    Roy Zang <roy.zang@nxp.com>
  L:    linuxppc-dev@lists.ozlabs.org
  L:    linux-pci@vger.kernel.org
  L:    linux-arm-kernel@lists.infradead.org
@@@ -11097,8 -10949,8 +11097,8 @@@ M:   Shawn Lin <shawn.lin@rock-chips.com
  L:    linux-pci@vger.kernel.org
  L:    linux-rockchip@lists.infradead.org
  S:    Maintained
 -F:    Documentation/devicetree/bindings/pci/rockchip-pcie.txt
 -F:    drivers/pci/host/pcie-rockchip.c
 +F:    Documentation/devicetree/bindings/pci/rockchip-pcie*
 +F:    drivers/pci/host/pcie-rockchip*
  
  PCI DRIVER FOR V3 SEMICONDUCTOR V360EPC
  M:    Linus Walleij <linus.walleij@linaro.org>
@@@ -11261,7 -11113,6 +11261,7 @@@ L:   linux-mediatek@lists.infradead.org (
  S:    Maintained
  F:    Documentation/devicetree/bindings/pinctrl/pinctrl-mt65xx.txt
  F:    Documentation/devicetree/bindings/pinctrl/pinctrl-mt7622.txt
 +F:    drivers/pinctrl/mediatek/mtk-eint.*
  F:    drivers/pinctrl/mediatek/pinctrl-mtk-common.*
  F:    drivers/pinctrl/mediatek/pinctrl-mt2701.c
  F:    drivers/pinctrl/mediatek/pinctrl-mt7622.c
@@@ -11400,7 -11251,6 +11400,7 @@@ M:   Sebastian Reichel <sre@kernel.org
  L:    linux-pm@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git
  S:    Maintained
 +F:    Documentation/ABI/testing/sysfs-class-power
  F:    Documentation/devicetree/bindings/power/supply/
  F:    include/linux/power_supply.h
  F:    drivers/power/supply/
@@@ -11546,6 -11396,7 +11546,6 @@@ S:   Maintaine
  W:    http://linuxptp.sourceforge.net/
  F:    Documentation/ABI/testing/sysfs-ptp
  F:    Documentation/ptp/*
 -F:    drivers/net/ethernet/freescale/gianfar_ptp.c
  F:    drivers/net/phy/dp83640*
  F:    drivers/ptp/*
  F:    include/linux/ptp_cl*
@@@ -11780,7 -11631,7 +11780,7 @@@ S:   Maintaine
  F:    drivers/media/tuners/qt1010*
  
  QUALCOMM ATHEROS ATH10K WIRELESS DRIVER
 -M:    Kalle Valo <kvalo@qca.qualcomm.com>
 +M:    Kalle Valo <kvalo@codeaurora.org>
  L:    ath10k@lists.infradead.org
  W:    http://wireless.kernel.org/en/users/Drivers/ath10k
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
@@@ -11802,13 -11653,6 +11802,13 @@@ F: Documentation/devicetree/bindings/me
  F:    Documentation/media/v4l-drivers/qcom_camss.rst
  F:    drivers/media/platform/qcom/camss-8x16/
  
 +QUALCOMM CPUFREQ DRIVER MSM8996/APQ8096
 +M:  Ilia Lin <ilia.lin@gmail.com>
 +L:  linux-pm@vger.kernel.org
 +S:  Maintained
 +F:  Documentation/devicetree/bindings/opp/kryo-cpufreq.txt
 +F:  drivers/cpufreq/qcom-cpufreq-kryo.c
 +
  QUALCOMM EMAC GIGABIT ETHERNET DRIVER
  M:    Timur Tabi <timur@codeaurora.org>
  L:    netdev@vger.kernel.org
@@@ -11822,14 -11666,6 +11822,14 @@@ T: git git://git.kernel.org/pub/scm/lin
  S:    Supported
  F:    arch/hexagon/
  
 +QUALCOMM HIDMA DRIVER
 +M:    Sinan Kaya <okaya@codeaurora.org>
 +L:    linux-arm-kernel@lists.infradead.org
 +L:    linux-arm-msm@vger.kernel.org
 +L:    dmaengine@vger.kernel.org
 +S:    Supported
 +F:    drivers/dma/qcom/hidma*
 +
  QUALCOMM IOMMU
  M:    Rob Clark <robdclark@gmail.com>
  L:    iommu@lists.linux-foundation.org
@@@ -11846,7 -11682,7 +11846,7 @@@ S:   Maintaine
  F:    drivers/media/platform/qcom/venus/
  
  QUALCOMM WCN36XX WIRELESS DRIVER
 -M:    Eugene Krasnikov <k.eugene.e@gmail.com>
 +M:    Kalle Valo <kvalo@codeaurora.org>
  L:    wcn36xx@lists.infradead.org
  W:    http://wireless.kernel.org/en/users/Drivers/wcn36xx
  T:    git git://github.com/KrasnikovEugene/wcn36xx.git
@@@ -12041,7 -11877,7 +12041,7 @@@ F:   include/linux/rtc.
  F:    include/uapi/linux/rtc.h
  F:    include/linux/rtc/
  F:    include/linux/platform_data/rtc-*
 -F:    tools/testing/selftests/timers/rtctest.c
 +F:    tools/testing/selftests/rtc/
  
  REALTEK AUDIO CODECS
  M:    Bard Liao <bardliao@realtek.com>
@@@ -12135,18 -11971,6 +12135,18 @@@ F: include/dt-bindings/reset
  F:    include/linux/reset.h
  F:    include/linux/reset-controller.h
  
 +RESTARTABLE SEQUENCES SUPPORT
 +M:    Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
 +M:    Peter Zijlstra <peterz@infradead.org>
 +M:    "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
 +M:    Boqun Feng <boqun.feng@gmail.com>
 +L:    linux-kernel@vger.kernel.org
 +S:    Supported
 +F:    kernel/rseq.c
 +F:    include/uapi/linux/rseq.h
 +F:    include/trace/events/rseq.h
 +F:    tools/testing/selftests/rseq/
 +
  RFKILL
  M:    Johannes Berg <johannes@sipsolutions.net>
  L:    linux-wireless@vger.kernel.org
@@@ -12396,7 -12220,7 +12396,7 @@@ F:   Documentation/s390/vfio-ccw.tx
  F:    include/uapi/linux/vfio_ccw.h
  
  S390 ZCRYPT DRIVER
 -M:    Harald Freudenberger <freude@de.ibm.com>
 +M:    Harald Freudenberger <freude@linux.ibm.com>
  L:    linux-s390@vger.kernel.org
  W:    http://www.ibm.com/developerworks/linux/linux390/
  S:    Supported
@@@ -13236,13 -13060,6 +13236,13 @@@ S: Maintaine
  F:    drivers/ssb/
  F:    include/linux/ssb/
  
 +SONY IMX258 SENSOR DRIVER
 +M:    Sakari Ailus <sakari.ailus@linux.intel.com>
 +L:    linux-media@vger.kernel.org
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/i2c/imx258.c
 +
  SONY IMX274 SENSOR DRIVER
  M:    Leon Luo <leonl@leopardimaging.com>
  L:    linux-media@vger.kernel.org
@@@ -13287,7 -13104,7 +13287,7 @@@ F:   include/uapi/sound
  F:    sound/
  
  SOUND - COMPRESSED AUDIO
 -M:    Vinod Koul <vinod.koul@intel.com>
 +M:    Vinod Koul <vkoul@kernel.org>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
  S:    Supported
@@@ -13447,18 -13264,19 +13447,18 @@@ M:        Jan-Benedict Glaw <jbglaw@lug-owl.de
  S:    Maintained
  F:    arch/alpha/kernel/srm_env.c
  
 +ST STM32 I2C/SMBUS DRIVER
 +M:    Pierre-Yves MORDRET <pierre-yves.mordret@st.com>
 +L:    linux-i2c@vger.kernel.org
 +S:    Maintained
 +F:    drivers/i2c/busses/i2c-stm32*
 +
  STABLE BRANCH
  M:    Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  L:    stable@vger.kernel.org
  S:    Supported
  F:    Documentation/process/stable-kernel-rules.rst
  
 -STAGING - ATOMISP DRIVER
 -M:    Alan Cox <alan@linux.intel.com>
 -M:    Sakari Ailus <sakari.ailus@linux.intel.com>
 -L:    linux-media@vger.kernel.org
 -S:    Maintained
 -F:    drivers/staging/media/atomisp/
 -
  STAGING - COMEDI
  M:    Ian Abbott <abbotti@mev.co.uk>
  M:    H Hartley Sweeten <hsweeten@visionengravers.com>
@@@ -13477,6 -13295,15 +13477,6 @@@ S:  Odd Fixe
  F:    Documentation/devicetree/bindings/staging/iio/
  F:    drivers/staging/iio/
  
 -STAGING - LUSTRE PARALLEL FILESYSTEM
 -M:    Oleg Drokin <oleg.drokin@intel.com>
 -M:    Andreas Dilger <andreas.dilger@intel.com>
 -M:    James Simmons <jsimmons@infradead.org>
 -L:    lustre-devel@lists.lustre.org (moderated for non-subscribers)
 -W:    http://wiki.lustre.org/
 -S:    Maintained
 -F:    drivers/staging/lustre
 -
  STAGING - NVIDIA COMPLIANT EMBEDDED CONTROLLER INTERFACE (nvec)
  M:    Marc Dietrich <marvin24@gmx.de>
  L:    ac100@lists.launchpad.net (moderated for non-subscribers)
@@@ -13564,20 -13391,9 +13564,20 @@@ T: git git://linuxtv.org/media_tree.gi
  S:    Maintained
  F:    drivers/media/usb/stk1160/
  
 +STM32 TIMER/LPTIMER DRIVERS
 +M:    Fabrice Gasnier <fabrice.gasnier@st.com>
 +S:    Maintained
 +F:    drivers/*/stm32-*timer*
 +F:    drivers/pwm/pwm-stm32*
 +F:    include/linux/*/stm32-*tim*
 +F:    Documentation/ABI/testing/*timer-stm32
 +F:    Documentation/devicetree/bindings/*/stm32-*timer
 +F:    Documentation/devicetree/bindings/pwm/pwm-stm32*
 +
  STMMAC ETHERNET DRIVER
  M:    Giuseppe Cavallaro <peppe.cavallaro@st.com>
  M:    Alexandre Torgue <alexandre.torgue@st.com>
 +M:    Jose Abreu <joabreu@synopsys.com>
  L:    netdev@vger.kernel.org
  W:    http://www.stlinux.com
  S:    Supported
@@@ -13654,12 -13470,6 +13654,12 @@@ S: Supporte
  F:    net/switchdev/
  F:    include/net/switchdev.h
  
 +SY8106A REGULATOR DRIVER
 +M:    Icenowy Zheng <icenowy@aosc.io>
 +S:    Maintained
 +F:    drivers/regulator/sy8106a-regulator.c
 +F:    Documentation/devicetree/bindings/regulator/sy8106a-regulator.txt
 +
  SYNC FILE FRAMEWORK
  M:    Sumit Semwal <sumit.semwal@linaro.org>
  R:    Gustavo Padovan <gustavo@padovan.org>
@@@ -14554,15 -14364,6 +14554,15 @@@ S: Maintaine
  F:    drivers/tc/
  F:    include/linux/tc.h
  
 +TURBOSTAT UTILITY
 +M:    "Len Brown" <lenb@kernel.org>
 +L:    linux-pm@vger.kernel.org
 +B:    https://bugzilla.kernel.org
 +Q:    https://patchwork.kernel.org/project/linux-pm/list/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git turbostat
 +S:    Supported
 +F:    tools/power/x86/turbostat/
 +
  TW5864 VIDEO4LINUX DRIVER
  M:    Bluecherry Maintainers <maintainers@bluecherrydvr.com>
  M:    Anton Sviridenko <anton@corp.bluecherry.net>
@@@ -14809,9 -14610,7 +14809,9 @@@ M:   Woojung Huh <woojung.huh@microchip.c
  M:    Microchip Linux Driver Support <UNGLinuxDriver@microchip.com>
  L:    netdev@vger.kernel.org
  S:    Maintained
 +F:    Documentation/devicetree/bindings/net/microchip,lan78xx.txt
  F:    drivers/net/usb/lan78xx.*
 +F:    include/dt-bindings/net/microchip-lan78xx.h
  
  USB MASS STORAGE DRIVER
  M:    Alan Stern <stern@rowland.harvard.edu>
@@@ -14855,7 -14654,6 +14855,7 @@@ S:   Maintaine
  F:    Documentation/usb/usbip_protocol.txt
  F:    drivers/usb/usbip/
  F:    tools/usb/usbip/
 +F:    tools/testing/selftests/drivers/usb/usbip/
  
  USB PEGASUS DRIVER
  M:    Petko Manolov <petkan@nucleusys.com>
@@@ -15128,12 -14926,6 +15128,12 @@@ L: linux-media@vger.kernel.or
  S:    Maintained
  F:    drivers/media/platform/video-mux.c
  
 +VIDEO I2C POLLING DRIVER
 +M:    Matt Ranostay <matt.ranostay@konsulko.com>
 +L:    linux-media@vger.kernel.org
 +S:    Maintained
 +F:    drivers/media/i2c/video-i2c.c
 +
  VIDEOBUF2 FRAMEWORK
  M:    Pawel Osciak <pawel@osciak.com>
  M:    Marek Szyprowski <m.szyprowski@samsung.com>
@@@ -15606,14 -15398,6 +15606,14 @@@ T: git git://linuxtv.org/media_tree.gi
  S:    Maintained
  F:    drivers/media/tuners/tuner-xc2028.*
  
 +XDP SOCKETS (AF_XDP)
 +M:    Björn Töpel <bjorn.topel@intel.com>
 +M:    Magnus Karlsson <magnus.karlsson@intel.com>
 +L:    netdev@vger.kernel.org
 +S:    Maintained
 +F:    kernel/bpf/xskmap.c
 +F:    net/xdp/
 +
  XEN BLOCK SUBSYSTEM
  M:    Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
  M:    Roger Pau Monné <roger.pau@citrix.com>
@@@ -15684,13 -15468,6 +15684,13 @@@ S: Supporte
  F:    arch/x86/xen/*swiotlb*
  F:    drivers/xen/*swiotlb*
  
 +XEN SOUND FRONTEND DRIVER
 +M:    Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
 +L:    xen-devel@lists.xenproject.org (moderated for non-subscribers)
 +L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
 +S:    Supported
 +F:    sound/xen/*
 +
  XFS FILESYSTEM
  M:    Darrick J. Wong <darrick.wong@oracle.com>
  M:    linux-xfs@vger.kernel.org
@@@ -15729,14 -15506,6 +15729,14 @@@ L: linux-kernel@vger.kernel.or
  S:    Supported
  F:    drivers/char/xillybus/
  
 +XLP9XX I2C DRIVER
 +M:    George Cherian <george.cherian@cavium.com>
 +M:    Jan Glauber <jglauber@cavium.com>
 +L:    linux-i2c@vger.kernel.org
 +W:    http://www.cavium.com
 +S:    Supported
 +F:    drivers/i2c/busses/i2c-xlp9xx.c
 +
  XRA1403 GPIO EXPANDER
  M:    Nandor Han <nandor.han@ge.com>
  M:    Semi Malinen <semi.malinen@ge.com>
@@@ -15831,7 -15600,7 +15831,7 @@@ L:   linux-media@vger.kernel.or
  W:    http://mjpeg.sourceforge.net/driver-zoran/
  T:    hg https://linuxtv.org/hg/v4l-dvb
  S:    Odd Fixes
 -F:    drivers/media/pci/zoran/
 +F:    drivers/staging/media/zoran/
  
  ZRAM COMPRESSED RAM BLOCK DEVICE DRVIER
  M:    Minchan Kim <minchan@kernel.org>
@@@ -15855,7 -15624,7 +15855,7 @@@ L:   linux-mm@kvack.or
  S:    Maintained
  F:    mm/zsmalloc.c
  F:    include/linux/zsmalloc.h
 -F:    Documentation/vm/zsmalloc.txt
 +F:    Documentation/vm/zsmalloc.rst
  
  ZSWAP COMPRESSED SWAP CACHING
  M:    Seth Jennings <sjenning@redhat.com>

diff --combined arch/arm/boot/dts/Makefile
index 19124f0,17e7812..37a3de7
--- 1/arch/arm/boot/dts/Makefile
--- 2/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -75,7 -75,6 +75,7 @@@ dtb-$(CONFIG_ARCH_BCM2835) += 
        bcm2835-rpi-a-plus.dtb \
        bcm2836-rpi-2-b.dtb \
        bcm2837-rpi-3-b.dtb \
 +      bcm2837-rpi-3-b-plus.dtb \
        bcm2835-rpi-zero.dtb \
        bcm2835-rpi-zero-w.dtb
  dtb-$(CONFIG_ARCH_BCM_5301X) += \
@@@ -103,10 -102,8 +103,10 @@@
        bcm47094-dlink-dir-885l.dtb \
        bcm47094-linksys-panamera.dtb \
        bcm47094-luxul-abr-4500.dtb \
 +      bcm47094-luxul-xap-1610.dtb \
        bcm47094-luxul-xbr-4500.dtb \
        bcm47094-luxul-xwr-3100.dtb \
 +      bcm47094-luxul-xwr-3150-v1.dtb \
        bcm47094-netgear-r8500.dtb \
        bcm94708.dtb \
        bcm94709.dtb \
@@@ -143,7 -140,6 +143,7 @@@ dtb-$(CONFIG_ARCH_BCM_NSP) += 
  dtb-$(CONFIG_ARCH_BERLIN) += \
        berlin2-sony-nsz-gs7.dtb \
        berlin2cd-google-chromecast.dtb \
 +      berlin2cd-valve-steamlink.dtb \
        berlin2q-marvell-dmp.dtb
  dtb-$(CONFIG_ARCH_BRCMSTB) += \
        bcm7445-bcm97445svmb.dtb
@@@ -194,6 -190,8 +194,6 @@@ dtb-$(CONFIG_ARCH_EXYNOS5) += 
        exynos5422-odroidxu3.dtb \
        exynos5422-odroidxu3-lite.dtb \
        exynos5422-odroidxu4.dtb \
 -      exynos5440-sd5v1.dtb \
 -      exynos5440-ssdk5440.dtb \
        exynos5800-peach-pi.dtb
  dtb-$(CONFIG_ARCH_GEMINI) += \
        gemini-dlink-dir-685.dtb \
@@@ -314,14 -312,14 +314,14 @@@ dtb-$(CONFIG_ARCH_NPCM7XX) += 
  dtb-$(CONFIG_MACH_MESON6) += \
        meson6-atv1200.dtb
  dtb-$(CONFIG_MACH_MESON8) += \
 -      meson8-minix-neo-x8.dtb
 +      meson8-minix-neo-x8.dtb \
 +      meson8b-mxq.dtb \
 +      meson8b-odroidc1.dtb \
 +      meson8m2-mxiii-plus.dtb
  dtb-$(CONFIG_ARCH_MMP) += \
        pxa168-aspenite.dtb \
        pxa910-dkb.dtb \
        mmp2-brownstone.dtb
 -dtb-$(CONFIG_MACH_MESON8B) += \
 -      meson8b-mxq.dtb \
 -      meson8b-odroidc1.dtb
  dtb-$(CONFIG_ARCH_MPS2) += \
        mps2-an385.dtb \
        mps2-an399.dtb
@@@ -401,7 -399,6 +401,7 @@@ dtb-$(CONFIG_SOC_IMX6Q) += 
        imx6dl-hummingboard2-som-v15.dtb \
        imx6dl-icore.dtb \
        imx6dl-icore-rqs.dtb \
 +      imx6dl-mamoj.dtb \
        imx6dl-nit6xlite.dtb \
        imx6dl-nitrogen6x.dtb \
        imx6dl-phytec-mira-rdk-nand.dtb \
@@@ -442,7 -439,6 +442,7 @@@
        imx6q-cubox-i-emmc-som-v15.dtb \
        imx6q-cubox-i-som-v15.dtb \
        imx6q-dfi-fs700-m60.dtb \
 +      imx6q-dhcom-pdk2.dtb \
        imx6q-display5-tianma-tm070-1280x768.dtb \
        imx6q-dmo-edmqmx6.dtb \
        imx6q-dms-ba16.dtb \
@@@ -467,11 -463,9 +467,11 @@@
        imx6q-hummingboard2-emmc-som-v15.dtb \
        imx6q-hummingboard2-som-v15.dtb \
        imx6q-icore.dtb \
 +      imx6q-icore-mipi.dtb \
        imx6q-icore-ofcap10.dtb \
        imx6q-icore-ofcap12.dtb \
        imx6q-icore-rqs.dtb \
 +      imx6q-kp-tpc.dtb \
        imx6q-marsboard.dtb \
        imx6q-mccmon6.dtb \
        imx6q-nitrogen6x.dtb \
@@@ -694,7 -688,6 +694,7 @@@ dtb-$(CONFIG_SOC_AM33XX) += 
        am335x-pdu001.dtb \
        am335x-pepper.dtb \
        am335x-phycore-rdk.dtb \
 +      am335x-pocketbeagle.dtb \
        am335x-shc.dtb \
        am335x-sbc-t335.dtb \
        am335x-sl50.dtb \
@@@ -767,17 -760,12 +767,17 @@@ dtb-$(CONFIG_ARCH_QCOM) += 
        qcom-apq8084-ifc6540.dtb \
        qcom-apq8084-mtp.dtb \
        qcom-ipq4019-ap.dk01.1-c1.dtb \
 +      qcom-ipq4019-ap.dk04.1-c1.dtb \
 +      qcom-ipq4019-ap.dk04.1-c3.dtb \
 +      qcom-ipq4019-ap.dk07.1-c1.dtb \
 +      qcom-ipq4019-ap.dk07.1-c2.dtb \
        qcom-ipq8064-ap148.dtb \
        qcom-msm8660-surf.dtb \
        qcom-msm8960-cdp.dtb \
        qcom-msm8974-fairphone-fp2.dtb \
        qcom-msm8974-lge-nexus5-hammerhead.dtb \
        qcom-msm8974-samsung-klte.dtb \
 +      qcom-msm8974-sony-xperia-amami.dtb \
        qcom-msm8974-sony-xperia-castor.dtb \
        qcom-msm8974-sony-xperia-honami.dtb \
        qcom-mdm9615-wp8548-mangoh-green.dtb
@@@ -807,6 -795,7 +807,7 @@@ dtb-$(CONFIG_ARCH_RENESAS) += 
        r8a7745-iwg22d-sodimm.dtb \
        r8a7745-iwg22d-sodimm-dbhd-ca.dtb \
        r8a7745-sk-rzg1e.dtb \
+       r8a77470-iwg23s-sbc.dtb \
        r8a7778-bockw.dtb \
        r8a7779-marzen.dtb \
        r8a7790-lager.dtb \
@@@ -971,7 -960,6 +972,7 @@@ dtb-$(CONFIG_MACH_SUN7I) += 
        sun7i-a20-m3.dtb \
        sun7i-a20-mk808c.dtb \
        sun7i-a20-olimex-som-evb.dtb \
 +      sun7i-a20-olimex-som-evb-emmc.dtb \
        sun7i-a20-olimex-som204-evb.dtb \
        sun7i-a20-olimex-som204-evb-emmc.dtb \
        sun7i-a20-olinuxino-lime.dtb \
@@@ -1005,9 -993,8 +1006,9 @@@ dtb-$(CONFIG_MACH_SUN8I) += 
        sun8i-a83t-bananapi-m3.dtb \
        sun8i-a83t-cubietruck-plus.dtb \
        sun8i-a83t-tbs-a711.dtb \
 -      sun8i-h2-plus-orangepi-r1.dtb \
        sun8i-h2-plus-bananapi-m2-zero.dtb \
 +      sun8i-h2-plus-libretech-all-h3-cc.dtb \
 +      sun8i-h2-plus-orangepi-r1.dtb \
        sun8i-h2-plus-orangepi-zero.dtb \
        sun8i-h3-bananapi-m2-plus.dtb \
        sun8i-h3-beelink-x2.dtb \
@@@ -1024,8 -1011,6 +1025,8 @@@
        sun8i-h3-orangepi-plus.dtb \
        sun8i-h3-orangepi-plus2e.dtb \
        sun8i-r16-bananapi-m2m.dtb \
 +      sun8i-r16-nintendo-nes-classic.dtb \
 +      sun8i-r16-nintendo-super-nes-classic.dtb \
        sun8i-r16-parrot.dtb \
        sun8i-r40-bananapi-m2-ultra.dtb \
        sun8i-v3s-licheepi-zero.dtb \
@@@ -1070,7 -1055,9 +1071,7 @@@ dtb-$(CONFIG_ARCH_U8500) += 
        ste-hrefprev60-stuib.dtb \
        ste-hrefprev60-tvk.dtb \
        ste-hrefv60plus-stuib.dtb \
 -      ste-hrefv60plus-tvk.dtb \
 -      ste-ccu8540.dtb \
 -      ste-ccu9540.dtb
 +      ste-hrefv60plus-tvk.dtb
  dtb-$(CONFIG_ARCH_UNIPHIER) += \
        uniphier-ld4-ref.dtb \
        uniphier-ld6b-ref.dtb \
@@@ -1164,9 -1151,6 +1165,9 @@@ dtb-$(CONFIG_ARCH_MEDIATEK) += 
        mt6580-evbp1.dtb \
        mt6589-aquaris5.dtb \
        mt6592-evb.dtb \
 +      mt7623a-rfb-emmc.dtb \
 +      mt7623a-rfb-nand.dtb \
 +      mt7623n-rfb-emmc.dtb \
        mt7623n-rfb-nand.dtb \
        mt7623n-bananapi-bpi-r2.dtb \
        mt8127-moose.dtb \
@@@ -1175,11 -1159,8 +1176,11 @@@ dtb-$(CONFIG_ARCH_ZX) += zx296702-ad1.d
  dtb-$(CONFIG_ARCH_ASPEED) += \
        aspeed-ast2500-evb.dtb \
        aspeed-bmc-arm-centriq2400-rep.dtb \
 +      aspeed-bmc-intel-s2600wf.dtb \
 +      aspeed-bmc-opp-lanyang.dtb \
        aspeed-bmc-opp-palmetto.dtb \
        aspeed-bmc-opp-romulus.dtb \
        aspeed-bmc-opp-witherspoon.dtb \
        aspeed-bmc-opp-zaius.dtb \
 +      aspeed-bmc-portwell-neptune.dtb \
        aspeed-bmc-quanta-q71l.dtb

diff --combined arch/arm/boot/dts/r8a7790-lager.dts
index f07f901,d1e582b..092610e
--- 1/arch/arm/boot/dts/r8a7790-lager.dts
--- 2/arch/arm/boot/dts/r8a7790-lager.dts
+++ b/arch/arm/boot/dts/r8a7790-lager.dts
@@@ -379,7 -379,7 +379,7 @@@
                                port@0 {
                                        reg = <0>;
                                        adv7511_in: endpoint {
 -                                              remote-endpoint = <&du_out_lvds0>;
 +                                              remote-endpoint = <&lvds0_out>;
                                        };
                                };
  
@@@ -467,8 -467,10 +467,8 @@@
        status = "okay";
  
        clocks = <&cpg CPG_MOD 724>, <&cpg CPG_MOD 723>, <&cpg CPG_MOD 722>,
 -               <&cpg CPG_MOD 726>, <&cpg CPG_MOD 725>,
                 <&x13_clk>, <&x2_clk>;
 -      clock-names = "du.0", "du.1", "du.2", "lvds.0", "lvds.1",
 -                    "dclkin.0", "dclkin.1";
 +      clock-names = "du.0", "du.1", "du.2", "dclkin.0", "dclkin.1";
  
        ports {
                port@0 {
@@@ -476,26 -478,12 +476,26 @@@
                                remote-endpoint = <&adv7123_in>;
                        };
                };
 +      };
 +};
 +
 +&lvds0 {
 +      status = "okay";
 +
 +      ports {
                port@1 {
                        endpoint {
                                remote-endpoint = <&adv7511_in>;
                        };
                };
 -              port@2 {
 +      };
 +};
 +
 +&lvds1 {
 +      status = "okay";
 +
 +      ports {
 +              port@1 {
                        lvds_connector: endpoint {
                        };
                };
@@@ -902,9 -890,6 +902,6 @@@
        status = "okay";
  
        port {
-               #address-cells = <1>;
-               #size-cells = <0>;
- 
                vin1ep0: endpoint {
                        remote-endpoint = <&adv7180>;
                        bus-width = <8>;
@@@ -929,6 -914,11 +926,11 @@@
        };
  };
  
+ &rwdt {
+       timeout-sec = <60>;
+       status = "okay";
+ };
+ 
  &ssi1 {
        shared-pin;
  };

diff --combined arch/arm/boot/dts/r8a7790.dtsi
index 05a0fc2,ae97ec1..4d06b15
--- 1/arch/arm/boot/dts/r8a7790.dtsi
--- 2/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@@ -202,6 -202,24 +202,24 @@@
                clock-frequency = <0>;
        };
  
+       pmu-0 {
+               compatible = "arm,cortex-a15-pmu";
+               interrupts-extended = <&gic GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>,
+                                     <&gic GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>,
+                                     <&gic GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>,
+                                     <&gic GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>;
+               interrupt-affinity = <&cpu0>, <&cpu1>, <&cpu2>, <&cpu3>;
+       };
+ 
+       pmu-1 {
+               compatible = "arm,cortex-a7-pmu";
+               interrupts-extended = <&gic GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>,
+                                     <&gic GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>,
+                                     <&gic GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>,
+                                     <&gic GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;
+               interrupt-affinity = <&cpu4>, <&cpu5>, <&cpu6>, <&cpu7>;
+       };
+ 
        /* External SCIF clock */
        scif_clk: scif {
                compatible = "fixed-clock";
@@@ -218,6 -236,16 +236,16 @@@
                #size-cells = <2>;
                ranges;
  
+               rwdt: watchdog@e6020000 {
+                       compatible = "renesas,r8a7790-wdt",
+                                    "renesas,rcar-gen2-wdt";
+                       reg = <0 0xe6020000 0 0x0c>;
+                       clocks = <&cpg CPG_MOD 402>;
+                       power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                       resets = <&cpg 402>;
+                       status = "disabled";
+               };
+ 
                gpio0: gpio@e6050000 {
                        compatible = "renesas,gpio-r8a7790",
                                     "renesas,rcar-gen2-gpio";
@@@ -443,7 -471,7 +471,7 @@@
  
                        smp-sram@0 {
                                compatible = "renesas,smp-sram";
-                               reg = <0 0x10>;
+                               reg = <0 0x100>;
                        };
                };
  
@@@ -1544,7 -1572,7 +1572,7 @@@
                        interrupt-controller;
                        reg = <0 0xf1001000 0 0x1000>, <0 0xf1002000 0 0x2000>,
                              <0 0xf1004000 0 0x2000>, <0 0xf1006000 0 0x2000>;
-                       interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
+                       interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_HIGH)>;
                        clocks = <&cpg CPG_MOD 408>;
                        clock-names = "clk";
                        power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
@@@ -1615,6 -1643,33 +1643,33 @@@
                        resets = <&cpg 127>;
                };
  
+               fdp1@fe940000 {
+                       compatible = "renesas,fdp1";
+                       reg = <0 0xfe940000 0 0x2400>;
+                       interrupts = <GIC_SPI 262 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 119>;
+                       power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                       resets = <&cpg 119>;
+               };
+ 
+               fdp1@fe944000 {
+                       compatible = "renesas,fdp1";
+                       reg = <0 0xfe944000 0 0x2400>;
+                       interrupts = <GIC_SPI 263 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 118>;
+                       power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                       resets = <&cpg 118>;
+               };
+ 
+               fdp1@fe948000 {
+                       compatible = "renesas,fdp1";
+                       reg = <0 0xfe948000 0 0x2400>;
+                       interrupts = <GIC_SPI 264 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 117>;
+                       power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                       resets = <&cpg 117>;
+               };
+ 
                jpu: jpeg-codec@fe980000 {
                        compatible = "renesas,jpu-r8a7790",
                                     "renesas,rcar-gen2-jpu";
@@@ -1627,13 -1682,18 +1682,13 @@@
  
                du: display@feb00000 {
                        compatible = "renesas,du-r8a7790";
 -                      reg = <0 0xfeb00000 0 0x70000>,
 -                            <0 0xfeb90000 0 0x1c>,
 -                            <0 0xfeb94000 0 0x1c>;
 -                      reg-names = "du", "lvds.0", "lvds.1";
 +                      reg = <0 0xfeb00000 0 0x70000>;
                        interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>,
                                     <GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>,
                                     <GIC_SPI 269 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&cpg CPG_MOD 724>, <&cpg CPG_MOD 723>,
 -                               <&cpg CPG_MOD 722>, <&cpg CPG_MOD 726>,
 -                               <&cpg CPG_MOD 725>;
 -                      clock-names = "du.0", "du.1", "du.2", "lvds.0",
 -                                    "lvds.1";
 +                               <&cpg CPG_MOD 722>;
 +                      clock-names = "du.0", "du.1", "du.2";
                        status = "disabled";
  
                        ports {
@@@ -1648,65 -1708,11 +1703,65 @@@
                                port@1 {
                                        reg = <1>;
                                        du_out_lvds0: endpoint {
 +                                              remote-endpoint = <&lvds0_in>;
                                        };
                                };
                                port@2 {
                                        reg = <2>;
                                        du_out_lvds1: endpoint {
 +                                              remote-endpoint = <&lvds1_in>;
 +                                      };
 +                              };
 +                      };
 +              };
 +
 +              lvds0: lvds@feb90000 {
 +                      compatible = "renesas,r8a7790-lvds";
 +                      reg = <0 0xfeb90000 0 0x1c>;
 +                      clocks = <&cpg CPG_MOD 726>;
 +                      power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
 +                      resets = <&cpg 726>;
 +                      status = "disabled";
 +
 +                      ports {
 +                              #address-cells = <1>;
 +                              #size-cells = <0>;
 +
 +                              port@0 {
 +                                      reg = <0>;
 +                                      lvds0_in: endpoint {
 +                                              remote-endpoint = <&du_out_lvds0>;
 +                                      };
 +                              };
 +                              port@1 {
 +                                      reg = <1>;
 +                                      lvds0_out: endpoint {
 +                                      };
 +                              };
 +                      };
 +              };
 +
 +              lvds1: lvds@feb94000 {
 +                      compatible = "renesas,r8a7790-lvds";
 +                      reg = <0 0xfeb94000 0 0x1c>;
 +                      clocks = <&cpg CPG_MOD 725>;
 +                      power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
 +                      resets = <&cpg 725>;
 +                      status = "disabled";
 +
 +                      ports {
 +                              #address-cells = <1>;
 +                              #size-cells = <0>;
 +
 +                              port@0 {
 +                                      reg = <0>;
 +                                      lvds1_in: endpoint {
 +                                              remote-endpoint = <&du_out_lvds1>;
 +                                      };
 +                              };
 +                              port@1 {
 +                                      reg = <1>;
 +                                      lvds1_out: endpoint {
                                        };
                                };
                        };
@@@ -1773,10 -1779,10 +1828,10 @@@
  
        timer {
                compatible = "arm,armv7-timer";
-               interrupts-extended = <&gic GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
-                                     <&gic GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
-                                     <&gic GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
-                                     <&gic GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>;
+               interrupts-extended = <&gic GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_LOW)>,
+                                     <&gic GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_LOW)>,
+                                     <&gic GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_LOW)>,
+                                     <&gic GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_LOW)>;
        };
  
        /* External USB clock - can be overridden by the board */

diff --combined arch/arm/boot/dts/r8a7791-koelsch.dts
index 9d7213a,68e8272..8ab793d
--- 1/arch/arm/boot/dts/r8a7791-koelsch.dts
--- 2/arch/arm/boot/dts/r8a7791-koelsch.dts
+++ b/arch/arm/boot/dts/r8a7791-koelsch.dts
@@@ -468,9 -468,10 +468,9 @@@
        pinctrl-names = "default";
        status = "okay";
  
 -      clocks = <&cpg CPG_MOD 724>, <&cpg CPG_MOD 723>, <&cpg CPG_MOD 726>,
 +      clocks = <&cpg CPG_MOD 724>, <&cpg CPG_MOD 723>,
                 <&x13_clk>, <&x2_clk>;
 -      clock-names = "du.0", "du.1", "lvds.0",
 -                    "dclkin.0", "dclkin.1";
 +      clock-names = "du.0", "du.1", "dclkin.0", "dclkin.1";
  
        ports {
                port@0 {
@@@ -478,13 -479,6 +478,13 @@@
                                remote-endpoint = <&adv7511_in>;
                        };
                };
 +      };
 +};
 +
 +&lvds0 {
 +      status = "okay";
 +
 +      ports {
                port@1 {
                        lvds_connector: endpoint {
                        };
@@@ -643,6 -637,11 +643,11 @@@
        status = "okay";
  };
  
+ &rwdt {
+       timeout-sec = <60>;
+       status = "okay";
+ };
+ 
  &sata0 {
        status = "okay";
  };
@@@ -850,9 -849,6 +855,6 @@@
        pinctrl-names = "default";
  
        port {
-               #address-cells = <1>;
-               #size-cells = <0>;
- 
                vin0ep2: endpoint {
                        remote-endpoint = <&adv7612_out>;
                        bus-width = <24>;
@@@ -871,9 -867,6 +873,6 @@@
        pinctrl-names = "default";
  
        port {
-               #address-cells = <1>;
-               #size-cells = <0>;
- 
                vin1ep: endpoint {
                        remote-endpoint = <&adv7180>;
                        bus-width = <8>;

diff --combined arch/arm/boot/dts/r8a7791-porter.dts
index ae9ed9f,876d38f..a01101b
--- 1/arch/arm/boot/dts/r8a7791-porter.dts
--- 2/arch/arm/boot/dts/r8a7791-porter.dts
+++ b/arch/arm/boot/dts/r8a7791-porter.dts
@@@ -386,9 -386,6 +386,6 @@@
        pinctrl-names = "default";
  
        port {
-               #address-cells = <1>;
-               #size-cells = <0>;
- 
                vin0ep: endpoint {
                        remote-endpoint = <&adv7180>;
                        bus-width = <8>;
@@@ -441,9 -438,10 +438,9 @@@
        pinctrl-names = "default";
        status = "okay";
  
 -      clocks = <&cpg CPG_MOD 724>, <&cpg CPG_MOD 723>, <&cpg CPG_MOD 726>,
 +      clocks = <&cpg CPG_MOD 724>, <&cpg CPG_MOD 723>,
                 <&x3_clk>, <&x16_clk>;
 -      clock-names = "du.0", "du.1", "lvds.0",
 -                    "dclkin.0", "dclkin.1";
 +      clock-names = "du.0", "du.1", "dclkin.0", "dclkin.1";
  
        ports {
                port@0 {
@@@ -454,17 -452,6 +451,17 @@@
        };
  };
  
 +&lvds0 {
 +      status = "okay";
 +
 +      ports {
 +              port@1 {
 +                      lvds_connector: endpoint {
 +                      };
 +              };
 +      };
 +};
 +
  &rcar_sound {
        pinctrl-0 = <&ssi_pins &audio_clk_pins>;
        pinctrl-names = "default";
@@@ -481,6 -468,11 +478,11 @@@
        };
  };
  
+ &rwdt {
+       timeout-sec = <60>;
+       status = "okay";
+ };
+ 
  &ssi1 {
        shared-pin;
  };

diff --combined arch/arm/boot/dts/r8a7791.dtsi
index 506b208,828ad78..6e1dd7a
--- 1/arch/arm/boot/dts/r8a7791.dtsi
--- 2/arch/arm/boot/dts/r8a7791.dtsi
+++ b/arch/arm/boot/dts/r8a7791.dtsi
@@@ -126,6 -126,13 +126,13 @@@
                clock-frequency = <0>;
        };
  
+       pmu {
+               compatible = "arm,cortex-a15-pmu";
+               interrupts-extended = <&gic GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>,
+                                     <&gic GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;
+               interrupt-affinity = <&cpu0>, <&cpu1>;
+       };
+ 
        /* External SCIF clock */
        scif_clk: scif {
                compatible = "fixed-clock";
@@@ -142,6 -149,16 +149,16 @@@
                #size-cells = <2>;
                ranges;
  
+               rwdt: watchdog@e6020000 {
+                       compatible = "renesas,r8a7791-wdt",
+                                    "renesas,rcar-gen2-wdt";
+                       reg = <0 0xe6020000 0 0x0c>;
+                       clocks = <&cpg CPG_MOD 402>;
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 402>;
+                       status = "disabled";
+               };
+ 
                gpio0: gpio@e6050000 {
                        compatible = "renesas,gpio-r8a7791",
                                     "renesas,rcar-gen2-gpio";
@@@ -407,7 -424,7 +424,7 @@@
  
                        smp-sram@0 {
                                compatible = "renesas,smp-sram";
-                               reg = <0 0x10>;
+                               reg = <0 0x100>;
                        };
                };
  
@@@ -1621,6 -1638,24 +1638,24 @@@
                        resets = <&cpg 127>;
                };
  
+               fdp1@fe940000 {
+                       compatible = "renesas,fdp1";
+                       reg = <0 0xfe940000 0 0x2400>;
+                       interrupts = <GIC_SPI 262 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 119>;
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 119>;
+               };
+ 
+               fdp1@fe944000 {
+                       compatible = "renesas,fdp1";
+                       reg = <0 0xfe944000 0 0x2400>;
+                       interrupts = <GIC_SPI 263 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 118>;
+                       power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                       resets = <&cpg 118>;
+               };
+ 
                jpu: jpeg-codec@fe980000 {
                        compatible = "renesas,jpu-r8a7791",
                                     "renesas,rcar-gen2-jpu";
@@@ -1633,12 -1668,15 +1668,12 @@@
  
                du: display@feb00000 {
                        compatible = "renesas,du-r8a7791";
 -                      reg = <0 0xfeb00000 0 0x40000>,
 -                            <0 0xfeb90000 0 0x1c>;
 -                      reg-names = "du", "lvds.0";
 +                      reg = <0 0xfeb00000 0 0x40000>;
                        interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>,
                                     <GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&cpg CPG_MOD 724>,
 -                               <&cpg CPG_MOD 723>,
 -                               <&cpg CPG_MOD 726>;
 -                      clock-names = "du.0", "du.1", "lvds.0";
 +                               <&cpg CPG_MOD 723>;
 +                      clock-names = "du.0", "du.1";
                        status = "disabled";
  
                        ports {
@@@ -1653,33 -1691,6 +1688,33 @@@
                                port@1 {
                                        reg = <1>;
                                        du_out_lvds0: endpoint {
 +                                              remote-endpoint = <&lvds0_in>;
 +                                      };
 +                              };
 +                      };
 +              };
 +
 +              lvds0: lvds@feb90000 {
 +                      compatible = "renesas,r8a7791-lvds";
 +                      reg = <0 0xfeb90000 0 0x1c>;
 +                      clocks = <&cpg CPG_MOD 726>;
 +                      power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
 +                      resets = <&cpg 726>;
 +                      status = "disabled";
 +
 +                      ports {
 +                              #address-cells = <1>;
 +                              #size-cells = <0>;
 +
 +                              port@0 {
 +                                      reg = <0>;
 +                                      lvds0_in: endpoint {
 +                                              remote-endpoint = <&du_out_lvds0>;
 +                                      };
 +                              };
 +                              port@1 {
 +                                      reg = <1>;
 +                                      lvds0_out: endpoint {
                                        };
                                };
                        };

diff --combined arch/arm/boot/dts/r8a7793-gose.dts
index 96e117d,ec94e24..aa209f6
--- 1/arch/arm/boot/dts/r8a7793-gose.dts
--- 2/arch/arm/boot/dts/r8a7793-gose.dts
+++ b/arch/arm/boot/dts/r8a7793-gose.dts
@@@ -447,9 -447,10 +447,9 @@@
        pinctrl-names = "default";
        status = "okay";
  
 -      clocks = <&cpg CPG_MOD 724>, <&cpg CPG_MOD 723>, <&cpg CPG_MOD 726>,
 +      clocks = <&cpg CPG_MOD 724>, <&cpg CPG_MOD 723>,
                 <&x13_clk>, <&x2_clk>;
 -      clock-names = "du.0", "du.1", "lvds.0",
 -                    "dclkin.0", "dclkin.1";
 +      clock-names = "du.0", "du.1", "dclkin.0", "dclkin.1";
  
        ports {
                port@0 {
@@@ -457,11 -458,6 +457,11 @@@
                                remote-endpoint = <&adv7511_in>;
                        };
                };
 +      };
 +};
 +
 +&lvds0 {
 +      ports {
                port@1 {
                        lvds_connector: endpoint {
                        };
@@@ -599,6 -595,11 +599,11 @@@
        status = "okay";
  };
  
+ &rwdt {
+       timeout-sec = <60>;
+       status = "okay";
+ };
+ 
  &scif0 {
        pinctrl-0 = <&scif0_pins>;
        pinctrl-names = "default";
@@@ -758,9 -759,6 +763,6 @@@
        pinctrl-names = "default";
  
        port {
-               #address-cells = <1>;
-               #size-cells = <0>;
- 
                vin0ep2: endpoint {
                        remote-endpoint = <&adv7612_out>;
                        bus-width = <24>;
@@@ -780,9 -778,6 +782,6 @@@
        status = "okay";
  
        port {
-               #address-cells = <1>;
-               #size-cells = <0>;
- 
                vin1ep: endpoint {
                        remote-endpoint = <&adv7180_out>;
                        bus-width = <8>;

diff --combined arch/arm/boot/dts/r8a7793.dtsi
index 4f52603,4c29de5..4abecfc
--- 1/arch/arm/boot/dts/r8a7793.dtsi
--- 2/arch/arm/boot/dts/r8a7793.dtsi
+++ b/arch/arm/boot/dts/r8a7793.dtsi
@@@ -110,6 -110,13 +110,13 @@@
                clock-frequency = <0>;
        };
  
+       pmu {
+               compatible = "arm,cortex-a15-pmu";
+               interrupts-extended = <&gic GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>,
+                                     <&gic GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;
+               interrupt-affinity = <&cpu0>, <&cpu1>;
+       };
+ 
        /* External SCIF clock */
        scif_clk: scif {
                compatible = "fixed-clock";
@@@ -126,6 -133,16 +133,16 @@@
                #size-cells = <2>;
                ranges;
  
+               rwdt: watchdog@e6020000 {
+                       compatible = "renesas,r8a7793-wdt",
+                                    "renesas,rcar-gen2-wdt";
+                       reg = <0 0xe6020000 0 0x0c>;
+                       clocks = <&cpg CPG_MOD 402>;
+                       power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                       resets = <&cpg 402>;
+                       status = "disabled";
+               };
+ 
                gpio0: gpio@e6050000 {
                        compatible = "renesas,gpio-r8a7793",
                                     "renesas,rcar-gen2-gpio";
@@@ -392,7 -409,7 +409,7 @@@
  
                        smp-sram@0 {
                                compatible = "renesas,smp-sram";
-                               reg = <0 0x10>;
+                               reg = <0 0x100>;
                        };
                };
  
@@@ -1290,14 -1307,35 +1307,32 @@@
                        resets = <&cpg 408>;
                };
  
+               fdp1@fe940000 {
+                       compatible = "renesas,fdp1";
+                       reg = <0 0xfe940000 0 0x2400>;
+                       interrupts = <GIC_SPI 262 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 119>;
+                       power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                       resets = <&cpg 119>;
+               };
+ 
+               fdp1@fe944000 {
+                       compatible = "renesas,fdp1";
+                       reg = <0 0xfe944000 0 0x2400>;
+                       interrupts = <GIC_SPI 263 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 118>;
+                       power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                       resets = <&cpg 118>;
+               };
+ 
                du: display@feb00000 {
                        compatible = "renesas,du-r8a7793";
 -                      reg = <0 0xfeb00000 0 0x40000>,
 -                            <0 0xfeb90000 0 0x1c>;
 -                      reg-names = "du", "lvds.0";
 +                      reg = <0 0xfeb00000 0 0x40000>;
                        interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>,
                                     <GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&cpg CPG_MOD 724>,
 -                               <&cpg CPG_MOD 723>,
 -                               <&cpg CPG_MOD 726>;
 -                      clock-names = "du.0", "du.1", "lvds.0";
 +                               <&cpg CPG_MOD 723>;
 +                      clock-names = "du.0", "du.1";
                        status = "disabled";
  
                        ports {
@@@ -1312,34 -1350,6 +1347,34 @@@
                                port@1 {
                                        reg = <1>;
                                        du_out_lvds0: endpoint {
 +                                              remote-endpoint = <&lvds0_in>;
 +                                      };
 +                              };
 +                      };
 +              };
 +
 +              lvds0: lvds@feb90000 {
 +                      compatible = "renesas,r8a7793-lvds";
 +                      reg = <0 0xfeb90000 0 0x1c>;
 +                      clocks = <&cpg CPG_MOD 726>;
 +                      power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
 +                      resets = <&cpg 726>;
 +
 +                      status = "disabled";
 +
 +                      ports {
 +                              #address-cells = <1>;
 +                              #size-cells = <0>;
 +
 +                              port@0 {
 +                                      reg = <0>;
 +                                      lvds0_in: endpoint {
 +                                              remote-endpoint = <&du_out_lvds0>;
 +                                      };
 +                              };
 +                              port@1 {
 +                                      reg = <1>;
 +                                      lvds0_out: endpoint {
                                        };
                                };
                        };

diff --combined drivers/of/platform.c
index 0b49a62,26fb438..59731a9
--- 1/drivers/of/platform.c
--- 2/drivers/of/platform.c
+++ b/drivers/of/platform.c
@@@ -32,11 -32,6 +32,11 @@@ const struct of_device_id of_default_bu
        {} /* Empty terminated list */
  };
  
 +static const struct of_device_id of_skipped_node_table[] = {
 +      { .compatible = "operating-points-v2", },
 +      {} /* Empty terminated list */
 +};
 +
  static int of_dev_node_match(struct device *dev, void *data)
  {
        return dev->of_node == data;
@@@ -361,12 -356,6 +361,12 @@@ static int of_platform_bus_create(struc
                return 0;
        }
  
 +      /* Skip nodes for which we don't want to create devices */
 +      if (unlikely(of_match_node(of_skipped_node_table, bus))) {
 +              pr_debug("%s() - skipping %pOF node\n", __func__, bus);
 +              return 0;
 +      }
 +
        if (of_node_check_flag(bus, OF_POPULATED_BUS)) {
                pr_debug("%s() - skipping %pOF, already populated\n",
                        __func__, bus);
@@@ -505,6 -494,7 +505,7 @@@ EXPORT_SYMBOL_GPL(of_platform_default_p
  #ifndef CONFIG_PPC
  static const struct of_device_id reserved_mem_matches[] = {
        { .compatible = "qcom,rmtfs-mem" },
+       { .compatible = "qcom,cmd-db" },
        { .compatible = "ramoops" },
        {}
  };
@@@ -548,9 -538,6 +549,9 @@@ int of_platform_device_destroy(struct d
        if (of_node_check_flag(dev->of_node, OF_POPULATED_BUS))
                device_for_each_child(dev, NULL, of_platform_device_destroy);
  
 +      of_node_clear_flag(dev->of_node, OF_POPULATED);
 +      of_node_clear_flag(dev->of_node, OF_POPULATED_BUS);
 +
        if (dev->bus == &platform_bus_type)
                platform_device_unregister(to_platform_device(dev));
  #ifdef CONFIG_ARM_AMBA
@@@ -558,6 -545,8 +559,6 @@@
                amba_device_unregister(to_amba_device(dev));
  #endif
  
 -      of_node_clear_flag(dev->of_node, OF_POPULATED);
 -      of_node_clear_flag(dev->of_node, OF_POPULATED_BUS);
        return 0;
  }
  EXPORT_SYMBOL_GPL(of_platform_device_destroy);

diff --combined drivers/soc/qcom/Kconfig
index d053f26,7093fe7..9dc02f3
--- 1/drivers/soc/qcom/Kconfig
--- 2/drivers/soc/qcom/Kconfig
+++ b/drivers/soc/qcom/Kconfig
@@@ -3,6 -3,24 +3,24 @@@
  #
  menu "Qualcomm SoC drivers"
  
+ config QCOM_COMMAND_DB
+       bool "Qualcomm Command DB"
+       depends on (ARCH_QCOM && OF) || COMPILE_TEST
+       help
+         Command DB queries shared memory by key string for shared system
+         resources. Platform drivers that require to set state of a shared
+         resource on a RPM-hardened platform must use this database to get
+         SoC specific identifier and information for the shared resources.
+ 
+ config QCOM_GENI_SE
+       tristate "QCOM GENI Serial Engine Driver"
+       depends on ARCH_QCOM || COMPILE_TEST
+       help
+         This driver is used to manage Generic Interface (GENI) firmware based
+         Qualcomm Technologies, Inc. Universal Peripheral (QUP) Wrapper. This
+         driver is also used to manage the common aspects of multiple Serial
+         Engines present in the QUP.
+ 
  config QCOM_GLINK_SSR
        tristate "Qualcomm Glink SSR driver"
        depends on RPMSG
@@@ -108,13 -126,4 +126,13 @@@ config QCOM_WCNSS_CTR
          Client driver for the WCNSS_CTRL SMD channel, used to download nv
          firmware to a newly booted WCNSS chip.
  
 +config QCOM_APR
 +      tristate "Qualcomm APR Bus (Asynchronous Packet Router)"
 +      depends on ARCH_QCOM
 +      depends on RPMSG
 +      help
 +          Enable APR IPC protocol support between
 +          application processor and QDSP6. APR is
 +          used by audio driver to configure QDSP6
 +          ASM, ADM and AFE modules.
  endmenu

diff --combined drivers/soc/qcom/Makefile
index 39de5de,cbf414c..19dcf95
--- 1/drivers/soc/qcom/Makefile
--- 2/drivers/soc/qcom/Makefile
+++ b/drivers/soc/qcom/Makefile
@@@ -1,4 -1,6 +1,6 @@@
  # SPDX-License-Identifier: GPL-2.0
+ obj-$(CONFIG_QCOM_GENI_SE) += qcom-geni-se.o
+ obj-$(CONFIG_QCOM_COMMAND_DB) += cmd-db.o
  obj-$(CONFIG_QCOM_GLINK_SSR) +=       glink_ssr.o
  obj-$(CONFIG_QCOM_GSBI)       +=      qcom_gsbi.o
  obj-$(CONFIG_QCOM_MDT_LOADER) += mdt_loader.o
@@@ -12,4 -14,3 +14,4 @@@ obj-$(CONFIG_QCOM_SMEM_STATE) += smem_s
  obj-$(CONFIG_QCOM_SMP2P)      += smp2p.o
  obj-$(CONFIG_QCOM_SMSM)       += smsm.o
  obj-$(CONFIG_QCOM_WCNSS_CTRL) += wcnss_ctrl.o
 +obj-$(CONFIG_QCOM_APR) += apr.o