Merge tag 'reset-for-v5.3' of git://git.pengutronix.de/git/pza/linux into arm/drivers
authorOlof Johansson <olof@lixom.net>
Thu, 4 Jul 2019 14:05:21 +0000 (07:05 -0700)
committerOlof Johansson <olof@lixom.net>
Thu, 4 Jul 2019 14:05:23 +0000 (07:05 -0700)
commit8c0993621c3e5fa52e5425ef2a0f67a0cde07092
tree71dadce38706db47681ec07ac93785935e28118e
parentd9deea28a896e01f6593b8a5c18ccff530620cb2
parentb108ad53bb65c19ae8e2d9c7fc0d052b3d9c153b
Merge tag 'reset-for-v5.3' of git://git.pengutronix.de/git/pza/linux into arm/drivers

Reset controller changes for v5.3

This tag adds support for the Bitmain BM1880 reset controller to the
reset-simple driver and fixes a spelling mistake in the i.MX7 reset
controller binding document.

* tag 'reset-for-v5.3' of git://git.pengutronix.de/git/pza/linux:
  dt-bindings: reset: imx7: Fix the spelling of 'indices'
  reset: Add reset controller support for BM1880 SoC
  dt-bindings: reset: Add devicetree binding for BM1880 reset controller

Link: https://lore.kernel.org/r/1562236632.6641.14.camel@pengutronix.de
Signed-off-by: Olof Johansson <olof@lixom.net>
drivers/reset/Kconfig
drivers/reset/reset-simple.c