From: Arnd Bergmann Date: Fri, 15 Feb 2019 16:21:04 +0000 (+0100) Subject: Merge tag 'reset-for-5.1' of git://git.pengutronix.de/git/pza/linux into arm/drivers X-Git-Tag: v5.15~6896^2~21 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6f2185f8e345c9023bdd030d7dae4affd6bea539;p=platform%2Fkernel%2Flinux-starfive.git Merge tag 'reset-for-5.1' of git://git.pengutronix.de/git/pza/linux into arm/drivers Reset controller changes for v5.1 This adds the include/linux/reset directory to MAINTAINERS for reset specific headers and adds headers for sunxi and socfpga in there to get rid of a few extern function declarations. There is a new reset driver for the Broadcom STB reset controller and the i.MX7 system reset controller driver is extended to support i.MX8MQ as well. Finally, there is a new header with reset id constants for the Meson G12A SoC, which has a reset controller identical to Meson AXG and thus can reuse its driver and DT bindings. * tag 'reset-for-5.1' of git://git.pengutronix.de/git/pza/linux: dt-bindings: reset: meson: add g12a bindings reset: imx7: Add support for i.MX8MQ IP block variant reset: imx7: Add plubming to support multiple IP variants reset: Add Broadcom STB SW_INIT reset controller driver dt-bindings: reset: Add document for Broadcom STB reset controller reset: socfpga: declare socfpga_reset_init in a header file reset: sunxi: declare sun6i_reset_init in a header file MAINTAINERS: use include/linux/reset for reset controller related headers dt-bindings: reset: imx7: Document usage on i.MX8MQ SoCs Signed-off-by: Arnd Bergmann --- 6f2185f8e345c9023bdd030d7dae4affd6bea539