]> Git Repo - linux.git/commitdiff
projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 7f1b9be a48a7b6)
Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
authorLinus Torvalds <[email protected]>
Mon, 11 Sep 2017 03:40:00 +0000 (20:40 -0700)
committerLinus Torvalds <[email protected]>
Mon, 11 Sep 2017 03:40:00 +0000 (20:40 -0700)
Pull ARM SoC driver updates from Olof Johansson:
 "This branch contains platform-related driver updates for ARM and ARM64.

  Among them:

   - Reset driver updates:
     + New API for dealing with arrays of resets
     + Make unimplemented {de,}assert return success on shared resets
     + MSDKv1 driver
     + Removal of obsolete Gemini reset driver
     + Misc updates for sunxi and Uniphier

   - SoC drivers:
     + Platform SoC driver registration on Tegra
     + Shuffle of Qualcomm drivers into a submenu
     + Allwinner A64 support for SRAM
     + Renesas R-Car R3 support
     + Power domains for Rockchip RK3366

   - Misc updates and smaller fixes for TEE and memory driver
     subsystems"

* tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (54 commits)
  firmware: arm_scpi: fix endianness of dev_id in struct dev_pstate_set
  soc/tegra: fuse: Add missing semi-colon
  soc/tegra: Restrict SoC device registration to Tegra
  drivers: soc: sunxi: add support for A64 and its SRAM C
  drivers: soc: sunxi: add support for remapping func value to reg value
  drivers: soc: sunxi: fix error processing on base address when claiming
  dt-bindings: add binding for Allwinner A64 SRAM controller and SRAM C
  bus: sunxi-rsb: Enable by default for ARM64
  soc/tegra: Register SoC device
  firmware: tegra: set drvdata earlier
  memory: Convert to using %pOF instead of full_name
  soc: Convert to using %pOF instead of full_name
  bus: Convert to using %pOF instead of full_name
  firmware: Convert to using %pOF instead of full_name
  soc: mediatek: add SCPSYS power domain driver for MediaTek MT7622 SoC
  soc: mediatek: add header files required for MT7622 SCPSYS dt-binding
  soc: mediatek: reduce code duplication of scpsys_probe across all SoCs
  dt-bindings: soc: update the binding document for SCPSYS on MediaTek MT7622 SoC
  reset: uniphier: add analog amplifiers reset control
  reset: uniphier: add video input subsystem reset control
  ...

1  2 
Documentation/devicetree/bindings/sram/sunxi-sram.txt patch | diff1 | diff2 | blob | history
MAINTAINERS patch | diff1 | diff2 | blob | history
drivers/memory/atmel-ebi.c patch | diff1 | diff2 | blob | history
drivers/soc/qcom/Kconfig patch | diff1 | diff2 | blob | history

diff --combined Documentation/devicetree/bindings/sram/sunxi-sram.txt
index 170034e6c8b0e3927f5a4d8b41b3b8cc1ba8ec36,f34b3a553d7c703df4388035b80dc521ec98c88b..6bb92a1df753e5ae7b74f17b435a511210acbe19
--- 1/Documentation/devicetree/bindings/sram/sunxi-sram.txt
--- 2/Documentation/devicetree/bindings/sram/sunxi-sram.txt
+++ b/Documentation/devicetree/bindings/sram/sunxi-sram.txt
@@@ -9,7 -9,9 +9,9 @@@ Controller Nod
  ---------------
  
  Required properties:
- - compatible : "allwinner,sun4i-a10-sram-controller"
+ - compatible : should be:
+     - "allwinner,sun4i-a10-sram-controller"
+     - "allwinner,sun50i-a64-sram-controller"
  - reg : sram controller register offset + length
  
  SRAM nodes
@@@ -22,10 -24,13 +24,13 @@@ Each SRAM will have SRAM sections that 
  SRAM controller as subnodes. These sections are represented following
  once again the representation described in the mmio-sram binding.
  
- The valid sections compatible are:
+ The valid sections compatible for A10 are:
      - allwinner,sun4i-a10-sram-a3-a4
      - allwinner,sun4i-a10-sram-d
  
+ The valid sections compatible for A64 are:
+     - allwinner,sun50i-a64-sram-c
+ 
  Devices using SRAM sections
  ---------------------------
  
@@@ -59,6 -64,7 +64,6 @@@ sram-controller@01c00000 
                emac_sram: sram-section@8000 {
                        compatible = "allwinner,sun4i-a10-sram-a3-a4";
                        reg = <0x8000 0x4000>;
 -                      status = "disabled";
                };
        };
  };
diff --combined MAINTAINERS
index 1c767c1e796256aa5a666cdee09a9bccf2ac001d,3a21e206ada9bc3dc55dda2be29411a1109f6c49..fbb269415f0672c408558289ec5c4a5d5cdafcc5
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -301,7 -301,6 +301,7 @@@ S: Supporte
  F:    drivers/acpi/
  F:    drivers/pnp/pnpacpi/
  F:    include/linux/acpi.h
 +F:    include/linux/fwnode.h
  F:    include/acpi/
  F:    Documentation/acpi/
  F:    Documentation/ABI/testing/sysfs-bus-acpi
