]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
Merge tag 'reset-for-4.13-2' of git://git.pengutronix.de/git/pza/linux into next...
authorOlof Johansson <olof@lixom.net>
Mon, 19 Jun 2017 02:03:45 +0000 (19:03 -0700)
committerOlof Johansson <olof@lixom.net>
Mon, 19 Jun 2017 02:03:45 +0000 (19:03 -0700)
Reset controller changes for v4.13, part 2

- Add reset manager offsets for Stratix10
- Use kref for reset contol reference counting
- Add new TI SCI reset driver for TI Keystone SoCs

* tag 'reset-for-4.13-2' of git://git.pengutronix.de/git/pza/linux:
  reset: Add the TI SCI reset driver
  dt-bindings: reset: Add TI SCI reset binding
  reset: use kref for reference counting
  dt-bindings: reset: Add reset manager offsets for Stratix10

Signed-off-by: Olof Johansson <olof@lixom.net>
1  2 
MAINTAINERS

diff --combined MAINTAINERS
index 053c3bdd1fe51c1e48983cfa2e3b4b00349035f2,545ab28f006a0747a9b4628be660a373cea24b54..378133ba441a7a4346340106c3418c9bd095ff35
@@@ -846,6 -846,7 +846,6 @@@ M: Laura Abbott <labbott@redhat.com
  M:    Sumit Semwal <sumit.semwal@linaro.org>
  L:    devel@driverdev.osuosl.org
  S:    Supported
 -F:    Documentation/devicetree/bindings/staging/ion/
  F:    drivers/staging/android/ion
  F:    drivers/staging/android/uapi/ion.h
  F:    drivers/staging/android/uapi/ion_test.h
@@@ -3115,14 -3116,6 +3115,14 @@@ F:    drivers/net/ieee802154/cc2520.
  F:    include/linux/spi/cc2520.h
  F:    Documentation/devicetree/bindings/net/ieee802154/cc2520.txt
  
 +CCREE ARM TRUSTZONE CRYPTOCELL 700 REE DRIVER
 +M:    Gilad Ben-Yossef <gilad@benyossef.com>
 +L:    linux-crypto@vger.kernel.org
 +L:    driverdev-devel@linuxdriverproject.org
 +S:    Supported
 +F:    drivers/staging/ccree/
 +W:    https://developer.arm.com/products/system-ip/trustzone-cryptocell/cryptocell-700-family
 +
  CEC FRAMEWORK
  M:    Hans Verkuil <hans.verkuil@cisco.com>
  L:    linux-media@vger.kernel.org
@@@ -5702,7 -5695,7 +5702,7 @@@ M:      Alex Elder <elder@kernel.org
  M:    Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  S:    Maintained
  F:    drivers/staging/greybus/
 -L:    greybus-dev@lists.linaro.org
 +L:    greybus-dev@lists.linaro.org (moderated for non-subscribers)
  
  GREYBUS AUDIO PROTOCOLS DRIVERS
  M:    Vaibhav Agarwal <vaibhav.sr@gmail.com>
@@@ -7143,7 -7136,7 +7143,7 @@@ S:      Maintaine
  F:    drivers/media/platform/rcar_jpu.c
  
  JSM Neo PCI based serial card
 -M:    Gabriel Krisman Bertazi <krisman@linux.vnet.ibm.com>
 +M:    Guilherme G. Piccoli <gpiccoli@linux.vnet.ibm.com>
  L:    linux-serial@vger.kernel.org
  S:    Maintained
  F:    drivers/tty/serial/jsm/
@@@ -9560,6 -9553,10 +9560,6 @@@ F:     drivers/net/wireless/intersil/orinoc
  
  OSD LIBRARY and FILESYSTEM
  M:    Boaz Harrosh <ooo@electrozaur.com>
 -M:    Benny Halevy <bhalevy@primarydata.com>
 -L:    osd-dev@open-osd.org
 -W:    http://open-osd.org
 -T:    git git://git.open-osd.org/open-osd.git
  S:    Maintained
  F:    drivers/scsi/osd/
  F:    include/scsi/osd_*
@@@ -12633,6 -12630,8 +12633,8 @@@ F:   include/linux/soc/ti/ti_sci_protocol
  F:    Documentation/devicetree/bindings/soc/ti/sci-pm-domain.txt
  F:    include/dt-bindings/genpd/k2g.h
  F:    drivers/soc/ti/ti_sci_pm_domains.c
+ F:    Documentation/devicetree/bindings/reset/ti,sci-reset.txt
+ F:    drivers/reset/reset-ti-sci.c
  
  THANKO'S RAREMONO AM/FM/SW RADIO RECEIVER USB DRIVER
  M:    Hans Verkuil <hverkuil@xs4all.nl>