]> Git Repo - linux.git/commitdiff
Merge tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
authorLinus Torvalds <[email protected]>
Tue, 12 Jun 2018 01:19:45 +0000 (18:19 -0700)
committerLinus Torvalds <[email protected]>
Tue, 12 Jun 2018 01:19:45 +0000 (18:19 -0700)
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
  ...

12 files changed:
1  2 
MAINTAINERS
arch/arm/boot/dts/Makefile
arch/arm/boot/dts/r8a7790-lager.dts
arch/arm/boot/dts/r8a7790.dtsi
arch/arm/boot/dts/r8a7791-koelsch.dts
arch/arm/boot/dts/r8a7791-porter.dts
arch/arm/boot/dts/r8a7791.dtsi
arch/arm/boot/dts/r8a7793-gose.dts
arch/arm/boot/dts/r8a7793.dtsi
drivers/of/platform.c
drivers/soc/qcom/Kconfig
drivers/soc/qcom/Makefile

diff --combined MAINTAINERS
index 0ee6fe90a52ba419b410c6f3547446823a100eff,218476dd7fde46ce59d70819918524831f002817..12b27679ae0c465c48678beef45017903e259a42
@@@ -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 <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
  L:    [email protected]
@@@ -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 <[email protected]
  M:    Sascha Hauer <[email protected]>
  R:    Pengutronix Kernel Team <[email protected]>
  R:    Fabio Estevam <[email protected]>
 +R:    NXP Linux Team <[email protected]>
  L:    [email protected] (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 <[email protected]>
 +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" <[email protected]>
 +M:    Kalle Valo <[email protected]>
  L:    [email protected]
  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:    [email protected]
  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 <[email protected]>
 -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 <[email protected]>
  M:    Daniel Thompson <[email protected]>
  M:    Jingoo Han <[email protected]>
 +L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git
  S:    Maintained
  F:    drivers/video/backlight/
  L:    [email protected]
  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 <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
  L:    [email protected]
@@@ -3392,12 -3364,16 +3392,12 @@@ F:   include/linux/usb/wusb
  
  CFAG12864B LCD DRIVER
  M:    Miguel Ojeda Sandonis <[email protected]>
 -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 <[email protected]>
 -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 <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/input/touchscreen/chipone_icn8505.c
 +
  CHROME HARDWARE PLATFORM SUPPORT
  M:    Benson Leung <[email protected]>
  M:    Olof Johansson <[email protected]>
@@@ -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 <[email protected]>
@@@ -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 <v[email protected]>
 +M:    Vinod Koul <v[email protected]>
  L:    [email protected]
  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 <[email protected]>
  S:    Maintained
  F:    drivers/staging/fsl-dpaa2/ethsw
  
 +DPAA2 PTP CLOCK DRIVER
 +M:    Yangbo Lu <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/staging/fsl-dpaa2/rtc
 +
  DPT_I2O SCSI RAID DRIVER
  M:    Adaptec OEM Raid Solutions <[email protected]>
  L:    [email protected]
@@@ -4708,7 -4669,7 +4708,7 @@@ F:      Documentation/devicetree/bindings/di
  
  DRM DRIVERS FOR FREESCALE DCU
  M:    Stefan Agner <[email protected]>
 -M:    Alison Wang <alison.wang@freescale.com>
 +M:    Alison Wang <alison.wang@nxp.com>
  L:    [email protected]
  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 <[email protected]>
 +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 <[email protected]>
  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 <[email protected]>
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +L:    [email protected]
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/gpu/drm/xen/
 +F:    Documentation/gpu/xen-front.rst
 +
  DRM TTM SUBSYSTEM
  M:    Christian Koenig <[email protected]>
  M:    Roger He <[email protected]>
@@@ -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 <[email protected]>
  M:    Vineet Gupta <[email protected]>
  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 <[email protected]>
 +S:    Maintained
 +F:    scripts/faddr2line
 +
 +FAILOVER MODULE
 +M:    Sridhar Samudrala <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    net/core/failover.c
 +F:    include/net/failover.h
 +F:    Documentation/networking/failover.rst
 +
  FANOTIFY
  M:    Jan Kara <[email protected]>
  R:    Amir Goldstein <[email protected]>
@@@ -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 <[email protected]
  L:    [email protected]
  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 <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
  L:    [email protected]
@@@ -6024,8 -5949,8 +6024,8 @@@ S:      Maintaine
  F:    scripts/get_maintainer.pl
  
  GFS2 FILE SYSTEM
 -M:    Steven Whitehouse <[email protected]>
  M:    Bob Peterson <[email protected]>
 +M:    Andreas Gruenbacher <[email protected]>
  L:    [email protected]
  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:      [email protected]
  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 <[email protected]>
 +M:    Mike Kravetz <[email protected]>
 +L:    [email protected]
  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 <[email protected]>
  S:    Supported
  F:    drivers/scsi/ibmvscsi/ibmvfc*
  
 +IBM Power Virtual Management Channel Driver
 +M:    Bryant G. Ly <[email protected]>
 +M:    Steven Royer <[email protected]>
 +S:    Supported
 +F:    drivers/misc/ibmvmc.*
 +
  IBM Power Virtual SCSI Device Drivers
  M:    Tyrel Datwyler <[email protected]>
  L:    [email protected]
@@@ -6985,15 -6897,6 +6985,15 @@@ F:    drivers/staging/iio
  F:    include/linux/iio/
  F:    tools/iio/
  
 +IIO UNIT CONVERTER
 +M:    Peter Rosin <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
  M:    Stanislaw Gruszka <[email protected]>
  S:    Maintained
  F:    drivers/video/fbdev/i810/
  
 -INTEL ASoC BDW/HSW DRIVERS
 +INTEL ASoC DRIVERS
 +M:    Pierre-Louis Bossart <[email protected]>
 +M:    Liam Girdwood <[email protected]>
  M:    Jie Yang <[email protected]>
  L:    [email protected] (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 <[email protected]>
@@@ -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:    [email protected]
  S:    Maintained
 -F:    Documentation/kbuild/kconfig-language.txt
 +F:    Documentation/kbuild/kconfig*
  F:    scripts/kconfig/
 +F:    scripts/Kconfig.include
  
  KDUMP
  M:    Dave Young <[email protected]>
@@@ -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 <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    fs/autofs4/
 +F:    fs/autofs/
  
  KERNEL BUILD + files below scripts/ (unless maintained elsewhere)
  M:    Masahiro Yamada <[email protected]>
@@@ -7795,7 -7698,6 +7795,7 @@@ KERNEL SELFTEST FRAMEWOR
  M:    Shuah Khan <[email protected]>
  L:    [email protected]
  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 <[email protected]>
 -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 <[email protected]>
 +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 <[email protected]>
  L:    [email protected]
@@@ -8306,7 -8203,7 +8306,7 @@@ F:      drivers/misc/lkdtm/
  
  LINUX KERNEL MEMORY CONSISTENCY MODEL (LKMM)
  M:    Alan Stern <[email protected]>
 -M:    Andrea Parri <parri.andrea@gmail.com>
 +M:    Andrea Parri <andrea.parri@amarulasolutions.com>
  M:    Will Deacon <[email protected]>
  M:    Peter Zijlstra <[email protected]>
  M:    Boqun Feng <[email protected]>
@@@ -8413,7 -8310,6 +8413,7 @@@ F:      Documentation/admin-guide/LSM/LoadPi
  LOCKING PRIMITIVES
  M:    Peter Zijlstra <[email protected]>
  M:    Ingo Molnar <[email protected]>
 +M:    Will Deacon <[email protected]>
  L:    [email protected]
  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:      [email protected]
  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:    [email protected]
  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:      [email protected]
  L:    [email protected]
  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/
  
  S:    Maintained
  F:    drivers/net/wireless/mediatek/mt7601u/
  
 +MEDIATEK NAND CONTROLLER DRIVER
 +M:    Xiaolei Li <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/mtd/nand/raw/mtk_*
 +F:    Documentation/devicetree/bindings/mtd/mtk-nand.txt
 +
  MEDIATEK RANDOM NUMBER GENERATOR SUPPORT
  M:    Sean Wang <[email protected]>
  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 <[email protected]>
 +MELLANOX ETHERNET INNOVA DRIVERS
  R:    Boris Pismenny <[email protected]>
  L:    [email protected]
  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 <[email protected]>
  R:    Boris Pismenny <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -9198,6 -9086,7 +9198,6 @@@ F:      include/uapi/rdma/mlx4-abi.
  
  MELLANOX MLX5 core VPI driver
  M:    Saeed Mahameed <[email protected]>
 -M:    Matan Barak <[email protected]>
  M:    Leon Romanovsky <[email protected]>
  L:    [email protected]
  L:    [email protected]
@@@ -9208,6 -9097,7 +9208,6 @@@ F:      drivers/net/ethernet/mellanox/mlx5/c
  F:    include/linux/mlx5/
  
  MELLANOX MLX5 IB driver
 -M:    Matan Barak <[email protected]>
  M:    Leon Romanovsky <[email protected]>
  L:    [email protected]
  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 <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/net/ethernet/mscc/
 +
  MICROSOFT SURFACE PRO 3 BUTTON DRIVER
  M:    Chen Yu <[email protected]>
  L:    [email protected]
@@@ -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 <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    Documentation/devicetree/bindings/pci/mobiveil-pcie.txt
 +F:    drivers/pci/host/pcie-mobiveil.c
 +
  MODULE SUPPORT
  M:    Jessica Yu <[email protected]>
  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 <[email protected]>
 +M:    Miquel Raynal <[email protected]>
  R:    Richard Weinberger <[email protected]>
  L:    [email protected]
  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 <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
  L:    [email protected]
@@@ -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:    [email protected]
  L:    [email protected]
@@@ -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 <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
  M:    Dave Watson <[email protected]>
  L:    [email protected]
@@@ -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 <[email protected]>
@@@ -10550,14 -10404,12 +10550,14 @@@ F:        drivers/infiniband/ulp/opa_vni
  
  OPEN FIRMWARE AND DEVICE TREE OVERLAYS
  M:    Pantelis Antoniou <[email protected]>
 +M:    Frank Rowand <[email protected]>
  L:    [email protected]
  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 <[email protected]>
@@@ -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:    [email protected]
  L:    [email protected]
  L:    [email protected]
@@@ -11097,8 -10949,8 +11097,8 @@@ M:   Shawn Lin <[email protected]
  L:    [email protected]
  L:    [email protected]
  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 <[email protected]>
  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 <[email protected]
  L:    [email protected]
  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:    [email protected]
  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 <[email protected]>
 +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 <[email protected]>
  L:    [email protected]
@@@ -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 <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/dma/qcom/hidma*
 +
  QUALCOMM IOMMU
  M:    Rob Clark <[email protected]>
  L:    [email protected]
@@@ -11846,7 -11682,7 +11846,7 @@@ S:   Maintaine
  F:    drivers/media/platform/qcom/venus/
  
  QUALCOMM WCN36XX WIRELESS DRIVER
 -M:    Eugene Krasnikov <[email protected]>
 +M:    Kalle Valo <[email protected]>
  L:    [email protected]
  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 <[email protected]>
@@@ -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 <[email protected]>
 +M:    Peter Zijlstra <[email protected]>
 +M:    "Paul E. McKenney" <[email protected]>
 +M:    Boqun Feng <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
  L:    [email protected]
@@@ -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:    [email protected]
  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 <[email protected]>
 +L:    [email protected]
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/i2c/imx258.c
 +
  SONY IMX274 SENSOR DRIVER
  M:    Leon Luo <[email protected]>
  L:    [email protected]
@@@ -13287,7 -13104,7 +13287,7 @@@ F:   include/uapi/sound
  F:    sound/
  
  SOUND - COMPRESSED AUDIO
 -M:    Vinod Koul <v[email protected]>
 +M:    Vinod Koul <v[email protected]>
  L:    [email protected] (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 <[email protected]
  S:    Maintained
  F:    arch/alpha/kernel/srm_env.c
  
 +ST STM32 I2C/SMBUS DRIVER
 +M:    Pierre-Yves MORDRET <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/i2c/busses/i2c-stm32*
 +
  STABLE BRANCH
  M:    Greg Kroah-Hartman <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    Documentation/process/stable-kernel-rules.rst
  
 -STAGING - ATOMISP DRIVER
 -M:    Alan Cox <[email protected]>
 -M:    Sakari Ailus <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/staging/media/atomisp/
 -
  STAGING - COMEDI
  M:    Ian Abbott <[email protected]>
  M:    H Hartley Sweeten <[email protected]>
@@@ -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 <[email protected]>
 -M:    Andreas Dilger <[email protected]>
 -M:    James Simmons <[email protected]>
 -L:    [email protected] (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 <[email protected]>
  L:    [email protected] (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 <[email protected]>
 +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 <[email protected]>
  M:    Alexandre Torgue <[email protected]>
 +M:    Jose Abreu <[email protected]>
  L:    [email protected]
  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 <[email protected]>
 +S:    Maintained
 +F:    drivers/regulator/sy8106a-regulator.c
 +F:    Documentation/devicetree/bindings/regulator/sy8106a-regulator.txt
 +
  SYNC FILE FRAMEWORK
  M:    Sumit Semwal <[email protected]>
  R:    Gustavo Padovan <[email protected]>
@@@ -14554,15 -14364,6 +14554,15 @@@ S: Maintaine
  F:    drivers/tc/
  F:    include/linux/tc.h
  
 +TURBOSTAT UTILITY
 +M:    "Len Brown" <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
  M:    Anton Sviridenko <[email protected]>
@@@ -14809,9 -14610,7 +14809,9 @@@ M:   Woojung Huh <[email protected]
  M:    Microchip Linux Driver Support <[email protected]>
  L:    [email protected]
  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 <[email protected]>
@@@ -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 <[email protected]>
  S:    Maintained
  F:    drivers/media/platform/video-mux.c
  
 +VIDEO I2C POLLING DRIVER
 +M:    Matt Ranostay <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/media/i2c/video-i2c.c
 +
  VIDEOBUF2 FRAMEWORK
  M:    Pawel Osciak <[email protected]>
  M:    Marek Szyprowski <[email protected]>
@@@ -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 <[email protected]>
 +M:    Magnus Karlsson <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    kernel/bpf/xskmap.c
 +F:    net/xdp/
 +
  XEN BLOCK SUBSYSTEM
  M:    Konrad Rzeszutek Wilk <[email protected]>
  M:    Roger Pau Monné <[email protected]>
@@@ -15684,13 -15468,6 +15684,13 @@@ S: Supporte
  F:    arch/x86/xen/*swiotlb*
  F:    drivers/xen/*swiotlb*
  
 +XEN SOUND FRONTEND DRIVER
 +M:    Oleksandr Andrushchenko <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Supported
 +F:    sound/xen/*
 +
  XFS FILESYSTEM
  M:    Darrick J. Wong <[email protected]>
  M:    [email protected]
  S:    Supported
  F:    drivers/char/xillybus/
  
 +XLP9XX I2C DRIVER
 +M:    George Cherian <[email protected]>
 +M:    Jan Glauber <[email protected]>
 +L:    [email protected]
 +W:    http://www.cavium.com
 +S:    Supported
 +F:    drivers/i2c/busses/i2c-xlp9xx.c
 +
  XRA1403 GPIO EXPANDER
  M:    Nandor Han <[email protected]>
  M:    Semi Malinen <[email protected]>
  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 <[email protected]>
  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 <[email protected]>
index 19124f0efe60c1a0445b1eccfdec977f8e56c169,17e781285a8856f772a804ccd6f8a194978aacb9..37a3de760d40f4f27ad4cdbad5ff41973bdda75c
@@@ -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) += \
        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 \
        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 \
        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 \
        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
index f07f9018c3e72e4631967dc3ca3c3da8d6772aef,d1e582b0ab6618aeb6b9ef7cad28b594b5797fbf..092610e3f953167c22b71edf7242aa6e2e29c836
                                port@0 {
                                        reg = <0>;
                                        adv7511_in: endpoint {
 -                                              remote-endpoint = <&du_out_lvds0>;
 +                                              remote-endpoint = <&lvds0_out>;
                                        };
                                };
  
        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 {
                                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 {
                        };
                };
        status = "okay";
  
        port {
-               #address-cells = <1>;
-               #size-cells = <0>;
                vin1ep0: endpoint {
                        remote-endpoint = <&adv7180>;
                        bus-width = <8>;
        };
  };
  
+ &rwdt {
+       timeout-sec = <60>;
+       status = "okay";
+ };
  &ssi1 {
        shared-pin;
  };
index 05a0fc23ac88f8ded558fe31da8ae15358c1ad15,ae97ec1462600897e9ba9de61b72f64acf952530..4d06b154bd7ebd9eaa07436e6235bdacd76289f9
                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";
                #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";
  
                        smp-sram@0 {
                                compatible = "renesas,smp-sram";
-                               reg = <0 0x10>;
+                               reg = <0 0x100>;
                        };
                };
  
                        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>;
                        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";
  
                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 {
                                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 {
                                        };
                                };
                        };
  
        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 */
index 9d7213a0b8b826506e14c51b95fe10724434b9b6,68e8272cb90ed025f13d6680b5dd83eb4cbb6a2e..8ab793d8b2fd76c894b28e79de34c6b97ddea308
        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 {
                                remote-endpoint = <&adv7511_in>;
                        };
                };
 +      };
 +};
 +
 +&lvds0 {
 +      status = "okay";
 +
 +      ports {
                port@1 {
                        lvds_connector: endpoint {
                        };
        status = "okay";
  };
  
+ &rwdt {
+       timeout-sec = <60>;
+       status = "okay";
+ };
  &sata0 {
        status = "okay";
  };
        pinctrl-names = "default";
  
        port {
-               #address-cells = <1>;
-               #size-cells = <0>;
                vin0ep2: endpoint {
                        remote-endpoint = <&adv7612_out>;
                        bus-width = <24>;
        pinctrl-names = "default";
  
        port {
-               #address-cells = <1>;
-               #size-cells = <0>;
                vin1ep: endpoint {
                        remote-endpoint = <&adv7180>;
                        bus-width = <8>;
index ae9ed9ff53efde994a4d4735227bb0a8199fab81,876d38f4636775cb13c212df6045f8a4f7651abe..a01101b49d993c185249009b063d6ef0b80d13bc
        pinctrl-names = "default";
  
        port {
-               #address-cells = <1>;
-               #size-cells = <0>;
                vin0ep: endpoint {
                        remote-endpoint = <&adv7180>;
                        bus-width = <8>;
        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 {
        };
  };
  
 +&lvds0 {
 +      status = "okay";
 +
 +      ports {
 +              port@1 {
 +                      lvds_connector: endpoint {
 +                      };
 +              };
 +      };
 +};
 +
  &rcar_sound {
        pinctrl-0 = <&ssi_pins &audio_clk_pins>;
        pinctrl-names = "default";
        };
  };
  
+ &rwdt {
+       timeout-sec = <60>;
+       status = "okay";
+ };
  &ssi1 {
        shared-pin;
  };
index 506b20885413398825a353b6b84938175cfd255f,828ad78c33378408e45e7d3393f60bd7847822cf..6e1dd7ad7bd647e7db66c1db8947c1d9718957ce
                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";
                #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";
  
                        smp-sram@0 {
                                compatible = "renesas,smp-sram";
-                               reg = <0 0x10>;
+                               reg = <0 0x100>;
                        };
                };
  
                        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";
  
                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 {
                                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 {
                                        };
                                };
                        };
index 96e117d8b2cce0f8e4070d05fdb48995775ee667,ec94e2402bdf6dd4aa2b2fae694586c3f6385d50..aa209f6e5d712e6cf021e9712c8287f1e98104ec
        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 {
                                remote-endpoint = <&adv7511_in>;
                        };
                };
 +      };
 +};
 +
 +&lvds0 {
 +      ports {
                port@1 {
                        lvds_connector: endpoint {
                        };
        status = "okay";
  };
  
+ &rwdt {
+       timeout-sec = <60>;
+       status = "okay";
+ };
  &scif0 {
        pinctrl-0 = <&scif0_pins>;
        pinctrl-names = "default";
        pinctrl-names = "default";
  
        port {
-               #address-cells = <1>;
-               #size-cells = <0>;
                vin0ep2: endpoint {
                        remote-endpoint = <&adv7612_out>;
                        bus-width = <24>;
        status = "okay";
  
        port {
-               #address-cells = <1>;
-               #size-cells = <0>;
                vin1ep: endpoint {
                        remote-endpoint = <&adv7180_out>;
                        bus-width = <8>;
index 4f526030dc7cb7011e67f8ff26fad601d6af867f,4c29de51048109f883668a6bd4ba2fa13bc50c76..4abecfc0ca98c48346114b5f44600e795182aedb
                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";
                #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";
  
                        smp-sram@0 {
                                compatible = "renesas,smp-sram";
-                               reg = <0 0x10>;
+                               reg = <0 0x100>;
                        };
                };
  
                        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 {
                                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 0b49a62b38a3800aff88b76307a294d093876dd4,26fb43847f4b8926454fdbcdbc1a08016a71bc52..59731a950c1f01262c2820c7f7f82f334b0f4762
@@@ -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
                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 d053f2634c67a30da9c04a9b0f484c2d6683c59e,7093fe79934bf890f74a341d95d6a594e29f1019..9dc02f390ba314bf8cfbb1b86223af1859af2507
@@@ -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
index 39de5dee55d9d3835b6c1f91d227ef2abae26fde,cbf414cfe6aa8394bc8a5439cba0e0bbb5c13d00..19dcf957cb3a052bb339d0559223adc45b05c43d
@@@ -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
This page took 0.208715 seconds and 4 git commands to generate.