@@@ -311,14 -310,6 +311,14 @@@ F:       drivers/pci/*/*acpi
  F:    drivers/pci/*/*/*acpi*
  F:    tools/power/acpi/
  
 +ACPI APEI
 +M:    "Rafael J. Wysocki" <[email protected]>
 +M:    Len Brown <[email protected]>
 +L:    [email protected]
 +R:    Tony Luck <[email protected]>
 +R:    Borislav Petkov <[email protected]>
 +F:    drivers/acpi/apei/
 +
  ACPI COMPONENT ARCHITECTURE (ACPICA)
  M:    Robert Moore <[email protected]>
  M:    Lv Zheng <[email protected]>
@@@ -778,12 -769,6 +778,12 @@@ W:       http://ez.analog.com/community/linux
  S:    Supported
  F:    drivers/media/i2c/adv7180.c
  
 +ANALOG DEVICES INC ADV748X DRIVER
 +M:    Kieran Bingham <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/media/i2c/adv748x/*
 +
  ANALOG DEVICES INC ADV7511 DRIVER
  M:    Hans Verkuil <[email protected]>
  L:    [email protected]
@@@ -1168,7 -1153,6 +1168,7 @@@ L:      [email protected]
  F:    arch/arm/mach-artpec
  F:    arch/arm/boot/dts/artpec6*
  F:    drivers/clk/axis
 +F:    drivers/crypto/axis
  F:    drivers/pinctrl/pinctrl-artpec*
  F:    Documentation/devicetree/bindings/pinctrl/axis,artpec6-pinctrl.txt
  
@@@ -1177,7 -1161,7 +1177,7 @@@ M:      Brendan Higgins <brendanhiggins@goog
  R:    Benjamin Herrenschmidt <[email protected]>
  R:    Joel Stanley <[email protected]>
  L:    [email protected]
 -L:    [email protected]
 +L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    drivers/irqchip/irq-aspeed-i2c-ic.c
  F:    drivers/i2c/busses/i2c-aspeed.c
@@@ -1298,15 -1282,10 +1298,15 @@@ S:   Maintaine
  
  ARM/CORTINA SYSTEMS GEMINI ARM ARCHITECTURE
  M:    Hans Ulli Kroll <[email protected]>
 +M:    Linus Walleij <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  T:    git git://github.com/ulli-kroll/linux.git
  S:    Maintained
 +F:    Documentation/devicetree/bindings/arm/gemini.txt
 +F:    Documentation/devicetree/bindings/pinctrl/cortina,gemini-pinctrl.txt
 +F:    Documentation/devicetree/bindings/rtc/faraday,ftrtc010.txt
  F:    arch/arm/mach-gemini/
 +F:    drivers/pinctrl/pinctrl-gemini.c
  F:    drivers/rtc/rtc-ftrtc010.c
  
  ARM/CSR SIRFPRIMA2 MACHINE SUPPORT
@@@ -1591,7 -1570,7 +1591,7 @@@ M:      Chunfeng Yun <chunfeng.yun@mediatek.
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
 -F:    drivers/phy/phy-mt65xx-usb3.c
 +F:    drivers/phy/mediatek/phy-mtk-tphy.c
  
  ARM/MICREL KS8695 ARCHITECTURE
  M:    Greg Ungerer <[email protected]>
@@@ -2014,7 -1993,6 +2014,7 @@@ F:      arch/arm64/boot/dts/socionext
  F:    drivers/bus/uniphier-system-bus.c
  F:    drivers/clk/uniphier/
  F:    drivers/i2c/busses/i2c-uniphier*
 +F:    drivers/irqchip/irq-uniphier-aidet.c
  F:    drivers/pinctrl/uniphier/
  F:    drivers/reset/reset-uniphier.c
  F:    drivers/tty/serial/8250/8250_uniphier.c
@@@ -2101,38 -2079,17 +2101,38 @@@ F:   arch/arm/mach-pxa/include/mach/z2.
  ARM/ZTE ARCHITECTURE
  M:    Jun Nie <[email protected]>
  M:    Baoyou Xie <[email protected]>
 +M:    Shawn Guo <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
 +F:    arch/arm/boot/dts/zx2967*
  F:    arch/arm/mach-zx/
 +F:    arch/arm64/boot/dts/zte/
  F:    drivers/clk/zte/
 +F:    drivers/dma/zx_dma.c
 +F:    drivers/gpio/gpio-zx.c
 +F:    drivers/i2c/busses/i2c-zx2967.c
 +F:    drivers/mmc/host/dw_mmc-zx.*
 +F:    drivers/pinctrl/zte/
  F:    drivers/reset/reset-zx2967.c
  F:    drivers/soc/zte/
 +F:    drivers/thermal/zx2967_thermal.c
 +F:    drivers/watchdog/zx2967_wdt.c
  F:    Documentation/devicetree/bindings/arm/zte.txt
 -F:    Documentation/devicetree/bindings/clock/zx296702-clk.txt
 +F:    Documentation/devicetree/bindings/clock/zx2967*.txt
 +F:    Documentation/devicetree/bindings/dma/zxdma.txt
 +F:    Documentation/devicetree/bindings/gpio/zx296702-gpio.txt
 +F:    Documentation/devicetree/bindings/i2c/i2c-zx2967.txt
 +F:    Documentation/devicetree/bindings/mmc/zx-dw-mshc.txt
 +F:    Documentation/devicetree/bindings/pinctrl/pinctrl-zx.txt
  F:    Documentation/devicetree/bindings/reset/zte,zx2967-reset.txt
  F:    Documentation/devicetree/bindings/soc/zte/
 -F:    include/dt-bindings/soc/zx*.h
 +F:    Documentation/devicetree/bindings/sound/zte,*.txt
 +F:    Documentation/devicetree/bindings/thermal/zx2967-thermal.txt
 +F:    Documentation/devicetree/bindings/watchdog/zte,zx2967-wdt.txt
 +F:    include/dt-bindings/clock/zx2967*.h
 +F:    include/dt-bindings/soc/zte,*.h
 +F:    sound/soc/codecs/zx_aud96p22.c
 +F:    sound/soc/zte/
  
  ARM/ZYNQ ARCHITECTURE
  M:    Michal Simek <[email protected]>
@@@ -2160,12 -2117,6 +2160,12 @@@ S:    Maintaine
  F:    arch/arm64/
  F:    Documentation/arm64/
  
 +AS3645A LED FLASH CONTROLLER DRIVER
 +M:    Sakari Ailus <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/leds/leds-as3645a.c
 +
  AS3645A LED FLASH CONTROLLER DRIVER
  M:    Laurent Pinchart <[email protected]>
  L:    [email protected]
@@@ -2434,10 -2385,9 +2434,10 @@@ AUDIT SUBSYSTE
  M:    Paul Moore <[email protected]>
  M:    Eric Paris <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
 -W:    http://people.redhat.com/sgrubb/audit/
 -T:    git git://git.infradead.org/users/pcmoore/audit
 -S:    Maintained
 +W:    https://github.com/linux-audit
 +W:    https://people.redhat.com/sgrubb/audit
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git
 +S:    Supported
  F:    include/linux/audit.h
  F:    include/uapi/linux/audit.h
  F:    kernel/audit*
@@@ -2527,7 -2477,7 +2527,7 @@@ Q:      https://patchwork.open-mesh.org/proj
  S:    Maintained
  F:    Documentation/ABI/testing/sysfs-class-net-batman-adv
  F:    Documentation/ABI/testing/sysfs-class-net-mesh
 -F:    Documentation/networking/batman-adv.txt
 +F:    Documentation/networking/batman-adv.rst
  F:    include/uapi/linux/batman_adv.h
  F:    net/batman-adv/
  
@@@ -2596,6 -2546,13 +2596,6 @@@ W:     http://blackfin.uclinux.or
  S:    Supported
  F:    drivers/net/ethernet/adi/
  
 -BLACKFIN I2C TWI DRIVER
 -M:    Sonic Zhang <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -W:    http://blackfin.uclinux.org/
 -S:    Supported
 -F:    drivers/i2c/busses/i2c-bfin-twi.c
 -
  BLACKFIN MEDIA DRIVER
  M:    Scott Jiang <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -2612,12 -2569,14 +2612,12 @@@ S:   Supporte
  F:    drivers/rtc/rtc-bfin.c
  
  BLACKFIN SDH DRIVER
 -M:    Sonic Zhang <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  W:    http://blackfin.uclinux.org
  S:    Supported
  F:    drivers/mmc/host/bfin_sdh.c
  
  BLACKFIN SERIAL DRIVER
 -M:    Sonic Zhang <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  W:    http://blackfin.uclinux.org
  S:    Supported
@@@ -3196,7 -3155,6 +3196,7 @@@ S:      Supporte
  F:    drivers/crypto/cavium/cpt/
  
  CAVIUM THUNDERX2 ARM64 SOC
 +M:    Robert Richter <[email protected]>
  M:    Jayachandran C <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
@@@ -4150,9 -4108,7 +4150,9 @@@ F:      include/linux/dax.
  F:    include/trace/events/fs_dax.h
  
  DIRECTORY NOTIFICATION (DNOTIFY)
 -M:    Eric Paris <[email protected]>
 +M:    Jan Kara <[email protected]>
 +R:    Amir Goldstein <[email protected]>
 +L:    [email protected]
  S:    Maintained
  F:    Documentation/filesystems/dnotify.txt
  F:    fs/notify/dnotify/
@@@ -4403,12 -4359,6 +4403,12 @@@ S:    Maintaine
  F:    drivers/gpu/drm/qxl/
  F:    include/uapi/drm/qxl_drm.h
  
 +DRM DRIVER FOR PERVASIVE DISPLAYS REPAPER PANELS
 +M:    Noralf Trønnes <[email protected]>
 +S:    Maintained
 +F:    drivers/gpu/drm/tinydrm/repaper.c
 +F:    Documentation/devicetree/bindings/display/repaper.txt
 +
  DRM DRIVER FOR RAGE 128 VIDEO CARDS
  S:    Orphan / Obsolete
  F:    drivers/gpu/drm/r128/
@@@ -4424,12 -4374,6 +4424,12 @@@ S:    Orphan / Obsolet
  F:    drivers/gpu/drm/sis/
  F:    include/uapi/drm/sis_drm.h
  
 +DRM DRIVER FOR SITRONIX ST7586 PANELS
 +M:    David Lechner <[email protected]>
 +S:    Maintained
 +F:    drivers/gpu/drm/tinydrm/st7586.c
 +F:    Documentation/devicetree/bindings/display/st7586.txt
 +
  DRM DRIVER FOR TDFX VIDEO CARDS
  S:    Orphan / Obsolete
  F:    drivers/gpu/drm/tdfx/
@@@ -4678,14 -4622,6 +4678,14 @@@ F:    drivers/gpu/drm/panel
  F:    include/drm/drm_panel.h
  F:    Documentation/devicetree/bindings/display/panel/
  
 +DRM TINYDRM DRIVERS
 +M:    Noralf Trønnes <[email protected]>
 +W:    https://github.com/notro/tinydrm/wiki/Development
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +S:    Maintained
 +F:    drivers/gpu/drm/tinydrm/
 +F:    include/drm/tinydrm/
 +
  DSBR100 USB FM RADIO DRIVER
  M:    Alexey Klimov <[email protected]>
  L:    [email protected]
@@@ -5165,7 -5101,6 +5165,7 @@@ F:      include/linux/of_net.
  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
  F:    include/uapi/linux/mii.h
@@@ -5263,9 -5198,7 +5263,9 @@@ F:      Documentation/hwmon/f71805
  F:    drivers/hwmon/f71805f.c
  
  FANOTIFY
 -M:    Eric Paris <[email protected]>
 +M:    Jan Kara <[email protected]>
 +R:    Amir Goldstein <[email protected]>
 +L:    [email protected]
  S:    Maintained
  F:    fs/notify/fanotify/
  F:    include/linux/fanotify.h
@@@ -5408,11 -5341,10 +5408,11 @@@ K:   fmc_d.*registe
  
  FPGA MANAGER FRAMEWORK
  M:    Alan Tull <[email protected]>
 -R:    Moritz Fischer <m[email protected]>
 +R:    Moritz Fischer <m[email protected]>
  L:    [email protected]
  S:    Maintained
  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/devicetree/bindings/fpga/
  F:    drivers/fpga/
@@@ -5831,12 -5763,6 +5831,12 @@@ S:    Maintaine
  F:    Documentation/acpi/gpio-properties.txt
  F:    drivers/gpio/gpiolib-acpi.c
  
 +GPIO IR Transmitter
 +M:    Sean Young <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/media/rc/gpio-ir-tx.c
 +
  GPIO MOCKUP DRIVER
  M:    Bamvor Jian Zhang <[email protected]>
  L:    [email protected]
@@@ -5908,7 -5834,7 +5908,7 @@@ F:      drivers/staging/greybus/spi.
  F:    drivers/staging/greybus/spilib.c
  F:    drivers/staging/greybus/spilib.h
  
 -GREYBUS LOOBACK/TIME PROTOCOLS DRIVERS
 +GREYBUS LOOPBACK/TIME PROTOCOLS DRIVERS
  M:    Bryan O'Donoghue <[email protected]>
  S:    Maintained
  F:    drivers/staging/greybus/loopback.c
@@@ -6106,6 -6032,16 +6106,6 @@@ F:     drivers/scsi/hpsa*.[ch
  F:    include/linux/cciss*.h
  F:    include/uapi/linux/cciss*.h
  
 -HEWLETT-PACKARD SMART CISS RAID DRIVER (cciss)
 -M:    Don Brace <[email protected]>
 -L:    [email protected]
 -L:    [email protected]
 -S:    Supported
 -F:    Documentation/blockdev/cciss.txt
 -F:    drivers/block/cciss*
 -F:    include/linux/cciss_ioctl.h
 -F:    include/uapi/linux/cciss_ioctl.h
 -
  HFI1 DRIVER
  M:    Mike Marciniszyn <[email protected]>
  M:    Dennis Dalessandro <[email protected]>
@@@ -6211,14 -6147,6 +6211,14 @@@ S:    Maintaine
  F:    drivers/net/ethernet/hisilicon/
  F:    Documentation/devicetree/bindings/net/hisilicon*.txt
  
 +HISILICON NETWORK SUBSYSTEM 3 DRIVER (HNS3)
 +M:    Yisen Zhuang <[email protected]>
 +M:    Salil Mehta <[email protected]>
 +L:    [email protected]
 +W:    http://www.hisilicon.com
 +S:    Maintained
 +F:    drivers/net/ethernet/hisilicon/hns3/
 +
  HISILICON ROCE DRIVER
  M:    Lijun Ou <[email protected]>
  M:    Wei Hu(Xavier) <[email protected]>
@@@ -6303,13 -6231,6 +6303,13 @@@ L:    [email protected]
  S:    Maintained
  F:    drivers/input/touchscreen/htcpen.c
  
 +HUAWEI ETHERNET DRIVER
 +M:    Aviad Krawczyk <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    Documentation/networking/hinic.txt
 +F:    drivers/net/ethernet/huawei/hinic/
 +
  HUGETLB FILESYSTEM
  M:    Nadia Yvette Chambers <[email protected]>
  S:    Maintained
@@@ -6336,9 -6257,7 +6336,9 @@@ M:      Haiyang Zhang <[email protected]
  M:    Stephen Hemminger <[email protected]>
  L:    [email protected]
  S:    Maintained
 +F:    Documentation/networking/netvsc.txt
  F:    arch/x86/include/asm/mshyperv.h
 +F:    arch/x86/include/asm/trace/hyperv.h
  F:    arch/x86/include/uapi/asm/hyperv.h
  F:    arch/x86/kernel/cpu/mshyperv.c
  F:    arch/x86/hyperv
@@@ -6350,9 -6269,7 +6350,9 @@@ F:      drivers/net/hyperv
  F:    drivers/scsi/storvsc_drv.c
  F:    drivers/uio/uio_hv_generic.c
  F:    drivers/video/fbdev/hyperv_fb.c
 +F:    net/vmw_vsock/hyperv_transport.c
  F:    include/linux/hyperv.h
 +F:    include/uapi/linux/hyperv.h
  F:    tools/hv/
  F:    Documentation/ABI/stable/sysfs-bus-vmbus
  
@@@ -6454,12 -6371,6 +6454,12 @@@ F:    drivers/i2c/busses/i2c-sis96x.
  F:    drivers/i2c/busses/i2c-via.c
  F:    drivers/i2c/busses/i2c-viapro.c
  
 +I2C/SMBUS INTEL CHT WHISKEY COVE PMIC DRIVER
 +M:    Hans de Goede <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/i2c/busses/i2c-cht-wc.c
 +
  I2C/SMBUS ISMT DRIVER
  M:    Seth Heasley <[email protected]>
  M:    Neil Horman <[email protected]>
@@@ -6526,15 -6437,6 +6526,15 @@@ L:    [email protected]
  S:    Supported
  F:    drivers/net/ethernet/ibm/ibmvnic.*
  
 +IBM Power Virtual Accelerator Switchboard
 +M:    Sukadev Bhattiprolu
 +L:    [email protected]
 +S:    Supported
 +F:    arch/powerpc/platforms/powernv/vas*
 +F:    arch/powerpc/platforms/powernv/copy-paste.h
 +F:    arch/powerpc/include/asm/vas.h
 +F:    arch/powerpc/include/uapi/asm/vas.h
 +
  IBM Power Virtual Ethernet Device Driver
  M:    Thomas Falcon <[email protected]>
  L:    [email protected]
@@@ -6771,9 -6673,9 +6771,9 @@@ S:      Maintaine
  F:    drivers/mtd/nand/jz4780_*
  
  INOTIFY
 -M:    John McCutchan <[email protected]>
 -M:    Robert Love <[email protected]>
 -M:    Eric Paris <[email protected]>
 +M:    Jan Kara <[email protected]>
 +R:    Amir Goldstein <[email protected]>
 +L:    [email protected]
  S:    Maintained
  F:    Documentation/filesystems/inotify.txt
  F:    fs/notify/inotify/
@@@ -6842,9 -6744,8 +6842,9 @@@ S:      Supporte
  F:    drivers/scsi/isci/
  
  INTEL DRM DRIVERS (excluding Poulsbo, Moorestown and derivative chipsets)
 -M:    Daniel Vetter <[email protected]>
  M:    Jani Nikula <[email protected]>
 +M:    Joonas Lahtinen <[email protected]>
 +M:    Rodrigo Vivi <[email protected]>
  L:    [email protected]
  W:    https://01.org/linuxgraphics/
  B:    https://01.org/linuxgraphics/documentation/how-report-bugs
@@@ -7182,7 -7083,9 +7182,7 @@@ W:      http://irda.sourceforge.net
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/irda-2.6.git
  F:    Documentation/networking/irda.txt
 -F:    drivers/net/irda/
 -F:    include/net/irda/
 -F:    net/irda/
 +F:    drivers/staging/irda/
  
  IRQ DOMAINS (IRQ NUMBER MAPPING LIBRARY)
  M:    Marc Zyngier <[email protected]>
@@@ -7207,6 -7110,7 +7207,6 @@@ M:      Marc Zyngier <[email protected]
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core
 -T:    git git://git.infradead.org/users/jcooper/linux.git irqchip/core
  F:    Documentation/devicetree/bindings/interrupt-controller/
  F:    drivers/irqchip/
  
@@@ -7476,13 -7380,6 +7476,13 @@@ S:    Maintaine
  F:    tools/testing/selftests/
  F:    Documentation/dev-tools/kselftest*
  
 +KERNEL USERMODE HELPER
 +M:    "Luis R. Rodriguez" <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    kernel/umh.c
 +F:    include/linux/umh.h
 +
  KERNEL VIRTUAL MACHINE (KVM)
  M:    Paolo Bonzini <[email protected]>
  M:    Radim Krčmář <[email protected]>
@@@ -7490,30 -7387,18 +7490,30 @@@ L:   [email protected]
  W:    http://www.linux-kvm.org
  T:    git git://git.kernel.org/pub/scm/virt/kvm/kvm.git
  S:    Supported
 -F:    Documentation/*/kvm*.txt
  F:    Documentation/virtual/kvm/
 -F:    arch/*/kvm/
 -F:    arch/x86/kernel/kvm.c
 -F:    arch/x86/kernel/kvmclock.c
 -F:    arch/*/include/asm/kvm*
 -F:    include/linux/kvm*
 +F:    include/trace/events/kvm.h
 +F:    include/uapi/asm-generic/kvm*
  F:    include/uapi/linux/kvm*
 -F:    virt/kvm/
 +F:    include/asm-generic/kvm*
 +F:    include/linux/kvm*
 +F:    include/kvm/iodev.h
 +F:    virt/kvm/*
  F:    tools/kvm/
  
 -KERNEL VIRTUAL MACHINE (KVM) FOR AMD-V
 +KERNEL VIRTUAL MACHINE FOR X86 (KVM/x86)
 +M:    Paolo Bonzini <[email protected]>
 +M:    Radim KrÄmář <[email protected]>
 +L:    [email protected]
 +W:    http://www.linux-kvm.org
 +T:    git git://git.kernel.org/pub/scm/virt/kvm/kvm.git
 +S:    Supported
 +F:    arch/x86/kvm/
 +F:    arch/x86/include/uapi/asm/kvm*
 +F:    arch/x86/include/asm/kvm*
 +F:    arch/x86/kernel/kvm.c
 +F:    arch/x86/kernel/kvmclock.c
 +
 +KERNEL VIRTUAL MACHINE FOR AMD-V (KVM/amd)
  M:    Joerg Roedel <[email protected]>
  L:    [email protected]
  W:    http://www.linux-kvm.org/
@@@ -7521,7 -7406,7 +7521,7 @@@ S:      Maintaine
  F:    arch/x86/include/asm/svm.h
  F:    arch/x86/kvm/svm.c
  
 -KERNEL VIRTUAL MACHINE (KVM) FOR ARM
 +KERNEL VIRTUAL MACHINE FOR ARM (KVM/arm)
  M:    Christoffer Dall <[email protected]>
  M:    Marc Zyngier <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -7535,16 -7420,14 +7535,16 @@@ F:   arch/arm/kvm
  F:    virt/kvm/arm/
  F:    include/kvm/arm_*
  
 -KERNEL VIRTUAL MACHINE (KVM) FOR POWERPC
 +KERNEL VIRTUAL MACHINE FOR POWERPC (KVM/powerpc)
  M:    Alexander Graf <[email protected]>
  L:    [email protected]
  W:    http://www.linux-kvm.org/
  T:    git git://github.com/agraf/linux-2.6.git
  S:    Supported
 +F:    arch/powerpc/include/uapi/asm/kvm*
  F:    arch/powerpc/include/asm/kvm*
  F:    arch/powerpc/kvm/
 +F:    arch/powerpc/kernel/kvm*
  
  KERNEL VIRTUAL MACHINE FOR ARM64 (KVM/arm64)
  M:    Christoffer Dall <[email protected]>
@@@ -7571,8 -7454,7 +7571,8 @@@ L:      [email protected]
  W:    http://www.ibm.com/developerworks/linux/linux390/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git
  S:    Supported
 -F:    Documentation/s390/kvm.txt
 +F:    arch/s390/include/uapi/asm/kvm*
 +F:    arch/s390/include/asm/gmap.h
  F:    arch/s390/include/asm/kvm*
  F:    arch/s390/kvm/
  F:    arch/s390/mm/gmap.c
@@@ -7658,7 -7540,7 +7658,7 @@@ F:      include/linux/kmemleak.
  F:    mm/kmemleak.c
  F:    mm/kmemleak-test.c
  
 -KMOD MODULE USERMODE HELPER
 +KMOD KERNEL MODULE LOADER - USERMODE HELPER
  M:    "Luis R. Rodriguez" <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -7758,6 -7640,17 +7758,6 @@@ T:     git git://linuxtv.org/mkrufky/tuners
  S:    Maintained
  F:    drivers/media/dvb-frontends/lgdt3305.*
  
 -LGUEST
 -M:    Rusty Russell <[email protected]>
 -L:    [email protected]
 -W:    http://lguest.ozlabs.org/
 -S:    Odd Fixes
 -F:    arch/x86/include/asm/lguest*.h
 -F:    arch/x86/lguest/
 -F:    drivers/lguest/
 -F:    include/linux/lguest*.h
 -F:    tools/lguest/
 -
  LIBATA PATA ARASAN COMPACT FLASH CONTROLLER
  M:    Viresh Kumar <[email protected]>
  L:    [email protected]
@@@ -7816,13 -7709,6 +7816,13 @@@ M:    Sasha Levin <alexander.levin@verizon
  S:    Maintained
  F:    tools/lib/lockdep/
  
 +HMM - Heterogeneous Memory Management
 +M:    Jérôme Glisse <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    mm/hmm*
 +F:    include/linux/hmm*
 +
  LIBNVDIMM BLK: MMIO-APERTURE DRIVER
  M:    Ross Zwisler <[email protected]>
  L:    [email protected]
@@@ -7900,7 -7786,6 +7900,7 @@@ F:      drivers/pci/hotplug/rpa
  F:    drivers/rtc/rtc-opal.c
  F:    drivers/scsi/ibmvscsi/
  F:    drivers/tty/hvc/hvc_opal.c
 +F:    drivers/watchdog/wdrtas.c
  F:    tools/testing/selftests/powerpc
  N:    /pmac
  N:    powermac
@@@ -8458,14 -8343,6 +8458,14 @@@ T:    git git://linuxtv.org/media_tree.gi
  S:    Supported
  F:    drivers/media/dvb-frontends/lnbh25*
  
 +MEDIA DRIVERS FOR MXL5XX TUNER DEMODULATORS
 +M:    Daniel Scheller <[email protected]>
 +L:    [email protected]
 +W:    https://linuxtv.org
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/dvb-frontends/mxl5xx*
 +
  MEDIA DRIVERS FOR NETUP PCI UNIVERSAL DVB devices
  M:    Sergey Kozlov <[email protected]>
  M:    Abylay Ospan <[email protected]>
@@@ -8522,30 -8399,6 +8522,30 @@@ S:    Supporte
  F:    Documentation/devicetree/bindings/media/renesas,vsp1.txt
  F:    drivers/media/platform/vsp1/
  
 +MEDIA DRIVERS FOR ST STV0910 DEMODULATOR ICs
 +M:    Daniel Scheller <[email protected]>
 +L:    [email protected]
 +W:    https://linuxtv.org
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/dvb-frontends/stv0910*
 +
 +MEDIA DRIVERS FOR ST STV6111 TUNER ICs
 +M:    Daniel Scheller <[email protected]>
 +L:    [email protected]
 +W:    https://linuxtv.org
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/dvb-frontends/stv6111*
 +
 +MEDIA DRIVERS FOR DIGITAL DEVICES PCIE DEVICES
 +M:    Daniel Scheller <[email protected]>
 +L:    [email protected]
 +W:    https://linuxtv.org
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/pci/ddbridge/*
 +
  MEDIA INPUT INFRASTRUCTURE (V4L/DVB)
  M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
@@@ -8571,9 -8424,7 +8571,9 @@@ F:      include/uapi/linux/uvcvideo.
  
  MEDIATEK ETHERNET DRIVER
  M:    Felix Fietkau <[email protected]>
 -M:    John Crispin <[email protected]>
 +M:    John Crispin <[email protected]>
 +M:    Sean Wang <[email protected]>
 +M:    Nelson Chang <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/net/ethernet/mediatek/
@@@ -8609,24 -8460,11 +8609,24 @@@ L:   [email protected]
  S:    Maintained
  F:    drivers/net/wireless/mediatek/mt7601u/
  
 +MEDIATEK CIR DRIVER
 +M:    Sean Wang <[email protected]>
 +S:    Maintained
 +F:    drivers/media/rc/mtk-cir.c
 +
  MEDIATEK RANDOM NUMBER GENERATOR SUPPORT
  M:    Sean Wang <[email protected]>
  S:    Maintained
  F:    drivers/char/hw_random/mtk-rng.c
  
 +MEDIATEK USB3 DRD IP DRIVER
 +M:    Chunfeng Yun <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    drivers/usb/mtu3/
 +
  MEGACHIPS STDPXXXX-GE-B850V3-FW LVDS/DP++ BRIDGES
  M:    Peter Senna Tschudin <[email protected]>
  M:    Martin Donnelly <[email protected]>
@@@ -8791,7 -8629,7 +8791,7 @@@ M:      Mathieu Desnoyers <mathieu.desnoyers
  M:    "Paul E. McKenney" <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    kernel/membarrier.c
 +F:    kernel/sched/membarrier.c
  F:    include/uapi/linux/membarrier.h
  
  MEMORY MANAGEMENT
@@@ -8845,16 -8683,6 +8845,16 @@@ F:    drivers/leds/leds-menf21bmc.
  F:    drivers/hwmon/menf21bmc_hwmon.c
  F:    Documentation/hwmon/menf21bmc
  
 +MESON AO CEC DRIVER FOR AMLOGIC SOCS
 +M:    Neil Armstrong <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +W:    http://linux-meson.com/
 +S:    Supported
 +F:    drivers/media/platform/meson/ao-cec.c
 +F:    Documentation/devicetree/bindings/media/meson-ao-cec.txt
 +T:    git git://linuxtv.org/media_tree.git
 +
  METAG ARCHITECTURE
  M:    James Hogan <[email protected]>
  L:    [email protected]
@@@ -8891,12 -8719,6 +8891,12 @@@ F:    drivers/dma/at_hdmac.
  F:    drivers/dma/at_hdmac_regs.h
  F:    include/linux/platform_data/dma-atmel.h
  
 +MICROCHIP / ATMEL ECC DRIVER
 +M:    Tudor Ambarus <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/crypto/atmel-ecc.*
 +
  MICROCHIP / ATMEL ISC DRIVER
  M:    Songjun Wu <[email protected]>
  L:    [email protected]
@@@ -9206,7 -9028,7 +9206,7 @@@ T:      git git://git.infradead.org/linux-mt
  T:    git git://git.infradead.org/l2-mtd.git nand/next
  S:    Maintained
  F:    drivers/mtd/nand/
 -F:    include/linux/mtd/nand*.h
 +F:    include/linux/mtd/*nand*.h
  
  NATIVE INSTRUMENTS USB SOUND INTERFACE DRIVER
  M:    Daniel Mack <[email protected]>
@@@ -9644,7 -9466,6 +9644,7 @@@ M:      Srinivas Kandagatla <srinivas.kandag
  S:    Maintained
  F:    drivers/nvmem/
  F:    Documentation/devicetree/bindings/nvmem/
 +F:    Documentation/ABI/stable/sysfs-bus-nvmem
  F:    include/linux/nvmem-consumer.h
  F:    include/linux/nvmem-provider.h
  
@@@ -9888,7 -9709,7 +9888,7 @@@ S:      Maintaine
  F:    drivers/media/i2c/ov5640.c
  
  OMNIVISION OV5647 SENSOR DRIVER
 -M:    Ramiro Oliveira <roliveir@synopsys.com>
 +M:    Luis Oliveira <lolivei@synopsys.com>
  L:    [email protected]
  T:    git git://linuxtv.org/media_tree.git
  S:    Maintained
@@@ -10277,7 -10098,6 +10277,7 @@@ F:   drivers/pci/dwc/*imx6
  
  PCI DRIVER FOR INTEL VOLUME MANAGEMENT DEVICE (VMD)
  M:    Keith Busch <[email protected]>
 +M:    Jonathan Derrick <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    drivers/pci/host/vmd.c
@@@ -10324,7 -10144,7 +10324,7 @@@ L:   [email protected] (m
  S:    Maintained
  F:    drivers/pci/dwc/pci-exynos.c
  
 -PCI DRIVER FOR SYNOPSIS DESIGNWARE
 +PCI DRIVER FOR SYNOPSYS DESIGNWARE
  M:    Jingoo Han <[email protected]>
  M:    Joao Pinto <[email protected]>
  L:    [email protected]
@@@ -10563,7 -10383,7 +10563,7 @@@ L:   [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git
  S:    Maintained
  F:    Documentation/devicetree/bindings/pinctrl/
 -F:    Documentation/pinctrl.txt
 +F:    Documentation/driver-api/pinctl.rst
  F:    drivers/pinctrl/
  F:    include/linux/pinctrl/
  
@@@ -10760,11 -10580,8 +10760,11 @@@ W: http://wiki.enneenne.com/index.php/L
  L:    [email protected] (subscribers-only)
  S:    Maintained
  F:    Documentation/pps/
 +F:    Documentation/devicetree/bindings/pps/pps-gpio.txt
 +F:    Documentation/ABI/testing/sysfs-pps
  F:    drivers/pps/
  F:    include/linux/pps*.h
 +F:    include/uapi/linux/pps.h
  
  PPTP DRIVER
  M:    Dmitry Kozlov <[email protected]>
@@@ -10890,7 -10707,6 +10890,7 @@@ L:   [email protected]
  T:    git git://linuxtv.org/media_tree.git
  S:    Maintained
  F:    drivers/media/usb/pulse8-cec/*
 +F:    Documentation/media/cec-drivers/pulse8-cec.rst
  
  PVRUSB2 VIDEO4LINUX DRIVER
  M:    Mike Isely <[email protected]>
@@@ -10918,12 -10734,6 +10918,12 @@@ F: Documentation/devicetree/bindings/hw
  F:    Documentation/hwmon/pwm-fan
  F:    drivers/hwmon/pwm-fan.c
  
 +PWM IR Transmitter
 +M:    Sean Young <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/media/rc/pwm-ir-tx.c
 +
  PWM SUBSYSTEM
  M:    Thierry Reding <[email protected]>
  L:    [email protected]
@@@ -11118,14 -10928,6 +11118,14 @@@ W: http://wireless.kernel.org/en/users/
  S:    Supported
  F:    drivers/net/wireless/ath/ath9k/
  
 +QUALCOMM CAMERA SUBSYSTEM DRIVER
 +M:    Todor Tomov <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/media/qcom,camss.txt
 +F:    Documentation/media/v4l-drivers/qcom_camss.rst
 +F:    drivers/media/platform/qcom/camss-8x16/
 +
  QUALCOMM EMAC GIGABIT ETHERNET DRIVER
  M:    Timur Tabi <[email protected]>
  L:    [email protected]
@@@ -11139,13 -10941,6 +11139,13 @@@ T: git git://git.kernel.org/pub/scm/lin
  S:    Supported
  F:    arch/hexagon/
  
 +QUALCOMM IOMMU
 +M:    Rob Clark <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/iommu/qcom_iommu.c
 +
  QUALCOMM VENUS VIDEO ACCELERATOR DRIVER
  M:    Stanimir Varbanov <[email protected]>
  L:    [email protected]
@@@ -11316,7 -11111,7 +11316,7 @@@ M:   Fenghua Yu <[email protected]
  L:    [email protected]
  S:    Supported
  F:    arch/x86/kernel/cpu/intel_rdt*
 -F:    arch/x86/include/asm/intel_rdt*
 +F:    arch/x86/include/asm/intel_rdt_sched.h
  F:    Documentation/x86/intel_rdt*
  
  READ-COPY UPDATE (RCU)
@@@ -11486,17 -11281,6 +11486,17 @@@ L: [email protected]
  S:    Odd Fixes
  F:    drivers/tty/serial/rp2.*
  
 +ROHM MULTIFUNCTION BD9571MWV-M PMIC DEVICE DRIVERS
 +M:    Marek Vasut <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/mfd/bd9571mwv.c
 +F:    drivers/regulator/bd9571mwv-regulator.c
 +F:    drivers/gpio/gpio-bd9571mwv.c
 +F:    include/linux/mfd/bd9571mwv.h
 +F:    Documentation/devicetree/bindings/mfd/bd9571mwv.txt
 +
  ROSE NETWORK LAYER
  M:    Ralf Baechle <[email protected]>
  L:    [email protected]
@@@ -11658,7 -11442,6 +11658,7 @@@ F:   drivers/s390/crypto
  
  S390 ZFCP DRIVER
  M:    Steffen Maier <[email protected]>
 +M:    Benjamin Block <[email protected]>
  L:    [email protected]
  W:    http://www.ibm.com/developerworks/linux/linux390/
  S:    Supported
@@@ -12511,7 -12294,6 +12511,7 @@@ F:   drivers/tty/serial/sunsab.
  F:    drivers/tty/serial/sunsu.c
  F:    drivers/tty/serial/sunzilog.c
  F:    drivers/tty/serial/sunzilog.h
 +F:    drivers/tty/vcc.c
  
  SPARSE CHECKER
  M:    "Christopher Li" <[email protected]>
@@@ -12708,12 -12490,6 +12708,12 @@@ M: Ion Badulescu <[email protected]
  S:    Odd Fixes
  F:    drivers/net/ethernet/adaptec/starfire*
  
 +STEC S1220 SKD DRIVER
 +M:    Bart Van Assche <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/block/skd*[ch]
 +
  STI CEC DRIVER
  M:    Benjamin Gaignard <[email protected]>
  S:    Maintained
@@@ -12867,6 -12643,13 +12867,13 @@@ L: [email protected]
  S:    Maintained
  F:    drivers/mmc/host/dw_mmc*
  
+ SYNOPSYS HSDK RESET CONTROLLER DRIVER
+ M:    Eugeniy Paltsev <[email protected]>
+ S:    Supported
+ F:    drivers/reset/reset-hsdk-v1.c
+ F:    include/dt-bindings/reset/snps,hsdk-v1-reset.h
+ F:    Documentation/devicetree/bindings/reset/snps,hsdk-v1-reset.txt
+ 
  SYSTEM CONFIGURATION (SYSCON)
  M:    Lee Jones <[email protected]>
  M:    Arnd Bergmann <[email protected]>
@@@ -13217,11 -13000,6 +13224,11 @@@ M: Yehezkel Bernat <yehezkel.bernat@int
  S:    Maintained
  F:    drivers/thunderbolt/
  
 +THUNDERX GPIO DRIVER
 +M:    David Daney <[email protected]>
 +S:    Maintained
 +F:    drivers/gpio/gpio-thunderx.c
 +
  TI AM437X VPFE DRIVER
  M:    "Lad, Prabhakar" <[email protected]>
  L:    [email protected]
@@@ -13746,7 -13524,8 +13753,7 @@@ F:   Documentation/scsi/ufs.tx
  F:    drivers/scsi/ufs/
  
  UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER DWC HOOKS
 -M:    Manjunath M Bettegowda <[email protected]>
 -M:    Prabu Thangamuthu <[email protected]>
 +M:    Joao Pinto <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    drivers/scsi/ufs/*dwc*
@@@ -14232,7 -14011,6 +14239,7 @@@ F:   drivers/block/virtio_blk.
  F:    include/linux/virtio*.h
  F:    include/uapi/linux/virtio_*.h
  F:    drivers/crypto/virtio/
 +F:    mm/balloon_compaction.c
  
  VIRTIO CRYPTO DRIVER
  M:    Gonglei <[email protected]>
diff --combined drivers/memory/atmel-ebi.c
index c00a7c7f460a51209ef49e9c96a0773d5eb85e00,597282e35c6914b9ded22231c849ef8072296a97..b907865d4664db167a4931edb3479cf11069de70
--- 1/drivers/memory/atmel-ebi.c
--- 2/drivers/memory/atmel-ebi.c
+++ b/drivers/memory/atmel-ebi.c
@@@ -51,7 -51,6 +51,7 @@@ struct atmel_ebi 
        struct  {
                struct regmap *regmap;
                struct clk *clk;
 +              const struct atmel_hsmc_reg_layout *layout;
        } smc;
  
        struct device *dev;
@@@ -73,7 -72,7 +73,7 @@@ struct atmel_smc_timing_xlate 
        { .name = nm, .converter = atmel_smc_cs_conf_set_pulse, .shift = pos}
  
  #define ATMEL_SMC_CYCLE_XLATE(nm, pos)        \
 -      { .name = nm, .converter = atmel_smc_cs_conf_set_setup, .shift = pos}
 +      { .name = nm, .converter = atmel_smc_cs_conf_set_cycle, .shift = pos}
  
  static void at91sam9_ebi_get_config(struct atmel_ebi_dev *ebid,
                                    struct atmel_ebi_dev_config *conf)
@@@ -85,8 -84,8 +85,8 @@@
  static void sama5_ebi_get_config(struct atmel_ebi_dev *ebid,
                                 struct atmel_ebi_dev_config *conf)
  {
 -      atmel_hsmc_cs_conf_get(ebid->ebi->smc.regmap, conf->cs,
 -                             &conf->smcconf);
 +      atmel_hsmc_cs_conf_get(ebid->ebi->smc.regmap, ebid->ebi->smc.layout,
 +                             conf->cs, &conf->smcconf);
  }
  
  static const struct atmel_smc_timing_xlate timings_xlate_table[] = {
@@@ -121,14 -120,12 +121,14 @@@ static int atmel_ebi_xslate_smc_timings
        if (!ret) {
                required = true;
                ncycles = DIV_ROUND_UP(val, clk_period_ns);
 -              if (ncycles > ATMEL_SMC_MODE_TDF_MAX ||
 -                  ncycles < ATMEL_SMC_MODE_TDF_MIN) {
 +              if (ncycles > ATMEL_SMC_MODE_TDF_MAX) {
                        ret = -EINVAL;
                        goto out;
                }
  
 +              if (ncycles < ATMEL_SMC_MODE_TDF_MIN)
 +                      ncycles = ATMEL_SMC_MODE_TDF_MIN;
 +
                smcconf->mode |= ATMEL_SMC_MODE_TDF(ncycles);
        }
  
@@@ -159,8 -156,8 +159,8 @@@
  out:
        if (ret) {
                dev_err(ebid->ebi->dev,
-                       "missing or invalid timings definition in %s",
-                       np->full_name);
+                       "missing or invalid timings definition in %pOF",
+                       np);
                return ret;
        }
  
@@@ -266,12 -263,12 +266,12 @@@ static int atmel_ebi_xslate_smc_config(
        }
  
        ret = atmel_ebi_xslate_smc_timings(ebid, np, &conf->smcconf);
 -      if (ret)
 +      if (ret < 0)
                return -EINVAL;
  
        if ((ret > 0 && !required) || (!ret && required)) {
-               dev_err(ebid->ebi->dev, "missing atmel,smc- properties in %s",
-                       np->full_name);
+               dev_err(ebid->ebi->dev, "missing atmel,smc- properties in %pOF",
+                       np);
                return -EINVAL;
        }
  
@@@ -288,8 -285,8 +288,8 @@@ static void at91sam9_ebi_apply_config(s
  static void sama5_ebi_apply_config(struct atmel_ebi_dev *ebid,
                                   struct atmel_ebi_dev_config *conf)
  {
 -      atmel_hsmc_cs_conf_apply(ebid->ebi->smc.regmap, conf->cs,
 -                               &conf->smcconf);
 +      atmel_hsmc_cs_conf_apply(ebid->ebi->smc.regmap, ebid->ebi->smc.layout,
 +                               conf->cs, &conf->smcconf);
  }
  
  static int atmel_ebi_dev_setup(struct atmel_ebi *ebi, struct device_node *np,
@@@ -314,8 -311,7 +314,7 @@@
  
                if (cs >= AT91_MATRIX_EBI_NUM_CS ||
                    !(ebi->caps->available_cs & BIT(cs))) {
-                       dev_err(dev, "invalid reg property in %s\n",
-                               np->full_name);
+                       dev_err(dev, "invalid reg property in %pOF\n", np);
                        return -EINVAL;
                }
  
@@@ -324,7 -320,7 +323,7 @@@
        }
  
        if (!numcs) {
-               dev_err(dev, "invalid reg property in %s\n", np->full_name);
+               dev_err(dev, "invalid reg property in %pOF\n", np);
                return -EINVAL;
        }
  
@@@ -528,10 -524,6 +527,10 @@@ static int atmel_ebi_probe(struct platf
        if (IS_ERR(ebi->smc.regmap))
                return PTR_ERR(ebi->smc.regmap);
  
 +      ebi->smc.layout = atmel_hsmc_get_reg_layout(smc_np);
 +      if (IS_ERR(ebi->smc.layout))
 +              return PTR_ERR(ebi->smc.layout);
 +
        ebi->smc.clk = of_clk_get(smc_np, 0);
        if (IS_ERR(ebi->smc.clk)) {
                if (PTR_ERR(ebi->smc.clk) != -ENOENT)
@@@ -576,8 -568,8 +575,8 @@@
  
                ret = atmel_ebi_dev_setup(ebi, child, reg_cells);
                if (ret) {
-                       dev_err(dev, "failed to configure EBI bus for %s, disabling the device",
-                               child->full_name);
+                       dev_err(dev, "failed to configure EBI bus for %pOF, disabling the device",
+                               child);
  
                        ret = atmel_ebi_dev_disable(ebi, child);
                        if (ret)
diff --combined drivers/soc/qcom/Kconfig
index d0fc331972d20bafd37d9f507e30830a91875e44,5f12657fc5524df57040686efa271dadb0559f3f..b00bccddcd3b81b15f3ea71ebeafde3376efee5d
--- 1/drivers/soc/qcom/Kconfig
--- 2/drivers/soc/qcom/Kconfig
+++ b/drivers/soc/qcom/Kconfig
@@@ -1,15 -1,8 +1,17 @@@
  #
  # QCOM Soc drivers
  #
+ menu "Qualcomm SoC drivers"
+ 
 +config QCOM_GLINK_SSR
 +      tristate "Qualcomm Glink SSR driver"
 +      depends on RPMSG
 +      depends on QCOM_RPROC_COMMON
 +      help
 +        Say y here to enable GLINK SSR support. The GLINK SSR driver
 +        implements the SSR protocol for notifying the remote processor about
 +        neighboring subsystems going up or down.
 +
  config QCOM_GSBI
          tristate "QCOM General Serial Bus Interface"
          depends on ARCH_QCOM
@@@ -83,3 -76,5 +85,5 @@@ config QCOM_WCNSS_CTR
        help
          Client driver for the WCNSS_CTRL SMD channel, used to download nv
          firmware to a newly booted WCNSS chip.
+ 
+ endmenu
Empty description
This page took 0.19834 seconds and 4 git commands to generate.